]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff6dd0c)
fix grids
authorMark Otto <markotto@twitter.com>
Fri, 8 Jun 2012 04:45:37 +0000 (21:45 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 8 Jun 2012 04:45:37 +0000 (21:45 -0700)
docs/base-css.html patch | blob | blame | history
docs/components.html patch | blob | blame | history
docs/download.html patch | blob | blame | history
docs/examples.html patch | blob | blame | history
docs/index.html patch | blob | blame | history
docs/javascript.html patch | blob | blame | history
docs/less.html patch | blob | blame | history
docs/scaffolding.html patch | blob | blame | history
docs/templates/pages/scaffolding.mustache patch | blob | blame | history
docs/upgrading.html patch | blob | blame | history

diff --git a/docs/base-css.html b/docs/base-css.html
index 58fbecc39d210056922886f5fbdde4f4c573724b..7ed6c68ac2da2598ba72a020b5848ecc1d2ed78e 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
diff --git a/docs/components.html b/docs/components.html
index 15df4f5ce6954584bf1f98d0e5e49d735d7e52c7..63cfac9ae6785e822cec01c76b04da20dbfcc8ad 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
diff --git a/docs/download.html b/docs/download.html
index 10b35f3eaf8ec9f2ee5f541840f0ad335b3d57f8..20e86055911fc6836c8bf50d903e900e9e56d0d9 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
diff --git a/docs/examples.html b/docs/examples.html
index e0e4b5be88cf4056ea965cf7e047b6378cbb9d3e..374b69ef62d181b85c239a46107e4bd588f0928b 100644 (file)
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
diff --git a/docs/index.html b/docs/index.html
index 27d74dc3f03d261dad23f2a9027605689942526f..ccba2ee61befd3a62b7df3d5f01f035b92a6143c 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
diff --git a/docs/javascript.html b/docs/javascript.html
index abf5df7905bd4510df2bc69c1841d1b03a3738ff..d21ca2d616c541e7d574e7c90a6f307bc62c69d1 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
diff --git a/docs/less.html b/docs/less.html
index a904d31dd79e79c0cbc03a036a6788100ef51e99..c383660d2094495598d38b18b70d81d2269eba05 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index ae69f51dbeb480029f2da7b592ff91efaf3f37a9..bb2b5b03d8a7a3ff84060bf0f0de0679a78e61a8 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
@@ -181,7 +181,7 @@
     </div>
     <div class="row show-grid">
       <div class="span4">4</div>
-      <div class="span4">6</div>
+      <div class="span6">6</div>
     </div>
     <div class="row show-grid">
       <div class="span5">5</div>
@@ -207,14 +207,14 @@
   <div class="bs-docs-grid">
     <div class="row show-grid">
       <div class="span4">4</div>
-      <div class="span4 offset4">4 offset 4</div>
+      <div class="span4 offset2">4 offset 2</div>
     </div><!-- /row -->
     <div class="row show-grid">
-      <div class="span3 offset3">3 offset 3</div>
-      <div class="span3 offset3">3 offset 3</div>
+      <div class="span3 offset2">3 offset 2</div>
+      <div class="span3 offset2">3 offset 2</div>
     </div><!-- /row -->
     <div class="row show-grid">
-      <div class="span8 offset4">8 offset 4</div>
+      <div class="span6 offset4">6 offset 4</div>
     </div><!-- /row -->
   </div>
 <pre class="prettyprint linenums">
@@ -229,13 +229,13 @@
     <h3>Example</h3>
     <p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p>
     <div class="row show-grid">
-      <div class="span8">
+      <div class="span10">
         Level 1 of column
         <div class="row show-grid">
-          <div class="span4">
+          <div class="span5">
             Level 2
           </div>
-          <div class="span4">
+          <div class="span5">
             Level 2
           </div>
         </div>
@@ -243,11 +243,11 @@
     </div>
 <pre class="prettyprint linenums">
 &lt;div class="row"&gt;
-  &lt;div class="span8"&gt;
+  &lt;div class="span10"&gt;
     Level 1 column
     &lt;div class="row"&gt;
-      &lt;div class="span4"&gt;Level 2&lt;/div&gt;
-      &lt;div class="span4"&gt;Level 2&lt;/div&gt;
+      &lt;div class="span5"&gt;Level 2&lt;/div&gt;
+      &lt;div class="span5"&gt;Level 2&lt;/div&gt;
     &lt;/div&gt;
   &lt;/div&gt;
 &lt;/div&gt;
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 8eabe21cfad37b0d76c8083053004ab5bcf86ccf..3ccc87a2b6d4ddd8ac342320ad847fa67cecb6d0 100644 (file)
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -70,7 +70,7 @@
     </div>
     <div class="row show-grid">
       <div class="span4">4</div>
-      <div class="span4">6</div>
+      <div class="span6">6</div>
     </div>
     <div class="row show-grid">
       <div class="span5">5</div>
@@ -96,14 +96,14 @@
   <div class="bs-docs-grid">
     <div class="row show-grid">
       <div class="span4">4</div>
-      <div class="span4 offset4">4 offset 4</div>
+      <div class="span4 offset2">4 offset 2</div>
     </div><!-- /row -->
     <div class="row show-grid">
-      <div class="span3 offset3">3 offset 3</div>
-      <div class="span3 offset3">3 offset 3</div>
+      <div class="span3 offset2">3 offset 2</div>
+      <div class="span3 offset2">3 offset 2</div>
     </div><!-- /row -->
     <div class="row show-grid">
-      <div class="span8 offset4">8 offset 4</div>
+      <div class="span6 offset4">6 offset 4</div>
     </div><!-- /row -->
   </div>
 <pre class="prettyprint linenums">
@@ -118,13 +118,13 @@
     <h3>{{_i}}Example{{/i}}</h3>
     <p>{{_i}}Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.{{/i}}</p>
     <div class="row show-grid">
-      <div class="span8">
+      <div class="span10">
         {{_i}}Level 1 of column{{/i}}
         <div class="row show-grid">
-          <div class="span4">
+          <div class="span5">
             {{_i}}Level 2{{/i}}
           </div>
-          <div class="span4">
+          <div class="span5">
             {{_i}}Level 2{{/i}}
           </div>
         </div>
@@ -132,11 +132,11 @@
     </div>
 <pre class="prettyprint linenums">
 &lt;div class="row"&gt;
-  &lt;div class="span8"&gt;
+  &lt;div class="span10"&gt;
     {{_i}}Level 1 column{{/i}}
     &lt;div class="row"&gt;
-      &lt;div class="span4"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
-      &lt;div class="span4"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
+      &lt;div class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
+      &lt;div class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
     &lt;/div&gt;
   &lt;/div&gt;
 &lt;/div&gt;
diff --git a/docs/upgrading.html b/docs/upgrading.html
index f16fe603685c215e98d0ccf2afa52140562615d7..9611ffc41d3563e10067e1cffd25205668435735 100644 (file)
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -27,7 +27,7 @@
 
   </head>
 
-  <body >
+  <body>
 
     <div class="bs-docs-nav">
       <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
Mirror of https://github.com/twbs/bootstrap.git