revamp docs to have new width, start realigning the base css page to match

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 2d4eedefed4fd6dfedd9b52a507178bcd653a475..dce385eb687439c10e465e3c9152849f3782b91f 100644 (file)
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -17,6 +17,10 @@ body {
   background-position: 0 40px;
 }
 
+.bs-docs-container {
+  max-width: 780px;
+  margin: 0 auto;
+}
 
 /* Tweak navbar brand link to be super sleek
 -------------------------------------------------- */
@@ -571,7 +575,7 @@ form.well {
   margin: 15px 0;
   padding: 39px 19px 14px;
   background-color: #fff;
-  border: 1px solid #e5e5e5;
+  border: 1px solid #ddd;
   -webkit-border-radius: 4px;
      -moz-border-radius: 4px;
           border-radius: 4px;
@@ -582,11 +586,10 @@ form.well {
   top: -1px;
   left: -1px;
   padding: 3px 7px;
-  font-family: "Open Sans", sans-serif;
   font-size: 12px;
   font-weight: bold;
   background-color: #f5f5f5;
-  border: 1px solid #e5e5e5;
+  border: 1px solid #ddd;
   color: #9da0a4;
   -webkit-border-radius: 4px 0 4px 0;
      -moz-border-radius: 4px 0 4px 0;

diff --git a/docs/base-css.html b/docs/base-css.html
index 09552ec8bc7d4c69a7c4cb2dd4e0aaced63de4cc..d22fbc1217b67c2dd8270344422143b152fdfa01 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->
@@ -101,35 +101,37 @@
     <h1>Typography <small>Headings, paragraphs, lists, and other inline type elements</small></h1>
   </div>
 
-  <h2>Headings &amp; body copy</h2>
+  <h2>Headings</h2>
+  <p>All HTML headings, <code>&lt;h1&gt;</code> through <code>&lt;h6&gt;</code> are available.</p>
+  <div class="bs-docs-example">
+    <h1>h1. Heading 1</h1>
+    <h2>h2. Heading 2</h2>
+    <h3>h3. Heading 3</h3>
+    <h4>h4. Heading 4</h4>
+    <h5>h5. Heading 5</h5>
+    <h6>h6. Heading 6</h6>
+  </div>
 
-  <!-- Headings & Paragraph Copy -->
-  <div class="row">
-    <div class="span4">
-      <h3>Typographic scale</h3>
-      <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">
-      <h3>Example body text</h3>
-      <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
-      <h3>Lead body copy</h3>
-      <p>Make a paragraph stand out by adding <code>.lead</code>.</p>
-      <p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
-    </div>
-    <div class="span4">
-      <div class="well">
-        <h1>h1. Heading 1</h1>
-        <h2>h2. Heading 2</h2>
-        <h3>h3. Heading 3</h3>
-        <h4>h4. Heading 4</h4>
-        <h5>h5. Heading 5</h5>
-        <h6>h6. Heading 6</h6>
-      </div>
-    </div>
+  <h2>Body copy</h2>
+  <p>Bootstrap's global default <code>font-size</code> is <strong>13px</strong>, with a <code>line-height</code> of <strong>18px</strong>. This is applied to the <code>&lt;body&gt;</code> and all paragraphs. In addition, <code>&lt;p&gt;</code> (paragraphs) receive a bottom margin of half their line-height (9px by default).</p>
+  <div class="bs-docs-example">
+    <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
+    <p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p>
+    <p>Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
   </div>
 
-  <!-- Misc Elements -->
+  <h2>Lead body copy</h2>
+  <p>Make a paragraph stand out by adding <code>.lead</code>.</p>
+  <div class="bs-docs-example">
+    <p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
+  </div>
+
+  <h2>Built with Less</h2>
+  <p>The typographic scale is based on two Less variables in 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. Customize them and watch Bootstrap adapt as you go.</p>
+
+  <hr>
+
   <h2>Emphasis, address, and abbreviation</h2>
   <table class="table table-bordered table-striped">
     <thead>
@@ -188,37 +190,39 @@
     </tbody>
   </table>
 
-  <div class="row">
-    <div class="span4">
-      <h3>Using emphasis</h3>
-      <p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
-      <p><strong>Note:</strong> Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5, but their usage has changed a bit. <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>
-    </div>
-    <div class="span4">
-      <h3>Example addresses</h3>
-      <p>Here are two examples of how the <code>&lt;address&gt;</code> tag can be used:</p>
-      <address>
-        <strong>Twitter, Inc.</strong><br>
-        795 Folsom Ave, Suite 600<br>
-        San Francisco, CA 94107<br>
-        <abbr title="Phone">P:</abbr> (123) 456-7890
-      </address>
-      <address>
-        <strong>Full Name</strong><br>
-        <a href="mailto:#">first.last@gmail.com</a>
-      </address>
-    </div>
-    <div class="span4">
-      <h3>Example abbreviations</h3>
-      <p>Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.</p>
-      <p>Add the <code>initialism</code> class to an abbreviation to increase typographic harmony by giving it a slightly smaller text size.</p>
-      <p><abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.</p>
-      <p>An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.</p>
-    </div>
+  <h3>Using emphasis</h3>
+  <div class="bs-docs-example">
+    <p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
+  </div>
+  <p><strong>Note:</strong> 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>
+
+  <h3>Example addresses</h3>
+  <p>Here are two examples of how the <code>&lt;address&gt;</code> tag can be used:</p>
+  <div class="bs-docs-example">
+    <address>
+      <strong>Twitter, Inc.</strong><br>
+      795 Folsom Ave, Suite 600<br>
+      San Francisco, CA 94107<br>
+      <abbr title="Phone">P:</abbr> (123) 456-7890
+    </address>
+    <address>
+      <strong>Full Name</strong><br>
+      <a href="mailto:#">first.last@gmail.com</a>
+    </address>
   </div>
 
+  <h3>Example abbreviations</h3>
+  <p>Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.</p>
+  <div class="bs-docs-example">
+    <p>An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.</p>
+  </div>
+  <p>Add the <code>initialism</code> class to an abbreviation for a slightly smaller font-size.</p>
+  <div class="bs-docs-example">
+    <p><abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.</p>
+  </div>
+
+  <hr>
 
-  <!-- Blockquotes -->
   <h2>Blockquotes</h2>
   <table class="table table-bordered table-striped">
     <thead>
@@ -254,136 +258,125 @@
       </tr>
     </tbody>
   </table>
-  <div class="row">
-    <div class="span4">
-      <p>To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.</p>
-      <p>Include an optional <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it for styling purposes.</p>
-    </div>
-    <div class="span8">
+  <p>To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.</p>
+  <p>Include an optional <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it for styling purposes.</p>
 <pre class="prettyprint linenums">
 &lt;blockquote&gt;
   &lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.&lt;/p&gt;
   &lt;small&gt;Someone famous&lt;/small&gt;
 &lt;/blockquote&gt;
 </pre>
-    </div>
-  </div><!--/row-->
-
   <h3>Example blockquotes</h3>
-  <div class="row">
-    <div class="span6">
-      <p>Default blockquotes are styled as such:</p>
-      <blockquote>
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
-        <small>Someone famous in <cite title="">Body of work</cite></small>
-      </blockquote>
-    </div>
-    <div class="span6">
-      <p>To float your blockquote to the right, add <code>class="pull-right"</code>:</p>
-      <blockquote class="pull-right">
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
-        <small>Someone famous in <cite title="">Body of work</cite></small>
-      </blockquote>
-    </div>
+  <p>Default blockquotes are styled as such:</p>
+  <div class="bs-docs-example">
+    <blockquote>
+      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
+      <small>Someone famous in <cite title="">Body of work</cite></small>
+    </blockquote>
+  </div>
+  <p>To float your blockquote to the right, add <code>class="pull-right"</code>:</p>
+  <div class="bs-docs-example">
+    <blockquote class="pull-right">
+      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
+      <small>Someone famous in <cite title="">Body of work</cite></small>
+    </blockquote>
   </div>
 
+  <hr>
 
   <!-- Lists -->
   <h2>Lists</h2>
-  <div class="row">
-    <div class="span4">
-      <h3>Unordered</h3>
-      <p><code>&lt;ul&gt;</code></p>
+
+  <h3>Unordered</h3>
+  <p>A list of items in which the order does not explicitly matter.</p>
+  <div class="bs-docs-example">
+    <ul>
+      <li>Lorem ipsum dolor sit amet</li>
+      <li>Consectetur adipiscing elit</li>
+      <li>Integer molestie lorem at massa</li>
+      <li>Facilisis in pretium nisl aliquet</li>
+      <li>Nulla volutpat aliquam velit
+        <ul>
+          <li>Phasellus iaculis neque</li>
+          <li>Purus sodales ultricies</li>
+          <li>Vestibulum laoreet porttitor sem</li>
+          <li>Ac tristique libero volutpat at</li>
+        </ul>
+      </li>
+      <li>Faucibus porta lacus fringilla vel</li>
+      <li>Aenean sit amet erat nunc</li>
+      <li>Eget porttitor lorem</li>
+    </ul>
+  </div>
+<pre class="prettyprint linenums">
+&lt;ul&gt;
+  &lt;li&gt;...&lt;/li&gt;
+&lt;/ul&gt;
+</pre>
+
+  <h3>Unstyled</h3>
+  <p><code>&lt;ul class="unstyled"&gt;</code></p>
+  <ul class="unstyled">
+    <li>Lorem ipsum dolor sit amet</li>
+    <li>Consectetur adipiscing elit</li>
+    <li>Integer molestie lorem at massa</li>
+    <li>Facilisis in pretium nisl aliquet</li>
+    <li>Nulla volutpat aliquam velit
       <ul>
-        <li>Lorem ipsum dolor sit amet</li>
-        <li>Consectetur adipiscing elit</li>
-        <li>Integer molestie lorem at massa</li>
-        <li>Facilisis in pretium nisl aliquet</li>
-        <li>Nulla volutpat aliquam velit
-          <ul>
-            <li>Phasellus iaculis neque</li>
-            <li>Purus sodales ultricies</li>
-            <li>Vestibulum laoreet porttitor sem</li>
-            <li>Ac tristique libero volutpat at</li>
-          </ul>
-        </li>
-        <li>Faucibus porta lacus fringilla vel</li>
-        <li>Aenean sit amet erat nunc</li>
-        <li>Eget porttitor lorem</li>
+        <li>Phasellus iaculis neque</li>
+        <li>Purus sodales ultricies</li>
+        <li>Vestibulum laoreet porttitor sem</li>
+        <li>Ac tristique libero volutpat at</li>
       </ul>
-    </div>
-    <div class="span4">
-      <h3>Unstyled</h3>
-      <p><code>&lt;ul class="unstyled"&gt;</code></p>
-      <ul class="unstyled">
-        <li>Lorem ipsum dolor sit amet</li>
-        <li>Consectetur adipiscing elit</li>
-        <li>Integer molestie lorem at massa</li>
-        <li>Facilisis in pretium nisl aliquet</li>
-        <li>Nulla volutpat aliquam velit
-          <ul>
-            <li>Phasellus iaculis neque</li>
-            <li>Purus sodales ultricies</li>
-            <li>Vestibulum laoreet porttitor sem</li>
-            <li>Ac tristique libero volutpat at</li>
-          </ul>
-        </li>
-        <li>Faucibus porta lacus fringilla vel</li>
-        <li>Aenean sit amet erat nunc</li>
-        <li>Eget porttitor lorem</li>
-      </ul>
-    </div>
-    <div class="span4">
-      <h3>Ordered</h3>
-      <p><code>&lt;ol&gt;</code></p>
-      <ol>
-        <li>Lorem ipsum dolor sit amet</li>
-        <li>Consectetur adipiscing elit</li>
-        <li>Integer molestie lorem at massa</li>
-        <li>Facilisis in pretium nisl aliquet</li>
-        <li>Nulla volutpat aliquam velit</li>
-        <li>Faucibus porta lacus fringilla vel</li>
-        <li>Aenean sit amet erat nunc</li>
-        <li>Eget porttitor lorem</li>
-      </ol>
-    </div>
-  </div><!-- /row -->
-  <br>
-  <div class="row">
-    <div class="span4">
-      <h3>Description</h3>
-      <p><code>&lt;dl&gt;</code></p>
-      <dl>
-        <dt>Description lists</dt>
-        <dd>A description list is perfect for defining terms.</dd>
-        <dt>Euismod</dt>
-        <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
-        <dd>Donec id elit non mi porta gravida at eget metus.</dd>
-        <dt>Malesuada porta</dt>
-        <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
-      </dl>
-    </div>
-    <div class="span8">
-      <h3>Horizontal description</h3>
-      <p><code>&lt;dl class="dl-horizontal"&gt;</code></p>
-      <dl class="dl-horizontal">
-        <dt>Description lists</dt>
-        <dd>A description list is perfect for defining terms.</dd>
-        <dt>Euismod</dt>
-        <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
-        <dd>Donec id elit non mi porta gravida at eget metus.</dd>
-        <dt>Malesuada porta</dt>
-        <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
-        <dt>Felis euismod semper eget lacinia</dt>
-        <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd>
-      </dl>
-      <hr>
-      <p>
-        <span class="label label-info">Heads up!</span>
-        Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.
-      </p>
-    </div>
-  </div><!-- /row -->
+    </li>
+    <li>Faucibus porta lacus fringilla vel</li>
+    <li>Aenean sit amet erat nunc</li>
+    <li>Eget porttitor lorem</li>
+  </ul>
+
+  <h3>Ordered</h3>
+  <p><code>&lt;ol&gt;</code></p>
+  <ol>
+    <li>Lorem ipsum dolor sit amet</li>
+    <li>Consectetur adipiscing elit</li>
+    <li>Integer molestie lorem at massa</li>
+    <li>Facilisis in pretium nisl aliquet</li>
+    <li>Nulla volutpat aliquam velit</li>
+    <li>Faucibus porta lacus fringilla vel</li>
+    <li>Aenean sit amet erat nunc</li>
+    <li>Eget porttitor lorem</li>
+  </ol>
+
+  <h3>Description</h3>
+  <p><code>&lt;dl&gt;</code></p>
+  <dl>
+    <dt>Description lists</dt>
+    <dd>A description list is perfect for defining terms.</dd>
+    <dt>Euismod</dt>
+    <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
+    <dd>Donec id elit non mi porta gravida at eget metus.</dd>
+    <dt>Malesuada porta</dt>
+    <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
+  </dl>
+
+  <h3>Horizontal description</h3>
+  <p><code>&lt;dl class="dl-horizontal"&gt;</code></p>
+  <dl class="dl-horizontal">
+    <dt>Description lists</dt>
+    <dd>A description list is perfect for defining terms.</dd>
+    <dt>Euismod</dt>
+    <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
+    <dd>Donec id elit non mi porta gravida at eget metus.</dd>
+    <dt>Malesuada porta</dt>
+    <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
+    <dt>Felis euismod semper eget lacinia</dt>
+    <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd>
+  </dl>
+  <hr>
+  <p>
+    <span class="label label-info">Heads up!</span>
+    Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.
+  </p>
 </section>
 
 

diff --git a/docs/components.html b/docs/components.html
index f923cd5e22c51336af62fc910bd2d7fae6e91ef4..d833fa186d7df8be6843ed26e596520e6b94f5e9 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->

diff --git a/docs/download.html b/docs/download.html
index a387c792177eecd466381072ea763805c9217cab..1585f49c672dabd0094d36992da4cab105b939f5 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->

diff --git a/docs/examples.html b/docs/examples.html
index 5e8d74a3b530ab7c043ee8f4c6ca19d6f6fe371c..fccc65d0dbb684b6b59d6819bcb86938db69dc5f 100644 (file)
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->

diff --git a/docs/index.html b/docs/index.html
index 99f2f7714f56f1526bdead3fc5babdc122ebe328..8248e0ae348930e40a1780c35b939b1307e73180 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->

diff --git a/docs/javascript.html b/docs/javascript.html
index a60d45316dd28842216ad00d25300454f1891ac7..cd2488f851d39a658a0948ebac0bdd37a008fabf 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
       <!-- Masthead
       ================================================== -->

diff --git a/docs/less.html b/docs/less.html
index ad860bd4bd5fd70c67337f3b248e2385ae8c9bc3..924907eaca5d7dbdd33145b40d239ba0fe49312f 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 4d6835caf0d6ad5fe746ee1e15f3dedeef4567cb..8ff977b73696b5bcba156d72715b0687bec1dee4 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->

diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index ae2ce4aad0e060a3aff354614a6a1454f926bfe1..c0b19e1b2c0c946a9f41441e4d1244d3ef3ed076 100644 (file)
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -86,7 +86,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 {{>body}}
 

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index aaf575b0b786dfa751e467145f20541625501a7d..42f3d4d78c3e56db857f713524135cb3148cbc2c 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -23,35 +23,42 @@
     <h1>{{_i}}Typography <small>Headings, paragraphs, lists, and other inline type elements</small>{{/i}}</h1>
   </div>
 
-  <h2>{{_i}}Headings &amp; body copy{{/i}}</h2>
+  {{! Headings }}
+  <h2>{{_i}}Headings{{/i}}</h2>
+  <p>{{_i}}All HTML headings, <code>&lt;h1&gt;</code> through <code>&lt;h6&gt;</code> are available.{{/i}}</p>
+  <div class="bs-docs-example">
+    <h1>h1. {{_i}}Heading 1{{/i}}</h1>
+    <h2>h2. {{_i}}Heading 2{{/i}}</h2>
+    <h3>h3. {{_i}}Heading 3{{/i}}</h3>
+    <h4>h4. {{_i}}Heading 4{{/i}}</h4>
+    <h5>h5. {{_i}}Heading 5{{/i}}</h5>
+    <h6>h6. {{_i}}Heading 6{{/i}}</h6>
+  </div>
 
-  <!-- Headings & Paragraph Copy -->
-  <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 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">
-      <h3>{{_i}}Example body text{{/i}}</h3>
-      <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
-      <h3>{{_i}}Lead body copy{{/i}}</h3>
-      <p>{{_i}}Make a paragraph stand out by adding <code>.lead</code>.{{/i}}</p>
-      <p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
-    </div>
-    <div class="span4">
-      <div class="well">
-        <h1>h1. {{_i}}Heading 1{{/i}}</h1>
-        <h2>h2. {{_i}}Heading 2{{/i}}</h2>
-        <h3>h3. {{_i}}Heading 3{{/i}}</h3>
-        <h4>h4. {{_i}}Heading 4{{/i}}</h4>
-        <h5>h5. {{_i}}Heading 5{{/i}}</h5>
-        <h6>h6. {{_i}}Heading 6{{/i}}</h6>
-      </div>
-    </div>
+  {{! Body copy }}
+  <h2>{{_i}}Body copy{{/i}}</h2>
+  <p>{{_i}}Bootstrap's global default <code>font-size</code> is <strong>13px</strong>, with a <code>line-height</code> of <strong>18px</strong>. This is applied to the <code>&lt;body&gt;</code> and all paragraphs. In addition, <code>&lt;p&gt;</code> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}</p>
+  <div class="bs-docs-example">
+    <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
+    <p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p>
+    <p>Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
   </div>
 
-  <!-- Misc Elements -->
+  {{! Body copy .lead }}
+  <h2>{{_i}}Lead body copy{{/i}}</h2>
+  <p>{{_i}}Make a paragraph stand out by adding <code>.lead</code>.{{/i}}</p>
+  <div class="bs-docs-example">
+    <p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
+  </div>
+
+  {{! Using LESS }}
+  <h2>{{_i}}Built with Less{{/i}}</h2>
+  <p>{{_i}}The typographic scale is based on two Less variables in 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. Customize them and watch Bootstrap adapt as you go.{{/i}}</p>
+
+  <hr>
+
+  {{! Misc Elements }}
   <h2>{{_i}}Emphasis, address, and abbreviation{{/i}}</h2>
   <table class="table table-bordered table-striped">
     <thead>
@@ -110,37 +117,43 @@
     </tbody>
   </table>
 
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}Using emphasis{{/i}}</h3>
-      <p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
-      <p>{{_i}}<strong>Note:</strong> Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5, but their usage has changed a bit. <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>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Example addresses{{/i}}</h3>
-      <p>{{_i}}Here are two examples of how the <code>&lt;address&gt;</code> tag can be used:{{/i}}</p>
-      <address>
-        <strong>Twitter, Inc.</strong><br>
-        795 Folsom Ave, Suite 600<br>
-        San Francisco, CA 94107<br>
-        <abbr title="Phone">P:</abbr> (123) 456-7890
-      </address>
-      <address>
-        <strong>{{_i}}Full Name{{/i}}</strong><br>
-        <a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a>
-      </address>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Example abbreviations{{/i}}</h3>
-      <p>{{_i}}Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.{{/i}}</p>
-      <p>{{_i}}Add the <code>initialism</code> class to an abbreviation to increase typographic harmony by giving it a slightly smaller text size.{{/i}}</p>
-      <p>{{_i}}<abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.{{/i}}</p>
-      <p>{{_i}}An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.{{/i}}</p>
-    </div>
+  {{! Emphasis }}
+  <h3>{{_i}}Using emphasis{{/i}}</h3>
+  <div class="bs-docs-example">
+    <p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
   </div>
+  <p>{{_i}}<strong>Note:</strong> 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>
 
+  {{! Addresses }}
+  <h3>{{_i}}Example addresses{{/i}}</h3>
+  <p>{{_i}}Here are two examples of how the <code>&lt;address&gt;</code> tag can be used:{{/i}}</p>
+  <div class="bs-docs-example">
+    <address>
+      <strong>Twitter, Inc.</strong><br>
+      795 Folsom Ave, Suite 600<br>
+      San Francisco, CA 94107<br>
+      <abbr title="Phone">P:</abbr> (123) 456-7890
+    </address>
+    <address>
+      <strong>{{_i}}Full Name{{/i}}</strong><br>
+      <a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a>
+    </address>
+  </div>
 
-  <!-- Blockquotes -->
+  {{! Abbreviations }}
+  <h3>{{_i}}Example abbreviations{{/i}}</h3>
+  <p>{{_i}}Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.{{/i}}</p>
+  <div class="bs-docs-example">
+    <p>{{_i}}An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.{{/i}}</p>
+  </div>
+  <p>{{_i}}Add the <code>initialism</code> class to an abbreviation for a slightly smaller font-size.{{/i}}</p>
+  <div class="bs-docs-example">
+    <p>{{_i}}<abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.{{/i}}</p>
+  </div>
+
+  <hr>
+
+  {{! Blockquotes }}
   <h2>{{_i}}Blockquotes{{/i}}</h2>
   <table class="table table-bordered table-striped">
     <thead>
@@ -176,136 +189,125 @@
       </tr>
     </tbody>
   </table>
-  <div class="row">
-    <div class="span4">
-      <p>{{_i}}To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.{{/i}}</p>
-      <p>{{_i}}Include an optional <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it for styling purposes.{{/i}}</p>
-    </div>
-    <div class="span8">
+  <p>{{_i}}To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.{{/i}}</p>
+  <p>{{_i}}Include an optional <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it for styling purposes.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;blockquote&gt;
   &lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.&lt;/p&gt;
   &lt;small&gt;{{_i}}Someone famous{{/i}}&lt;/small&gt;
 &lt;/blockquote&gt;
 </pre>
-    </div>
-  </div><!--/row-->
-
   <h3>{{_i}}Example blockquotes{{/i}}</h3>
-  <div class="row">
-    <div class="span6">
-      <p>{{_i}}Default blockquotes are styled as such:{{/i}}</p>
-      <blockquote>
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
-        <small>{{_i}}Someone famous in <cite title="">Body of work</cite>{{/i}}</small>
-      </blockquote>
-    </div>
-    <div class="span6">
-      <p>{{_i}}To float your blockquote to the right, add <code>class="pull-right"</code>:{{/i}}</p>
-      <blockquote class="pull-right">
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
-        <small>{{_i}}Someone famous in <cite title="">Body of work</cite>{{/i}}</small>
-      </blockquote>
-    </div>
+  <p>{{_i}}Default blockquotes are styled as such:{{/i}}</p>
+  <div class="bs-docs-example">
+    <blockquote>
+      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
+      <small>{{_i}}Someone famous in <cite title="">Body of work</cite>{{/i}}</small>
+    </blockquote>
+  </div>
+  <p>{{_i}}To float your blockquote to the right, add <code>class="pull-right"</code>:{{/i}}</p>
+  <div class="bs-docs-example">
+    <blockquote class="pull-right">
+      <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
+      <small>{{_i}}Someone famous in <cite title="">Body of work</cite>{{/i}}</small>
+    </blockquote>
   </div>
 
+  <hr>
 
   <!-- Lists -->
   <h2>{{_i}}Lists{{/i}}</h2>
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}Unordered{{/i}}</h3>
-      <p><code>&lt;ul&gt;</code></p>
+
+  <h3>{{_i}}Unordered{{/i}}</h3>
+  <p>{{_i}}A list of items in which the order does not explicitly matter.{{/i}}</p>
+  <div class="bs-docs-example">
+    <ul>
+      <li>Lorem ipsum dolor sit amet</li>
+      <li>Consectetur adipiscing elit</li>
+      <li>Integer molestie lorem at massa</li>
+      <li>Facilisis in pretium nisl aliquet</li>
+      <li>Nulla volutpat aliquam velit
+        <ul>
+          <li>Phasellus iaculis neque</li>
+          <li>Purus sodales ultricies</li>
+          <li>Vestibulum laoreet porttitor sem</li>
+          <li>Ac tristique libero volutpat at</li>
+        </ul>
+      </li>
+      <li>Faucibus porta lacus fringilla vel</li>
+      <li>Aenean sit amet erat nunc</li>
+      <li>Eget porttitor lorem</li>
+    </ul>
+  </div>
+<pre class="prettyprint linenums">
+&lt;ul&gt;
+  &lt;li&gt;...&lt;/li&gt;
+&lt;/ul&gt;
+</pre>
+
+  <h3>{{_i}}Unstyled{{/i}}</h3>
+  <p><code>&lt;ul class="unstyled"&gt;</code></p>
+  <ul class="unstyled">
+    <li>Lorem ipsum dolor sit amet</li>
+    <li>Consectetur adipiscing elit</li>
+    <li>Integer molestie lorem at massa</li>
+    <li>Facilisis in pretium nisl aliquet</li>
+    <li>Nulla volutpat aliquam velit
       <ul>
