hella examples fixing, mostly navbars and lots of work on grids example

author: Mark Otto <[email protected]> 2013-08-15 17:39:37 -0700
committer: Mark Otto <[email protected]> 2013-08-15 17:39:37 -0700
commit: 024e320e5c3cf1adce8404f87e7c0c746461b6e8 (patch)
tree: f142ffcba74795c717cfa94b92e3f79ef561d1bc /examples/grid
parent: 05ebd5ebf9b32e7c1d8ea05098c53a0b4496d442 (diff)
download: bootstrap-024e320e5c3cf1adce8404f87e7c0c746461b6e8.tar.xz
bootstrap-024e320e5c3cf1adce8404f87e7c0c746461b6e8.zip
2 files changed, 63 insertions, 40 deletions
diff --git a/examples/grid/grid.css b/examples/grid/grid.css
index c213ac6a7..963b128e3 100644
--- a/examples/grid/grid.css
+++ b/examples/grid/grid.css
@@ -13,9 +13,16 @@ h4 {
   margin-top: 10px;
   margin-bottom: 0;
 }
-[class*="col-lg-"] {
+[class*="col-"] {
   padding-top: 15px;
   padding-bottom: 15px;
-  background-color: rgba(185,74,72,.15);
-  border: 1px solid rgba(185,74,72,.2);
+  background-color: #eee;
+  border: 1px solid #ddd;
+  background-color: rgba(86,61,124,.15);
+  border: 1px solid rgba(86,61,124,.2);
 }
+
+hr {
+  margin-top: 40px;
+  margin-bottom: 40px;
+}
+\ No newline at end of file
diff --git a/examples/grid/index.html b/examples/grid/index.html
index bd86f4ab9..4525f7e49 100644
--- a/examples/grid/index.html
+++ b/examples/grid/index.html
@@ -9,7 +9,7 @@
     <title>Grid Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="grid.css" rel="stylesheet">
@@ -18,72 +18,88 @@
   <body>
     <div class="container">
 
-      <h2>Bootstrap grids</h2>
-      <p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p>
+      <div class="page-header">
+        <h1>Bootstrap grid examples</h1>
+        <p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p>
+      </div>
 
-      <h4>Three equal columns</h4>
+      <h3>Three equal columns</h3>
+      <p>Get three equal-width columns <strong>starting at desktops and scaling to large desktops</strong>. On mobile devices, tablets and below, the columns will automatically stack.</p>
       <div class="row">
-        <div class="col-lg-4">.col-lg-4</div>
-        <div class="col-lg-4">.col-lg-4</div>
-        <div class="col-lg-4">.col-lg-4</div>
+        <div class="col-md-4">.col-md-4</div>
+        <div class="col-md-4">.col-md-4</div>
+        <div class="col-md-4">.col-md-4</div>
       </div>
 
-      <h4>Three unequal columns</h4>
+      <h3>Three unequal columns</h3>
+      <p>Get three columns <strong>starting at desktops and scaling to large desktops</strong> of various widths. Remember, grid columns should add up to twelve for a single horizontal block. More than that, and columns start stacking no matter the viewport.</p>
       <div class="row">
-        <div class="col-lg-3">.col-lg-3</div>
-        <div class="col-lg-6">.col-lg-6</div>
-        <div class="col-lg-3">.col-lg-3</div>
+        <div class="col-md-3">.col-md-3</div>
+        <div class="col-md-6">.col-md-6</div>
+        <div class="col-md-3">.col-md-3</div>
       </div>
 
-      <h4>Two columns</h4>
+      <h3>Two columns</h3>
+      <p>Get two columns <strong>starting at desktops and scaling to large desktops</strong>.</p>
       <div class="row">
-        <div class="col-lg-8">.col-lg-8</div>
-        <div class="col-lg-4">.col-lg-4</div>
+        <div class="col-md-8">.col-md-8</div>
+        <div class="col-md-4">.col-md-4</div>
       </div>
 
-      <h4>Full width, single column</h4>
+      <h3>Full width, single column</h3>
       <p class="text-warning">No grid classes are necessary for full-width elements.</p>
 
-      <h4>Two columns with two nested columns</h4>
+      <hr>
+
+      <h3>Two columns with two nested columns</h3>
+      <p>Per the documentation, nesting is easy—just put a row of columns within an existing row. This gives you two columns <strong>starting at desktops and scaling to large desktops</strong>, with another two (equal widths) within the larger column.</p>
+      <p>At mobile device sizes, tablets and down, these columns and their nested columns will stack.</p>
       <div class="row">
-        <div class="col-lg-8">
-          .col-lg-8
+        <div class="col-md-8">
+          .col-md-8
           <div class="row">
-            <div class="col-lg-6">.col-lg-6</div>
-            <div class="col-lg-6">.col-lg-6</div>
+            <div class="col-md-6">.col-md-6</div>
+            <div class="col-md-6">.col-md-6</div>
           </div>
         </div>
-        <div class="col-lg-4">.col-lg-4</div>
+        <div class="col-md-4">.col-md-4</div>
       </div>
 
-      <h4>Mixed: mobile and desktop</h4>
+      <hr>
+
+      <h3>Mixed: mobile and desktop</h3>
+      <p>The Bootstrap 3 grid system has four tiers of classes: xs (phones), sm (tablets), md (desktops), and lg (larger desktops). You can use nearly any combination of these classes to create more dynamic and flexible layouts.</p>
+      <p>Each tier of classes scales up, meaning if you plan on setting the same widths for xs and sm, you only need to specify xs.</p>
       <div class="row">
-        <div class="col-12 col-lg-8">.col-12 .col-lg-8</div>
-        <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+        <div class="col-xs-12 col-md-8">.col-xs-12 .col-md-8</div>
+        <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
       </div>
       <div class="row">
-        <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
-        <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
-        <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+        <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
+        <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
+        <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
       </div>
       <div class="row">
-        <div class="col-6 col-lg-6">.col-6 .col-lg-6</div>
-        <div class="col-6 col-lg-6">.col-6 .col-lg-6</div>
+        <div class="col-xs-6 col-md-6">.col-xs-6 .col-md-6</div>
+        <div class="col-xs-6 col-md-6">.col-xs-6 .col-md-6</div>
       </div>
 
-      <h4>Mixed: mobile, tablet, and desktop</h4>
+      <hr>
+
+      <h3>Mixed: mobile, tablet, and desktop</h3>
+      <p></p>
       <div class="row">
-        <div class="col-12 col-sm-8 col-lg-8">.col-12 .col-lg-8</div>
-        <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
+        <div class="col-xs-12 col-sm-8 col-lg-8">.col-xs-12 .col-lg-8</div>
+        <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-lg-4</div>
       </div>
       <div class="row">
-        <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
-        <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
-        <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
+        <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
+        <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
+        <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
       </div>
       <div class="row">
-        <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div>
-        <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div>
+        <div class="col-xs-6 col-sm-6 col-lg-6">.col-xs-6 .col-sm-6 .col-lg-6</div>
+        <div class="col-xs-6 col-sm-6 col-lg-6">.col-xs-6 .col-sm-6 .col-lg-6</div>
       </div>
 
     </div> <!-- /container -->
author	Mark Otto <[email protected]>	2013-08-15 17:39:37 -0700
committer	Mark Otto <[email protected]>	2013-08-15 17:39:37 -0700
commit	024e320e5c3cf1adce8404f87e7c0c746461b6e8 (patch)
tree	f142ffcba74795c717cfa94b92e3f79ef561d1bc /examples/grid
parent	05ebd5ebf9b32e7c1d8ea05098c53a0b4496d442 (diff)
download	bootstrap-024e320e5c3cf1adce8404f87e7c0c746461b6e8.tar.xz bootstrap-024e320e5c3cf1adce8404f87e7c0c746461b6e8.zip