Merge pull request #535 from rust-lang/vertical-padding-446

ashleygwilliams · web-flow · commit 2c5d904669d4 · 2018-12-04T08:59:58.000-05:00
Improve white space in headings
diff --git a/src/styles/app.scss b/src/styles/app.scss
@@ -54,10 +54,6 @@ header h1 {
   margin-top: 0;
 }
 
-header {
-  padding: 30px 0 60px 0;
-}
-
 header .button.button-primary.button-download {
   background-color: $yellow;
   border-color: $yellow;
@@ -85,6 +81,17 @@ h2.subtitle {
 
 section {
   padding: 30px 0 60px 0;
+
+  header {
+    padding: 30px 0 60px 0;
+    display: inline-block;
+
+    h2 {
+      margin: 0;
+      padding: 0;
+      letter-spacing: 1px;
+    }
+  }
 }
 
 ul {
@@ -267,20 +274,10 @@ h3 {
   border-bottom: 1px dotted white;
 }
 
-section header {
-  display: inline-block;
-}
-
 header h1 {
   letter-spacing: 1px;
 }
 
-section header h2 {
-  margin: 0;
-  padding: 0;
-  letter-spacing: 1px;
-}
-
 .highlight {
   height: 30px;
   position: relative;
@@ -575,6 +572,13 @@ blockquote::before {
       margin-top: 20px;
     }
   }
+
+  section header {
+    padding: {
+      top: 10px;
+      bottom: 30px;
+    }
+  }
 }
 
 .team {
diff --git a/templates/community/index.hbs b/templates/community/index.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Community</h1>
   </div>
diff --git a/templates/governance/group.hbs b/templates/governance/group.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>{{ data.info[0].name }}</h1>
   </div>
diff --git a/templates/governance/index.hbs b/templates/governance/index.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Governance</h1>
     <h2 class="subtitle">How Rust is built by its community</h2>
diff --git a/templates/index.hbs b/templates/index.hbs
@@ -1,5 +1,5 @@
 {{#*inline "page"}}
-<header class="mb6-ns">
+<header class="mt3 mt0-ns mb6-ns">
   <div class="container flex flex-column flex-row-l justify-between-l">
     <div class="mw8-l">
       <h1>Rust</h1>
@@ -8,7 +8,7 @@
         systems programmer.
       </h2>
     </div>
-    <div class="mt4 mt0-l">
+    <div>
       <a class="button button-primary button-download ph4 mt0" href="/learn/get-started">
         Get started
       </a>
diff --git a/templates/learn/get-started.hbs b/templates/learn/get-started.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Getting started</h1>
     <h2 class="subtitle">Quickly set up a Rust development environment and write a small app!</h2>
diff --git a/templates/learn/index.hbs b/templates/learn/index.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Learn Rust</h1>
   </div>
diff --git a/templates/policies/code-of-conduct.hbs b/templates/policies/code-of-conduct.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Code of conduct</h1>
   </div>
diff --git a/templates/policies/index.hbs b/templates/policies/index.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Policies</h1>
   </div>
diff --git a/templates/policies/licenses.hbs b/templates/policies/licenses.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Licenses</h1>
   </div>
diff --git a/templates/policies/media-guide.hbs b/templates/policies/media-guide.hbs
@@ -1,6 +1,6 @@
 {{#* inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Media guide</h1>
   </div>
diff --git a/templates/policies/security.hbs b/templates/policies/security.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Security policy</h1>
   </div>
diff --git a/templates/production/index.hbs b/templates/production/index.hbs
@@ -1,6 +1,6 @@
 ﻿{{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Production</h1>
   </div>
diff --git a/templates/production/users.hbs b/templates/production/users.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Users</h1>
   </div>
diff --git a/templates/tools/index.hbs b/templates/tools/index.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Tools</h1>
   </div>
diff --git a/templates/tools/install.hbs b/templates/tools/install.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Install Rust</h1>
   </div>
diff --git a/templates/tools/rustup.hbs b/templates/tools/rustup.hbs
@@ -1,15 +1,15 @@
 <div class="row">
   <div id="platform-instructions-unix" class="instructions" style="display: block;">
     <p>It looks like you’re running macOS, Linux, or another Unix-like OS. To download Rustup and install Rust, run the following in your terminal, then follow the on-screen instructions.</p>
-    <code>curl https://sh.rustup.rs -sSf | sh</code>
+    <pre><code>curl https://sh.rustup.rs -sSf | sh</code></pre>
   </div>
   <div id="platform-instructions-win" class="instructions" style="display: none;">
     <p>It looks like you’re running Windows. To install Rust, download and run</p>
     <a href="https://win.rustup.rs" class="button button-secondary">rustup‑init.exe</a>
     <p>...then follow the onscreen instructions.</p>
     <p><b>Windows Subsystem for Linux</b></p>
     <p>If you’re a Windows Subsystem for Linux user run the following in your terminal, then follow the on-screen instructions to install Rust.</p>
-    <code>curl https://sh.rustup.rs -sSf | sh</code>
+    <pre><code>curl https://sh.rustup.rs -sSf | sh</code></pre>
   </div>
   <div id="platform-instructions-unknown" class="instructions" style="display: none;">
     <!-- unrecognized platform: ask for help -->
diff --git a/templates/what/cli.hbs b/templates/what/cli.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Command-line apps</h1>
   </div>
diff --git a/templates/what/embedded.hbs b/templates/what/embedded.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Embedded devices</h1>
   </div>
diff --git a/templates/what/index.hbs b/templates/what/index.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>What</h1>
   </div>
diff --git a/templates/what/networking.hbs b/templates/what/networking.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Networking</h1>
   </div>
diff --git a/templates/what/wasm.hbs b/templates/what/wasm.hbs
@@ -1,6 +1,6 @@
 {{#*inline "page"}}
 
-<header>
+<header class="mt3 mt2-ns mb4 mb5-ns tc tl-ns">
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <h1>Web&shy;Assembly</h1>
   </div>
