aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-07 21:45:37 -0700
committerMark Otto <[email protected]>2012-06-07 21:45:37 -0700
commitdf869f1eb074f5c2baaaf744f333c5f5d6ce0bee (patch)
treec2c9f4d3452e8f5b1b3258b9e7ab3cea933a2d13
parentff6dd0cf56c1b50b7fa7cba35aab4d13cb251f05 (diff)
downloadbootstrap-df869f1eb074f5c2baaaf744f333c5f5d6ce0bee.tar.xz
bootstrap-df869f1eb074f5c2baaaf744f333c5f5d6ce0bee.zip
fix grids
-rw-r--r--docs/base-css.html2
-rw-r--r--docs/components.html2
-rw-r--r--docs/download.html2
-rw-r--r--docs/examples.html2
-rw-r--r--docs/index.html2
-rw-r--r--docs/javascript.html2
-rw-r--r--docs/less.html2
-rw-r--r--docs/scaffolding.html24
-rw-r--r--docs/templates/pages/scaffolding.mustache22
-rw-r--r--docs/upgrading.html2
10 files changed, 31 insertions, 31 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index 58fbecc39..7ed6c68ac 100644
--- 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 15df4f5ce..63cfac9ae 100644
--- 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 10b35f3ea..20e860559 100644
--- 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 e0e4b5be8..374b69ef6 100644
--- 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 27d74dc3f..ccba2ee61 100644
--- 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 abf5df790..d21ca2d61 100644
--- 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 a904d31dd..c383660d2 100644
--- 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 ae69f51db..bb2b5b03d 100644
--- 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 8eabe21cf..3ccc87a2b 100644
--- 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 f16fe6036..9611ffc41 100644
--- 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>