Merge branch '2.0-wip'

Conflicts:
	docs/assets/bootstrap.zip

8 files changed, 31 insertions, 50 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d2f0faa21..a74f5f162 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 35e96bbcd..4b032cdb5 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -12,6 +12,9 @@
   visibility: hidden;
 }
 @media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
   .page-header h1 small {
     display: block;
     line-height: 18px;
@@ -99,7 +102,7 @@
     margin: 0;
   }
 }
-@media (min-width: 768px) and (max-width: 940px) {
+@media (min-width: 768px) and (max-width: 980px) {
   .row {
     margin-left: -20px;
     *zoom: 1;
@@ -275,7 +278,7 @@
     width: 714px;
   }
 }
-@media (max-width: 940px) {
+@media (max-width: 980px) {
   body {
     padding-top: 0;
   }
@@ -373,10 +376,9 @@
   .nav-collapse {
     overflow: hidden;
     height: 0;
-    -webkit-transform: translate3d(0, 0, 0);
   }
 }
-@media (min-width: 940px) {
+@media (min-width: 980px) {
   .nav-collapse.collapse {
     height: auto !important;
   }
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 7d519a608..7babce5eb 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1112,7 +1112,7 @@ table .span12 {
   width: 924px;
   margin-left: 0;
 }
-[class*="icon-"] {
+[class^="icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
@@ -1122,7 +1122,7 @@ table .span12 {
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-[class*="icon-"]:last-child {
+[class^="icon-"]:last-child {
   *margin-left: 0;
 }
 .icon-white {
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index cc64d3166..2e6da9c79 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -61,17 +61,13 @@ hr.soften {
   position: relative;
 }
 .jumbotron h1 {
-  margin-bottom: 9px;
   font-size: 81px;
   letter-spacing: -1px;
   line-height: 1;
 }
 .jumbotron p {
   margin-bottom: 18px;
-  font-size: 25px;
   font-weight: 300;
-  line-height: 36px;
-  color: #333;
 }
 .jumbotron .btn-large {
   font-size: 20px;
@@ -82,10 +78,6 @@ hr.soften {
      -moz-border-radius: 6px;
           border-radius: 6px;
 }
-.jumbotron .download-info {
-  font-size: 16px;
-  color: #999;
-}
 
 /* Masthead (docs home) */
 .masthead {
@@ -100,7 +92,8 @@ hr.soften {
   margin-bottom: 18px;
 }
 .masthead p {
-  margin: 0 5% 18px;
+  margin-left: 5%;
+  margin-right: 5%;
   font-size: 30px;
   line-height: 36px;
 }
@@ -111,11 +104,7 @@ hr.soften {
 /* supporting docs pages */
 .subhead {
   padding-bottom: 0;
-  border-bottom: 0;
-}
-.subhead h1,
-.subhead p {
-  margin-right: 0;
+  margin-bottom: 9px;
 }
 .subhead h1 {
   font-size: 54px;
@@ -184,8 +173,8 @@ hr.soften {
           border-radius: 0 0 4px 4px;
 }
 
-/* Fixed subnav on scroll, but only for 940px and up (sorry IE!) */
-@media (min-width: 940px) {
+/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
+@media (min-width: 980px) {
   .subnav-fixed {
     position: fixed;
     top: 40px;
@@ -228,12 +217,6 @@ hr.soften {
 .quick-links li {
   display: inline;
   margin: 0 5px;
-}
-.quick-links .divider {
-  color: #999;
-}
-.quick-links strong {
-  font-weight: normal;
   color: #999;
 }
 .quick-links .github-btn,
@@ -638,10 +621,6 @@ form.well {
   .quick-links {
     margin: 40px 0 0;
   }
-  .quick-links li {
-    margin-top: 5px;
-    margin-bottom: 5px;
-  }
   /* hide the bullets on mobile since our horizontal space is limited */
   .quick-links .divider {
     display: none;
@@ -654,7 +633,7 @@ form.well {
   .example-sites > li {
     float: none;
     display: block;
-    max-width: 300px;
+    max-width: 280px;
     margin: 0 auto 18px;
     text-align: center;
   }
@@ -687,6 +666,11 @@ form.well {
     padding-top: 0;
   }
 
+  /* Jumbotron buttons */
+  .jumbotron .btn {
+    margin-bottom: 10px;
+  }
+
   /* Subnav */
   .subnav {
     position: static;
@@ -715,7 +699,6 @@ form.well {
               border-radius: 4px 4px 0 0;
   }
 
-
   /* Popovers */
   .large-bird {
     display: none;
@@ -729,11 +712,6 @@ form.well {
     margin-bottom: 5px;
   }
 
-  /* Space out the getting started sections */
-  .getting-started .span4 {
-    margin-bottom: 18px;
-  }
-
   /* Unfloat the back to top link in footer */
   .footer .pull-right {
     float: none;
@@ -751,11 +729,6 @@ form.well {
   .jumbotron h1 {
     font-size: 54px;
   }
-  .masthead p {
-    font-size: 25px;
-    line-height: 36px;
-  }
-  .jumbotron h1,
   .jumbotron p {
     margin-right: 0;
     margin-left: 0;
@@ -764,7 +737,7 @@ form.well {
 }
 
 
-@media (min-width: 768px) and (max-width: 940px) {
+@media (min-width: 768px) and (max-width: 980px) {
 
   /* Remove any padding from the body */
   body {
@@ -779,7 +752,7 @@ form.well {
 }
 
 
-@media (max-width: 940px) {
+@media (max-width: 980px) {
 
   /* Unfloat brand */
   .navbar-fixed-top .brand {
@@ -789,6 +762,12 @@ form.well {
     padding-right: 10px;
   }
 
+  /* Inline-block quick links for more spacing */
+  .quick-links li {
+    display: inline-block;
+    margin: 5px;
+  }
+
 }
 
 
diff --git a/docs/base-css.html b/docs/base-css.html
index 2e4e116db..7440603d5 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -105,7 +105,7 @@
   <div class="row">
     <div class="span4">
       <h3>Typographic scale</h3>
-      <p>The entire typographic grid is based on two Less variables in our preboot.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.</p>
+      <p>The entire typographic grid is based on two Less variables in our variables.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.</p>
       <p>We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.</p>
     </div>
     <div class="span4">
diff --git a/docs/javascript.html b/docs/javascript.html
index 188d26e34..f45e67d9e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1288,7 +1288,7 @@ $('#myCollapsible').on('hidden', function () {
                <td>interval</td>
                <td>number</td>
                <td>5000</td>
-               <td>The amount of type to delay between automatically cycling an item.</td>
+               <td>The amount of time to delay between automatically cycling an item.</td>
              </tr>
             </tbody>
           </table>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index cc0b2a1ea..cc235ffd0 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -29,7 +29,7 @@
   <div class="row">
     <div class="span4">
       <h3>{{_i}}Typographic scale{{/i}}</h3>
-      <p>{{_i}}The entire typographic grid is based on two Less variables in our preboot.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.{{/i}}</p>
+      <p>{{_i}}The entire typographic grid is based on two Less variables in our variables.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.{{/i}}</p>
       <p>{{_i}}We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.{{/i}}</p>
     </div>
     <div class="span4">
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 8841b1f7b..f2bbf0216 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1212,7 +1212,7 @@ $('#myCollapsible').on('hidden', function () {
                <td>{{_i}}interval{{/i}}</td>
                <td>{{_i}}number{{/i}}</td>
                <td>5000</td>
-               <td>{{_i}}The amount of type to delay between automatically cycling an item.{{/i}}</td>
+               <td>{{_i}}The amount of time to delay between automatically cycling an item.{{/i}}</td>
              </tr>
             </tbody>
           </table>