Merge pull request #1 from rust-lang/master

get master

Author: dzhibas

templates/404.hbs

@@ -1,12 +1,12 @@
 {{#*inline "page"}}
 <header>
   <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
-    <div class="row">
-      <div class="eight columns">
+    <div class="flex-none flex-l mt5 mb5 tc tl-l">
+      <div class="w-70-l w-100">
         <h1>404</h1>
         <h2 class="subtitle">Whoops, this page doesn’t exist :-(</h2>
       </div>
-      <div class="four columns">
+      <div class="w-30-l w-100 mt5 mt0-l">
         <img id="ferris-error" src="/static/images/ferris-error.png" alt="404 not found image">
       </div>
     </div>

templates/components/tools/editors.hbs

@@ -1,31 +1,29 @@
-<div class="row">
-  <div class="three columns">
+<div class="flex-none flex-m flex-l flex-wrap">
+  <div class="w-25-l w-50-m w-100 pa3">
     <a href="https://marketplace.visualstudio.com/items?itemName=rust-lang.rust"
        class="button button-secondary">VS Code</a>
   </div>
-  <div class="three columns">
+  <div class="w-25-l w-50-m w-100 pa3">
     <a href="https://github.com/rust-lang/rust-enhanced"
        class="button button-secondary">Sublime Text 3</a>
   </div>
-  <div class="three columns">
+  <div class="w-25-l w-50-m w-100 pa3">
     <a href="https://github.com/rust-lang/atom-ide-rust"
        class="button button-secondary">Atom</a>
   </div>
-  <div class="three columns">
+  <div class="w-25-l w-50-m w-100 pa3">
     <a href="https://plugins.jetbrains.com/plugin/8182-rust"
        class="button button-secondary">IntelliJ IDEA</a>
   </div>
-</div>
-<div class="row">
-  <div class="three columns">
+  <div class="w-25-l w-50-m w-100 pa3">
     <a href="https://www.eclipse.org/downloads/packages/release/2018-12/r/eclipse-ide-rust-developers-includes-incubating-components"
        class="button button-secondary">Eclipse</a>
   </div>
-  <div class="three columns">
+  <div class="w-25-l w-50-m w-100 pa3">
     <a href="https://github.com/rust-lang/rust.vim"
        class="button button-secondary">Vim</a>
   </div>
-  <div class="three columns">
+  <div class="w-25-l w-50-m w-100 pa3">
     <a href="https://github.com/rust-lang/rust-mode"
        class="button button-secondary">Emacs</a>
   </div>

templates/tools/index.hbs

@@ -39,8 +39,8 @@
       Cargo is the build tool for Rust. It bundles all common actions into a
       single command. No boilerplate required.
     </p>
-    <div class="row">
-      <div class="four columns" id="packages">
+    <div class="flex-none flex-l flex-row">
+      <div class="mt2 w-100" id="packages">
         <h3 class="code-header">
           Install
         </h3>
@@ -51,23 +51,23 @@
           repetition to innovation.
         </p>
       </div>
-      <div class="four columns" id="linting">
+      <div class="mt2 w-100 ml5-l" id="linting">
         <h3 class="code-header">
           Test
         </h3>
         <p>
           Bring confidence to your code through Rust’s excellent testing tools.
-          <code>cargo test</code> is Rust’s unified solution to testing. Write
+          <code class="nowrap">cargo test</code> is Rust’s unified solution to testing. Write
           tests next to your code, or in separate files: it provides a solution
           for all testing needs.
         </p>
       </div>
-      <div class="four columns" id="deployment">
+      <div class="mt2 w-100 ml5-l" id="deployment">
         <h3 class="code-header">
           Deploy
         </h3>
         <p>
-          <code>cargo build</code> creates lean binaries for every platform.
+          <code class="nowrap">cargo build</code> creates lean binaries for every platform.
           With a single command your code can target Windows, Linux, OSX, and
           the web. All part of a modern interface, with no need for bespoke
           build files.
@@ -121,7 +121,7 @@
         </h3>
         <p class="flex-grow-1">
           Cargo’s doc builder makes it so no API ever goes undocumented. It’s
-          available locally through <code>cargo doc</code>, and online for
+          available locally through <code class="nowrap">cargo doc</code>, and online for
           public crates through <a href="https://docs.rs">docs.rs</a>.
         </p>
         <a href="https://docs.rs/"