more content changes to docs

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2aeea9d24a9700eee113f91cf14ea55cdbe18596..bad9be39f18653919235eb4a18782bd7723b8ee7 100644 (file)
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -6,11 +6,13 @@
 */
 
 
+
 /* Body and structure
 -------------------------------------------------- */
+
 body {
   position: relative;
-  padding-top: 60px;
+  padding-top: 40px;
   font-size: 14px;
   background-color: #fff;
   background-image: url(../img/grid-20px.png);
@@ -36,19 +38,25 @@ li {
 }
 
 
+
+/* Left nav
+-------------------------------------------------- */
+
 .bs-docs-nav {
   position: fixed;
   top: 0;
   left: 0;
   bottom: 0;
   overflow-y: scroll;
-  width: 140px;
-  padding: 25px 30px;
-  background-color: #555;
-  text-shadow: 0 1px 0 rgba(0,0,0,.25);
-  -webkit-box-shadow: inset -1px 0 0 rgba(0,0,0,.1);
-     -moz-box-shadow: inset -1px 0 0 rgba(0,0,0,.1);
-          box-shadow: inset -1px 0 0 rgba(0,0,0,.1);
+  width: 150px;
+  padding: 25px;
+  background-color: #dde2e9;
+  text-shadow: 0 1px 0 rgba(255,255,255,.55);
+  -webkit-box-shadow: inset -10px 0 15px rgba(0,0,0,.15);
+     -moz-box-shadow: inset -10px 0 15px rgba(0,0,0,.15);
+          box-shadow: inset -10px 0 15px rgba(0,0,0,.15);
+  background-color: #444;
+  text-shadow: 0 1px 0 rgba(0,0,0,.5);
 }
 .bs-docs-nav ul {
   margin-left: 0;
@@ -58,24 +66,33 @@ li {
   list-style: none;
   line-height: 1;
 }
+.bs-docs-nav a:hover {
+  text-decoration: none;
+}
 .bs-docs-nav ul li a {
   display: block;
+  width: 145px;
   padding: 0 30px;
   margin: 0 -30px;
-  font-size: 13px;
-  line-height: 24px;
-  color: #ccc;
+  font-size: 12px;
+  line-height: 22px;
+  color: #444;
+  color: #999;
 }
 .bs-docs-nav ul li a:hover {
+  color: #333;
   color: #fff;
-  text-decoration: none;
-  background-color: #666;
+  background-color: rgba(0,0,0,.05);
 }
 .bs-docs-nav > ul > li > a {
   font-size: 14px;
   font-weight: bold;
+  line-height: 24px;
+  color: #333;
   color: #fff;
 }
+
+/* Logo wordmark */
 .bs-docs-logo {
   font-size: 24px;
   font-weight: bold;
@@ -84,35 +101,20 @@ li {
   margin-bottom: 20px;
 }
 .bs-docs-logo a {
-  color: #353535;
-  text-shadow: 0 1px 0 #656565;
-}
-
-
-/* Tweak navbar brand link to be super sleek
--------------------------------------------------- */
-.navbar {
-  font-size: 13px;
-}
-.navbar-fixed-top .brand {
-  padding-right: 0;
-  padding-left: 0;
-  margin-left: 20px;
-  float: right;
-  font-weight: bold;
-  color: #000;
-  text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125);
-  -webkit-transition: all .2s linear;
-     -moz-transition: all .2s linear;
-          transition: all .2s linear;
+  color: #a4b4cb;
+  color: #333;
+  text-shadow: 0 1px 0 #555;
 }
-.navbar-fixed-top .brand:hover {
-  text-decoration: none;
+.bs-docs-logo a:hover {
+  color: #8e9db3;
+  color: #222;
 }
 
 
+
 /* Space out sub-sections more
 -------------------------------------------------- */
+
 section {
   padding-top: 60px;
 }
@@ -123,6 +125,11 @@ section {
   color: #777;
 }
 
+/* Separators (hr) */
+.bs-docs-separator {
+  margin: 40px 0 39px;
+}
+
 /* Faded out hr */
 hr.soften {
   height: 1px;
@@ -137,6 +144,9 @@ hr.soften {
 
 /* Jumbotrons
 -------------------------------------------------- */
+
+/* Base class
+------------------------- */
 .jumbotron {
   position: relative;
 }
@@ -148,13 +158,13 @@ hr.soften {
   line-height: 1;
 }
 .jumbotron p {
-  margin-bottom: 18px;
+  margin-bottom: 20px;
   font-weight: 300;
 }
 .jumbotron .btn-large {
-  font-size: 20px;
+  font-size: 18px;
   font-weight: normal;
-  padding: 14px 24px;
+  padding: 13px 24px;
   margin-right: 10px;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
@@ -164,7 +174,8 @@ hr.soften {
   font-size: 14px;
 }
 
-/* Masthead (docs home) */
+/* Masthead (docs home)
+------------------------- */
 .masthead {
   margin-bottom: 60px;
 }
@@ -172,21 +183,47 @@ hr.soften {
 .masthead p {
 }
 .masthead h1 {
-  margin-bottom: 18px;
+  margin-bottom: 10px;
 }
 .masthead p {
   font-size: 30px;
-  line-height: 35px;
+  line-height: 40px;
+}
+
+/* Quick links
+------------------------- */
+.bs-links {
+  margin: 40px 0 0;
+  font-size: 12px;
+}
+.quick-links {
+  min-height: 30px;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  overflow: hidden;
+}
+.quick-links:first-child {
+  min-height: 0;
+}
+.quick-links li {
+  display: inline;
+  margin: 0 8px;
+  color: #999;
+}
+.quick-links .github-btn,
+.quick-links .tweet-btn,
+.quick-links .follow-btn {
+  position: relative;
+  top: 5px;
 }
 
 
+
 /* Specific jumbotrons
 ------------------------- */
 /* supporting docs pages */
 .subhead {
-  padding-bottom: 12px;
-  margin-bottom: 10px;
-  border-bottom: 1px solid #e5e5e5;
 }
 .subhead h1 {
   font-size: 60px;
@@ -290,32 +327,6 @@ hr.soften {
 }
 
 
-/* Quick links
--------------------------------------------------- */
-.bs-links {
-  margin: 36px 0;
-}
-.quick-links {
-  min-height: 30px;
-  margin: 0;
-  padding: 5px 0;
-  list-style: none;
-  overflow: hidden;
-}
-.quick-links:first-child {
-  min-height: 0;
-}
-.quick-links li {
-  display: inline;
-  margin: 0 8px;
-  color: #999;
-}
-.quick-links .github-btn,
-.quick-links .tweet-btn,
-.quick-links .follow-btn {
-  position: relative;
-  top: 5px;
-}
 
 
 /* Marketing section of Overview
@@ -684,6 +695,12 @@ form.well {
 .bs-docs-example p:last-child {
   margin-bottom: 0;
 }
+.bs-docs-example .table {
+  margin-bottom: 5px;
+}
+form.bs-docs-example {
+  padding-bottom: 19px;
+}
 .bs-docs-example .lead {
   font-size: 18px;
   line-height: 24px;

diff --git a/docs/base-css.html b/docs/base-css.html
index a1c59bd81101f7ba99f42544cad46428d37f90eb..7ed6c68ac2da2598ba72a020b5848ecc1d2ed78e 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -154,7 +154,7 @@
   <p>The typographic scale is based on two LESS variables in <strong>variables.less</strong>: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.</p>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   <h2>Emphasis</h2>
@@ -181,7 +181,7 @@
   <p><span class="label label-info">Heads up!</span> Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5. <code>&lt;b&gt;</code> is meant to highlight words or phrases without conveying additional importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.</p>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   <h2>Abbreviations</h2>
@@ -206,7 +206,7 @@
 </pre>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   <h2>Addresses</h2>
@@ -241,7 +241,7 @@
 </pre>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   <h2>Blockquotes</h2>
@@ -294,7 +294,7 @@
 </pre>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   <!-- Lists -->
@@ -834,27 +834,10 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     <h1>Forms</h1>
   </div>
 
-  <h2>Flexible HTML and CSS</h2>
-  <p>The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.</p>
-  <p>More complicated layouts come with succinct and scalable classes for easy styling and event binding, so you're covered at every step.</p>
-
-  <h2>Four layouts included</h2>
-  <p>Bootstrap comes with support for four types of form layouts:</p>
-  <ul>
-    <li>Vertical (default)</li>
-    <li>Search</li>
-    <li>Inline</li>
-    <li>Horizontal</li>
-  </ul>
-  <p>Different types of form layouts require some changes to markup, but the controls themselves remain and behave the same.</p>
-
-  <h2>Control states and more</h2>
-  <p>Bootstrap's forms include styles for all the base form controls like input, textarea, and select you'd expect. But it also comes with a number of custom components like appended and prepended inputs and support for lists of checkboxes.</p>
-  <p>States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.</p>
-
-
-  <h2>Four types of forms</h2>
-  <p>Bootstrap provides simple markup and styles for four styles of common web forms.</p>
+  <h2>Controls and layouts</h2>
+  <p>Forms include styles for all the base form controls like <code>input</code>, <code>textarea</code>, and <code>select</code> you'd expect. There are also a number of custom components like appended and prepended inputs and support for lists of checkboxes.</p>
+  <p>Bootstrap provides simple markup and styles for four styles of common web forms. Each layout requires small changes to surrounding markup, but the controls themselves remain and behave the same.</p>
+  <p>Error, warning, and success states are included for form controls, as wel as disabled.</p>
   <table class="table table-bordered table-striped">
     <thead>
       <tr>
@@ -887,7 +870,6 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     </tbody>
   </table>
 
-
   <h2>Example forms <small>using just form controls, no extra markup</small></h2>
   <h3>Basic form</h3>
   <p>Smart and lightweight defaults without extra markup.</p>
@@ -1646,7 +1628,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/components.html b/docs/components.html
index f0856a19f45742c19557d0795b89d6e847bc40dd..63cfac9ae6785e822cec01c76b04da20dbfcc8ad 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -1852,7 +1852,7 @@ class="clearfix"
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/download.html b/docs/download.html
index 654e7746db8ef50e40168e2b9ccb30a9b9c4f7c3..20e86055911fc6836c8bf50d903e900e9e56d0d9 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -460,7 +460,7 @@
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/examples.html b/docs/examples.html
index 83d87426fb8f17a64e6c30d17d135862acf8e3d7..374b69ef62d181b85c239a46107e4bd588f0928b 100644 (file)
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -145,7 +145,7 @@
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/index.html b/docs/index.html
index aadff0641c1f0593169ddbf8b1f22020be1cd193..336eee038ac8a1d17414bd0206b7adfa2fa4a99d 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -146,7 +146,7 @@
   </div>
 </header>
 
-<hr class="soften">
+<hr class="bs-docs-separator">
 
 <div class="marketing">
   <h1>Designed for everyone, everywhere.</h1>
@@ -188,7 +188,7 @@
     </div>
   </div><!--/row-->
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
   <h1>Built with Bootstrap.</h1>
   <p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.</p>
@@ -220,7 +220,7 @@
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/javascript.html b/docs/javascript.html
index 1afe4d2432d77820030907f6581bdd73f0a73e1a..d21ca2d616c541e7d574e7c90a6f307bc62c69d1 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1493,7 +1493,7 @@ $('.carousel').carousel({
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/less.html b/docs/less.html
index 30781a133cc2cbb382480f44bf7fefa0ccff1f3d..c383660d2094495598d38b18b70d81d2269eba05 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -288,7 +288,7 @@
       </tr>
       <tr>
         <td><code>@tableBorder</code></td>
-        <td><code>ddd</code></td>
+        <td><code>#ddd</code></td>
       </tr>
     </tbody>
   </table>
@@ -1047,7 +1047,7 @@
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 870c18e8a97da8e305cdd40246f1f9a32040770a..9b7b66cd2e5cabd50eab828e71484b28887eb33b 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -598,7 +598,7 @@
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>

diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 1d23c83703ab0c250a0efce3e17c0348eead02da..3c0d2b4ca31bb32cd542d6343783595a12042dc0 100644 (file)
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -127,7 +127,7 @@
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">{{_i}}Back to top{{/i}}</a></p>
+        <p class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p>
         <p>{{_i}}Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.{{/i}}</p>
         <p>{{_i}}Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>
         <p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p>

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index a6cea5750712b4620937331965fd7a1d93db98f3..1f0546657c327bea47881c6e58a81d941148678c 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -47,7 +47,7 @@
   <p>{{_i}}The typographic scale is based on two LESS variables in <strong>variables.less</strong>: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.{{/i}}</p>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   {{! Emphasis }}
@@ -75,7 +75,7 @@
   <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5. <code>&lt;b&gt;</code> is meant to highlight words or phrases without conveying additional importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.{{/i}}</p>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   {{! Abbreviations }}
@@ -101,7 +101,7 @@
 </pre>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   {{! Addresses }}
@@ -137,7 +137,7 @@
 </pre>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   {{! Blockquotes }}
@@ -191,7 +191,7 @@
 </pre>
 
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
 
   <!-- Lists -->
@@ -731,27 +731,10 @@
     <h1>{{_i}}Forms{{/i}}</h1>
   </div>
 
-  <h2>{{_i}}Flexible HTML and CSS{{/i}}</h2>
-  <p>{{_i}}The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.{{/i}}</p>
-  <p>{{_i}}More complicated layouts come with succinct and scalable classes for easy styling and event binding, so you're covered at every step.{{/i}}</p>
-
-  <h2>{{_i}}Four layouts included{{/i}}</h2>
-  <p>{{_i}}Bootstrap comes with support for four types of form layouts:{{/i}}</p>
-  <ul>
-    <li>{{_i}}Vertical (default){{/i}}</li>
-    <li>{{_i}}Search{{/i}}</li>
-    <li>{{_i}}Inline{{/i}}</li>
-    <li>{{_i}}Horizontal{{/i}}</li>
-  </ul>
-  <p>{{_i}}Different types of form layouts require some changes to markup, but the controls themselves remain and behave the same.{{/i}}</p>
-
-  <h2>{{_i}}Control states and more{{/i}}</h2>
-  <p>{{_i}}Bootstrap's forms include styles for all the base form controls like input, textarea, and select you'd expect. But it also comes with a number of custom components like appended and prepended inputs and support for lists of checkboxes.{{/i}}</p>
-  <p>{{_i}}States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.{{/i}}</p>
-
-
-  <h2>{{_i}}Four types of forms{{/i}}</h2>
-  <p>{{_i}}Bootstrap provides simple markup and styles for four styles of common web forms.{{/i}}</p>
+  <h2>{{_i}}Controls and layouts{{/i}}</h2>
+  <p>{{_i}}Forms include styles for all the base form controls like <code>input</code>, <code>textarea</code>, and <code>select</code> you'd expect. There are also a number of custom components like appended and prepended inputs and support for lists of checkboxes.{{/i}}</p>
+  <p>{{_i}}Bootstrap provides simple markup and styles for four styles of common web forms. Each layout requires small changes to surrounding markup, but the controls themselves remain and behave the same.{{/i}}</p>
+  <p>{{_i}}Error, warning, and success states are included for form controls, as wel as disabled.{{/i}}</p>
   <table class="table table-bordered table-striped">
     <thead>
       <tr>
@@ -784,7 +767,6 @@
     </tbody>
   </table>
 
-
   <h2>{{_i}}Example forms <small>using just form controls, no extra markup</small>{{/i}}</h2>
   <h3>{{_i}}Basic form{{/i}}</h3>
   <p>{{_i}}Smart and lightweight defaults without extra markup.{{/i}}</p>

diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index a755ced784fe744ec22cccfef10165839e2bb75a..e7f19fa773dcb5a1828707ac9927ede9f37fcb23 100644 (file)
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -35,7 +35,7 @@
   </div>
 </header>
 
-<hr class="soften">
+<hr class="bs-docs-separator">
 
 <div class="marketing">
   <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
@@ -77,7 +77,7 @@
     </div>
   </div><!--/row-->
 
-  <hr class="soften">
+  <hr class="bs-docs-separator">
 
   <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
   <p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>

diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 72b7f3bb3d9f20ad98fb635af300a44f2d0bb2ba..fe33cd247223c71817d789e257e39b56a86c1730 100644 (file)
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -177,7 +177,7 @@
       </tr>
       <tr>
         <td><code>@tableBorder</code></td>
-        <td><code>ddd</code></td>
+        <td><code>#ddd</code></td>
       </tr>
     </tbody>
   </table>

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 85d8f9ef0e86df10a2ab247a00d61d72270cd2db..9611ffc41d3563e10067e1cffd25205668435735 100644 (file)
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -308,7 +308,7 @@
      <!-- Footer
       ================================================== -->
       <footer class="footer">
-        <p clas="right"><a href="#">Back to top</a></p>
+        <p class="pull-right"><a href="#">Back to top</a></p>
         <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
         <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
         <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>