Skip to content

B
bootstrap
Commit df869f1e authored by Mark Otto's avatar Mark Otto
Browse files
Options

fix grids

parent ff6dd0cf
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
docs/base-css.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
......
docs/components.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
......
docs/download.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
......
docs/examples.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
......
docs/index.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
......
docs/javascript.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
......
docs/less.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
......
docs/scaffolding.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4">6</div> <div class="span6">6</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span5">5</div> <div class="span5">5</div>
...@@ -207,14 +207,14 @@ ...@@ -207,14 +207,14 @@
<div class="bs-docs-grid"> <div class="bs-docs-grid">
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4 offset4">4 offset 4</div> <div class="span4 offset2">4 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span3 offset3">3 offset 3</div> <div class="span3 offset2">3 offset 2</div>
<div class="span3 offset3">3 offset 3</div> <div class="span3 offset2">3 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span8 offset4">8 offset 4</div> <div class="span6 offset4">6 offset 4</div>
</div><!-- /row --> </div><!-- /row -->
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -229,13 +229,13 @@ ...@@ -229,13 +229,13 @@
<h3>Example</h3> <h3>Example</h3>
<p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p> <p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p>
<div class="row show-grid"> <div class="row show-grid">
<div class="span8"> <div class="span10">
Level 1 of column Level 1 of column
<div class="row show-grid"> <div class="row show-grid">
<div class="span4"> <div class="span5">
Level 2 Level 2
</div> </div>
<div class="span4"> <div class="span5">
Level 2 Level 2
</div> </div>
</div> </div>
...@@ -243,11 +243,11 @@ ...@@ -243,11 +243,11 @@
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span8"&gt; &lt;div class="span10"&gt;
Level 1 column Level 1 column
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span4"&gt;Level 2&lt;/div&gt; &lt;div class="span5"&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&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
......
docs/templates/pages/scaffolding.mustache
View file @ df869f1e
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4">6</div> <div class="span6">6</div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="span5">5</div> <div class="span5">5</div>
...@@ -96,14 +96,14 @@ ...@@ -96,14 +96,14 @@
<div class="bs-docs-grid"> <div class="bs-docs-grid">
<div class="row show-grid"> <div class="row show-grid">
<div class="span4">4</div> <div class="span4">4</div>
<div class="span4 offset4">4 offset 4</div> <div class="span4 offset2">4 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span3 offset3">3 offset 3</div> <div class="span3 offset2">3 offset 2</div>
<div class="span3 offset3">3 offset 3</div> <div class="span3 offset2">3 offset 2</div>
</div><!-- /row --> </div><!-- /row -->
<div class="row show-grid"> <div class="row show-grid">
<div class="span8 offset4">8 offset 4</div> <div class="span6 offset4">6 offset 4</div>
</div><!-- /row --> </div><!-- /row -->
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -118,13 +118,13 @@ ...@@ -118,13 +118,13 @@
<h3>{{_i}}Example{{/i}}</h3> <h3>{{_i}}Example{{/i}}</h3>
<p>{{_i}}Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.{{/i}}</p> <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="row show-grid">
<div class="span8"> <div class="span10">
{{_i}}Level 1 of column{{/i}} {{_i}}Level 1 of column{{/i}}
<div class="row show-grid"> <div class="row show-grid">
<div class="span4"> <div class="span5">
{{_i}}Level 2{{/i}} {{_i}}Level 2{{/i}}
</div> </div>
<div class="span4"> <div class="span5">
{{_i}}Level 2{{/i}} {{_i}}Level 2{{/i}}
</div> </div>
</div> </div>
...@@ -132,11 +132,11 @@ ...@@ -132,11 +132,11 @@
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row"&gt; &lt;div class="row"&gt;
&lt;div class="span8"&gt; &lt;div class="span10"&gt;
{{_i}}Level 1 column{{/i}} {{_i}}Level 1 column{{/i}}
&lt;div class="row"&gt; &lt;div class="row"&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="span4"&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; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
......
docs/upgrading.html
View file @ df869f1e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</head> </head>
<body > <body>
<div class="bs-docs-nav"> <div class="bs-docs-nav">
<h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment