Remove grid example; update grid classes in examples

diff --git a/carousel.html b/carousel.html
index 423fdc6d37564f1c0b072f0e1621a2e3a47a0bb7..598a6334b76769afaa0f95917e79656f6258b76c 100644 (file)
--- a/carousel.html
+++ b/carousel.html
@@ -120,13 +120,13 @@ body {
 -------------------------------------------------- */
 
 /* Center align the text within the three columns below the carousel */
-.marketing .span4 {
+.marketing .col-span-4 {
   text-align: center;
 }
 .marketing h2 {
   font-weight: normal;
 }
-.marketing .span4 p {
+.marketing .col-span-4 p {
   margin-left: 10px;
   margin-right: 10px;
 }
@@ -232,7 +232,7 @@ body {
     font-size: 18px;
   }
 
-  .marketing .span4 + .span4 {
+  .marketing .col-span-4 + .col-span-4 {
     margin-top: 40px;
   }
 
@@ -342,24 +342,24 @@ body {
 
   <!-- Three columns of text below the carousel -->
   <div class="row">
-    <div class="span4">
+    <div class="col-span-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.span4 -->
-    <div class="span4">
+    </div><!-- /.col-span-4 -->
+    <div class="col-span-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.span4 -->
-    <div class="span4">
+    </div><!-- /.col-span-4 -->
+    <div class="col-span-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
       <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div><!-- /.span4 -->
+    </div><!-- /.col-span-4 -->
   </div><!-- /.row -->
 
 

diff --git a/grid.html b/grid.html
deleted file mode 100644 (file)
index 4fc724a..0000000
--- a/grid.html
+++ /dev/null
@@ -1,64 +0,0 @@
----
-layout: example
-title: Grid template
----
-
-<!-- Custom styles for this template -->
-<style>
-
-  /* Show grid styles from docs.css
-  -------------------------------------------------- */
-
-  .show-grid {
-    margin-bottom: 15px;
-  }
-  .show-grid [class^="span"] {
-    padding-top: 10px;
-    padding-bottom: 10px;
-    background-color: #eee;
-    border: 1px solid #ddd;
-  }
-  .show-grid [class*="span"]:hover {
-    background-color: #ddd;
-  }
-
-</style>
-
-
-<div class="container">
-
-  <div class="page-header">
-    <h1>Grids</h1>
-  </div>
-
-  <h2>Default grid columns</h2>
-  <div class="bs-docs-grid">
-    <div class="row show-grid">
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-      <div class="span1">1</div>
-    </div>
-    <div class="row show-grid">
-      <div class="span4">4</div>
-      <div class="span4">4</div>
-      <div class="span4">4</div>
-    </div>
-    <div class="row show-grid">
-      <div class="span6">6</div>
-      <div class="span6">6</div>
-    </div>
-    <div class="row show-grid">
-      <div class="span12">12</div>
-    </div>
-  </div>
-
-</div> <!-- /container -->

diff --git a/jumbotron-narrow.html b/jumbotron-narrow.html
index b9a26c757868ad4b1cedb1daf61ebc4bc7ae7097..abf07dc72250dafef921f76e5abc473488abc647 100644 (file)
--- a/jumbotron-narrow.html
+++ b/jumbotron-narrow.html
@@ -104,7 +104,7 @@ title: Narrow page template
   </div>
 
   <div class="row marketing">
-    <div class="span6">
+    <div class="col-span-6">
       <h4>Subheading</h4>
       <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
 
@@ -115,7 +115,7 @@ title: Narrow page template
       <p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
     </div>
 
-    <div class="span6">
+    <div class="col-span-6">
       <h4>Subheading</h4>
       <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
 

diff --git a/jumbotron.html b/jumbotron.html
index fafa53d494779295bc6f7052e457de15fd873e00..86d035f07c3bc2f8d7f7cbb4dda458f3d38a2b3b 100644 (file)
--- a/jumbotron.html
+++ b/jumbotron.html
@@ -85,17 +85,17 @@ title: Jumbotron template
 
     <!-- Example row of columns -->
     <div class="row">
-      <div class="span4">
+      <div class="col-span-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
       </div>
-      <div class="span4">
+      <div class="col-span-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
      </div>
-      <div class="span4">
+      <div class="col-span-4">
         <h2>Heading</h2>
         <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
         <p><a class="btn" href="#">View details &raquo;</a></p>

diff --git a/justified-nav.html b/justified-nav.html
index fabe8623a3bc1cb85a4c478c374890eb91ab5e5e..7013b150eec35e8e899243650a8c428e49d475c6 100644 (file)
--- a/justified-nav.html
+++ b/justified-nav.html
@@ -119,17 +119,17 @@ title: Justified nav template
 
     <!-- Example row of columns -->
     <div class="row">
-      <div class="span4">
+      <div class="col-span-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
       </div>
-      <div class="span4">
+      <div class="col-span-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
      </div>
-      <div class="span4">
+      <div class="col-span-4">
         <h2>Heading</h2>
         <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p>
         <p><a class="btn" href="#">View details &raquo;</a></p>