-        <li>Lorem ipsum dolor sit amet</li>
-        <li>Consectetur adipiscing elit</li>
-        <li>Integer molestie lorem at massa</li>
-        <li>Facilisis in pretium nisl aliquet</li>
-        <li>Nulla volutpat aliquam velit
-          <ul>
-            <li>Phasellus iaculis neque</li>
-            <li>Purus sodales ultricies</li>
-            <li>Vestibulum laoreet porttitor sem</li>
-            <li>Ac tristique libero volutpat at</li>
-          </ul>
-        </li>
-        <li>Faucibus porta lacus fringilla vel</li>
-        <li>Aenean sit amet erat nunc</li>
-        <li>Eget porttitor lorem</li>
+        <li>Phasellus iaculis neque</li>
+        <li>Purus sodales ultricies</li>
+        <li>Vestibulum laoreet porttitor sem</li>
+        <li>Ac tristique libero volutpat at</li>
       </ul>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Unstyled{{/i}}</h3>
-      <p><code>&lt;ul class="unstyled"&gt;</code></p>
-      <ul class="unstyled">
-        <li>Lorem ipsum dolor sit amet</li>
-        <li>Consectetur adipiscing elit</li>
-        <li>Integer molestie lorem at massa</li>
-        <li>Facilisis in pretium nisl aliquet</li>
-        <li>Nulla volutpat aliquam velit
-          <ul>
-            <li>Phasellus iaculis neque</li>
-            <li>Purus sodales ultricies</li>
-            <li>Vestibulum laoreet porttitor sem</li>
-            <li>Ac tristique libero volutpat at</li>
-          </ul>
-        </li>
-        <li>Faucibus porta lacus fringilla vel</li>
-        <li>Aenean sit amet erat nunc</li>
-        <li>Eget porttitor lorem</li>
-      </ul>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Ordered{{/i}}</h3>
-      <p><code>&lt;ol&gt;</code></p>
-      <ol>
-        <li>Lorem ipsum dolor sit amet</li>
-        <li>Consectetur adipiscing elit</li>
-        <li>Integer molestie lorem at massa</li>
-        <li>Facilisis in pretium nisl aliquet</li>
-        <li>Nulla volutpat aliquam velit</li>
-        <li>Faucibus porta lacus fringilla vel</li>
-        <li>Aenean sit amet erat nunc</li>
-        <li>Eget porttitor lorem</li>
-      </ol>
-    </div>
-  </div><!-- /row -->
-  <br>
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}Description{{/i}}</h3>
-      <p><code>&lt;dl&gt;</code></p>
-      <dl>
-        <dt>{{_i}}Description lists{{/i}}</dt>
-        <dd>{{_i}}A description list is perfect for defining terms.{{/i}}</dd>
-        <dt>Euismod</dt>
-        <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
-        <dd>Donec id elit non mi porta gravida at eget metus.</dd>
-        <dt>Malesuada porta</dt>
-        <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
-      </dl>
-    </div>
-    <div class="span8">
-      <h3>{{_i}}Horizontal description{{/i}}</h3>
-      <p><code>&lt;dl class="dl-horizontal"&gt;</code></p>
-      <dl class="dl-horizontal">
-        <dt>{{_i}}Description lists{{/i}}</dt>
-        <dd>{{_i}}A description list is perfect for defining terms.{{/i}}</dd>
-        <dt>Euismod</dt>
-        <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
-        <dd>Donec id elit non mi porta gravida at eget metus.</dd>
-        <dt>Malesuada porta</dt>
-        <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
-        <dt>Felis euismod semper eget lacinia</dt>
-        <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd>
-      </dl>
-      <hr>
-      <p>
-        <span class="label label-info">{{_i}}Heads up!{{/i}}</span>
-        {{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.{{/i}}
-      </p>
-    </div>
-  </div><!-- /row -->
+    </li>
+    <li>Faucibus porta lacus fringilla vel</li>
+    <li>Aenean sit amet erat nunc</li>
+    <li>Eget porttitor lorem</li>
+  </ul>
+
+  <h3>{{_i}}Ordered{{/i}}</h3>
+  <p><code>&lt;ol&gt;</code></p>
+  <ol>
+    <li>Lorem ipsum dolor sit amet</li>
+    <li>Consectetur adipiscing elit</li>
+    <li>Integer molestie lorem at massa</li>
+    <li>Facilisis in pretium nisl aliquet</li>
+    <li>Nulla volutpat aliquam velit</li>
+    <li>Faucibus porta lacus fringilla vel</li>
+    <li>Aenean sit amet erat nunc</li>
+    <li>Eget porttitor lorem</li>
+  </ol>
+
+  <h3>{{_i}}Description{{/i}}</h3>
+  <p><code>&lt;dl&gt;</code></p>
+  <dl>
+    <dt>{{_i}}Description lists{{/i}}</dt>
+    <dd>{{_i}}A description list is perfect for defining terms.{{/i}}</dd>
+    <dt>Euismod</dt>
+    <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
+    <dd>Donec id elit non mi porta gravida at eget metus.</dd>
+    <dt>Malesuada porta</dt>
+    <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
+  </dl>
+
+  <h3>{{_i}}Horizontal description{{/i}}</h3>
+  <p><code>&lt;dl class="dl-horizontal"&gt;</code></p>
+  <dl class="dl-horizontal">
+    <dt>{{_i}}Description lists{{/i}}</dt>
+    <dd>{{_i}}A description list is perfect for defining terms.{{/i}}</dd>
+    <dt>Euismod</dt>
+    <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
+    <dd>Donec id elit non mi porta gravida at eget metus.</dd>
+    <dt>Malesuada porta</dt>
+    <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
+    <dt>Felis euismod semper eget lacinia</dt>
+    <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd>
+  </dl>
+  <hr>
+  <p>
+    <span class="label label-info">{{_i}}Heads up!{{/i}}</span>
+    {{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.{{/i}}
+  </p>
 </section>
 
 

diff --git a/docs/upgrading.html b/docs/upgrading.html
index 2a2c3981867ff2b1f42ff7711ccacae2f089b5f7..92ddbe7e654a02da737437051c20e61ed7c6e05e 100644 (file)
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -74,7 +74,7 @@
       </div>
     </div>
 
-    <div class="container">
+    <div class="bs-docs-container">
 
 <!-- Masthead
 ================================================== -->