Merge branch 'master' into quotes

ashleygwilliams · web-flow · commit 0bb754aa53d7 · 2018-11-30T08:59:30.000-05:00
diff --git a/src/styles/app.scss b/src/styles/app.scss
@@ -12,6 +12,14 @@ $yellow: #FECD2F;
 body {
   font-family: $body-font;
   background-color: white;
+
+  /* Ensure the footer is always at the bottom of the screen */
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  & > #main-content {
+      flex: 1;
+  }
 }
 
 #ferris img {
@@ -41,15 +49,12 @@ header h1, section h2 {
 }
 
 header h1 {
+  line-height: 1;
   font-size: 10rem;
   margin-bottom: 0;
   margin-top: 0;
 }
 
-header {
-  padding: 30px 0 60px 0;
-}
-
 header .button.button-primary.button-download {
   background-color: $yellow;
   border-color: $yellow;
@@ -58,11 +63,13 @@ header .button.button-primary.button-download {
   padding: 20px;
   height: auto;
   font-size: 2em;
-  margin-top: 20px;
+  margin-top: 25px;
 }
 
-header .button.button-primary.button-download:hover {
-  border-color: black;
+header .button.button-primary.button-download {
+  &:hover, &:focus {
+      border-color: black;
+  }
 }
 
 h2.subtitle {
@@ -74,7 +81,7 @@ h2.subtitle {
 }
 
 section {
-  padding: 30px 0 60px 0;
+  padding: 30px 0;
 }
 
 ul {
@@ -147,7 +154,7 @@ a.brand {
     display: block;
     overflow: hidden;
     text-overflow: ellipsis;
-    &:hover {
+    &:hover, &:focus {
       border-color: white;
     }
   }
@@ -174,7 +181,7 @@ a.brand {
     display: block;
     overflow: hidden;
     text-overflow: ellipsis;
-    &:hover {
+    &:hover, &:focus {
       border-color: white;
     }
   }
@@ -202,7 +209,7 @@ a.brand {
     display: block;
     overflow: hidden;
     text-overflow: ellipsis;
-    &:hover {
+    &:hover, &:focus {
       border-color: $gray;
     }
   }
@@ -231,7 +238,7 @@ a.brand {
     display: block;
     overflow: hidden;
     text-overflow: ellipsis;
-    &:hover {
+    &:hover, &:focus {
       border-color: white;
     }
   }
@@ -558,7 +565,7 @@ blockquote::before {
     .button.button-primary.button-download {
       padding: 5px;
       font-size: 1.5em;
-      margin-top: 20px;
+      margin-top: 0;
     }
   }
 }
diff --git a/static/images/favicon-16x16.png b/static/images/favicon-16x16.png
diff --git a/static/images/favicon-32x32.png b/static/images/favicon-32x32.png
diff --git a/templates/index.hbs b/templates/index.hbs
@@ -1,14 +1,14 @@
 {{#*inline "page"}}
-<header class="mb6-ns">
+<header class="pt4 pb4-ns">
   <div class="container flex flex-column flex-row-l justify-between-l">
     <div class="mw8-l">
       <h1>Rust</h1>
-      <h2 class="mt4 f2 f1-ns">
+      <h2 class="f2 f1-ns">
         The programming language that empowers <em>everyone</em> to become a
         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/layout.hbs b/templates/layout.hbs
@@ -48,7 +48,9 @@
   </head>
   <body>
     {{> nav}}
-    {{~> page}}
+    <div id="main-content">
+        {{~> page}}
+    </div>
     {{> footer}}
   </body>
 </html>
diff --git a/templates/learn/get-started.hbs b/templates/learn/get-started.hbs
@@ -154,7 +154,7 @@ fn main() {
       <div class="highlight"></div>
     </header>
     <p>Ferris (they/them) is the unofficial mascot of the Rust Community. Rust programmers call themselves
-      “Rustaceans,” which is a play on the word “crustacean,” which is set of creatures, one of which is a crab!</p>
+      “Rustaceans,” which is a play on the word “crustacean,” which is set a of creatures, one of which is a crab!</p>
     <p>Ferris is a name playing off of the adjective, “ferrous,” meaning of or pertaining to iron. Since Rust often
       forms on iron, it seemed like a fun origin for our mascot’s name!</p>
     <p>You can find more images of Ferris on <a href="http://rustacean.net/" target="_blank" rel="noopener">http://rustacean.net/</a>.
diff --git a/templates/learn/index.hbs b/templates/learn/index.hbs
@@ -14,10 +14,10 @@
     </header>
     <div class="flex flex-column flex-row-l justify-between">
       <section class="pt0">
-        <p>Affectionately nicknamed “the book,” The Rust Programming Language
-          will give you an overview of the language from first principles.
-          You’ll build a few projects along the way, and by the end, you’ll have
-        a solid grasp of the language.</p>
+        <p>Affectionately nicknamed “the book,” <cite>The Rust Programming
+          Language</cite> will give you an overview of the language from first
+          principles. You’ll build a few projects along the way, and by the end,
+          you’ll have a solid grasp of the language.</p>
           <a class="button button-secondary" href="https://doc.rust-lang.org/book/">Read the Book!</a>
       </section>
       <section class="pl5-l pt4 pt0-l">
diff --git a/templates/nav.hbs b/templates/nav.hbs
@@ -7,7 +7,7 @@
     <span class="pl4 db dn-l">{{!-- spacer --}}</span>
   </a>
 
-  <ul class="nav list w-100 w-auto-l flex flex-none flex-row flex-wrap justify-center justify-end-l items-center pv2 ph4-ns">
+  <ul class="nav list w-100 w-auto-l flex flex-none flex-row flex-wrap justify-center justify-end-l items-center pv2 ph4-ns pl0">
     <li class="flex-inline pv2 ph2 ph4-ns"><a href="/learn">Learn</a></li>
     <li class="flex-inline pv2 ph2 ph4-ns"><a href="/tools">Tools</a></li>
     <li class="flex-inline pv2 ph2 ph4-ns"><a href="/governance">Governance</a></li>
diff --git a/templates/panels/language-values.hbs b/templates/panels/language-values.hbs
@@ -9,23 +9,23 @@
     <div class="flex flex-column flex-row-l pv4 pv0-l">
       <section class="flex flex-column mw8 measure-wide-l pv3 pt4-ns pr4-l">
         <h3 class="f2 f1-l">Performance</h3>
-        <p class="f3 lh-copy">
+        <p class="mb0 f3 lh-copy">
           Rust is blazingly fast and memory-efficient: with no runtime or
           garbage collector, it can power performance-critical services, run on
           embedded devices, and easily integrate with other languages.
         </p>
       </section>
       <section class="flex flex-column mw8 measure-wide-l pv3 pt4-ns ph3-l">
         <h3 class="f2 f1-l">Reliability</h3>
-        <p class="f3 lh-copy">
+        <p class="mb0 f3 lh-copy">
           Rust’s rich type system and ownership model guarantee memory-safety
           and thread-safety &mdash; and enable you to eliminate many other
           classes of bugs at compile-time.
         </p>
       </section>
       <section class="flex flex-column mw8 measure-wide-l pv3 pt4-ns pl4-l">
         <h3 class="f2 f1-l">Productivity</h3>
-        <p class="f3 lh-copy">
+        <p class="mb0 f3 lh-copy">
           Rust has great documentation, a friendly compiler with useful error
           messages, and top-notch tooling &mdash; an integrated package manager
           and build tool, a multi-editor language server, an auto-formatter, and
diff --git a/templates/panels/production.hbs b/templates/panels/production.hbs
@@ -30,7 +30,7 @@
         <div class="four columns">
           <a href="https://www.youtube.com/watch?v=u6ZbF4apABk" target="_blank" rel="noopener"><img src="/static/images/user-logos/yelp.png" alt="Yelp Logo" /></a>
         </div>
-        <div class="eight columns" id="chucklefish-testimonial">
+        <div class="eight columns" id="yelp-testimonial">
           <blockquote>
             All the documentation, the tooling, the community is great - you have all the tools to succeed in writing Rust code.
           </blockquote>
diff --git a/templates/what/cli/pitch.hbs b/templates/what/cli/pitch.hbs
@@ -2,7 +2,7 @@
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
     <header>
       <h2>
-        A maintainable code base
+        Why Rust?
       </h2>
       <div class="highlight"></div>
     </header>

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,14 @@ $yellow: #FECD2F;`
`12`	`12`	`body {`
`13`	`13`	`font-family: $body-font;`
`14`	`14`	`background-color: white;`
	`15`	`+`
	`16`	`+ /* Ensure the footer is always at the bottom of the screen */`
	`17`	`+ min-height: 100vh;`
	`18`	`+ display: flex;`
	`19`	`+ flex-direction: column;`
	`20`	`+ & > #main-content {`
	`21`	`+ flex: 1;`
	`22`	`+ }`
`15`	`23`	`}`
`16`	`24`
`17`	`25`	`#ferris img {`
`@@ -41,15 +49,12 @@ header h1, section h2 {`
`41`	`49`	`}`
`42`	`50`
`43`	`51`	`header h1 {`
	`52`	`+ line-height: 1;`
`44`	`53`	`font-size: 10rem;`
`45`	`54`	`margin-bottom: 0;`
`46`	`55`	`margin-top: 0;`
`47`	`56`	`}`
`48`	`57`
`49`		`-header {`
`50`		`- padding: 30px 0 60px 0;`
`51`		`-}`
`52`		`-`
`53`	`58`	`header .button.button-primary.button-download {`
`54`	`59`	`background-color: $yellow;`
`55`	`60`	`border-color: $yellow;`
`@@ -58,11 +63,13 @@ header .button.button-primary.button-download {`
`58`	`63`	`padding: 20px;`
`59`	`64`	`height: auto;`
`60`	`65`	`font-size: 2em;`
`61`		`- margin-top: 20px;`
	`66`	`+ margin-top: 25px;`
`62`	`67`	`}`
`63`	`68`
`64`		`-header .button.button-primary.button-download:hover {`
`65`		`- border-color: black;`
	`69`	`+header .button.button-primary.button-download {`
	`70`	`+ &:hover, &:focus {`
	`71`	`+ border-color: black;`
	`72`	`+ }`
`66`	`73`	`}`
`67`	`74`
`68`	`75`	`h2.subtitle {`
`@@ -74,7 +81,7 @@ h2.subtitle {`
`74`	`81`	`}`
`75`	`82`
`76`	`83`	`section {`
`77`		`- padding: 30px 0 60px 0;`
	`84`	`+ padding: 30px 0;`
`78`	`85`	`}`
`79`	`86`
`80`	`87`	`ul {`
`@@ -147,7 +154,7 @@ a.brand {`
`147`	`154`	`display: block;`
`148`	`155`	`overflow: hidden;`
`149`	`156`	`text-overflow: ellipsis;`
`150`		`- &:hover {`
	`157`	`+ &:hover, &:focus {`
`151`	`158`	`border-color: white;`
`152`	`159`	`}`
`153`	`160`	`}`
`@@ -174,7 +181,7 @@ a.brand {`
`174`	`181`	`display: block;`
`175`	`182`	`overflow: hidden;`
`176`	`183`	`text-overflow: ellipsis;`
`177`		`- &:hover {`
	`184`	`+ &:hover, &:focus {`
`178`	`185`	`border-color: white;`
`179`	`186`	`}`
`180`	`187`	`}`
`@@ -202,7 +209,7 @@ a.brand {`
`202`	`209`	`display: block;`
`203`	`210`	`overflow: hidden;`
`204`	`211`	`text-overflow: ellipsis;`
`205`		`- &:hover {`
	`212`	`+ &:hover, &:focus {`
`206`	`213`	`border-color: $gray;`
`207`	`214`	`}`
`208`	`215`	`}`
`@@ -231,7 +238,7 @@ a.brand {`
`231`	`238`	`display: block;`
`232`	`239`	`overflow: hidden;`
`233`	`240`	`text-overflow: ellipsis;`
`234`		`- &:hover {`
	`241`	`+ &:hover, &:focus {`
`235`	`242`	`border-color: white;`
`236`	`243`	`}`
`237`	`244`	`}`
`@@ -558,7 +565,7 @@ blockquote::before {`
`558`	`565`	`.button.button-primary.button-download {`
`559`	`566`	`padding: 5px;`
`560`	`567`	`font-size: 1.5em;`
`561`		`- margin-top: 20px;`
	`568`	`+ margin-top: 0;`
`562`	`569`	`}`
`563`	`570`	`}`
`564`	`571`	`}`