8000 pygmentize grid section; update bs-docs-example corners · rusongyu/bootstrap@6b14de2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6b14de2

Browse files
mdomdo
committed
pygmentize grid section; update bs-docs-example corners
1 parent 7e6211e commit 6b14de2

File tree

2 files changed

+32
-22
lines changed

2 files changed

+32
-22
lines changed

‎docs/assets/css/docs.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ section > ul li {
198198
padding: 39px 14px 14px;
199199
margin-bottom: -1px;
200200
border: 1px solid #ddd;
201+
border-top-left-radius: 4px;
202+
border-top-right-radius: 4px;
201203
}
202204
/* Echo out a label for the example */
203205
.bs-docs-example:after {
@@ -211,6 +213,8 @@ section > ul li {
211213
color: #9da0a4;
212214
background-color: #f5f5f5;
213215
border: 1px solid #ddd;
216+
border-top-left-radius: 4px;
217+
border-bottom-right-radius: 4px;
214218
}
215219

216220
/* Tweak display of the examples */

‎docs/css.html

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,13 @@ <h2>Live grid example</h2>
475475

476476
<h3>Basic grid HTML</h3>
477477
<p>For a simple two column layout, create a <code>.row</code> and add the appropriate number of <code>.span*</code> columns. As this is a 12-column grid, each <code>.span*</code> spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).</p>
478-
<pre class="prettyprint linenums">
479-
&lt;div class="row"&gt;
480-
&lt;div class="span4"&gt;...&lt;/div&gt;
481-
&lt;div class="span8"&gt;...&lt;/div&gt;
482-
&lt;/div&gt;
483-
</pre>
478+
{% highlight html linenos %}
479+
<div class="row">
480+
<div class="span8">8</div>
481+
<div class="span4">4</div>
482+
</div>
483+
{% endhighlight %}
484+
484485
<p>Given this example, we have <code>.span4</code> and <code>.span8</code>, making for 12 total columns and a complete row.</p>
485486

486487
<h2>Offsetting columns</h2>
@@ -498,12 +499,12 @@ <h2>Offsetting columns</h2>
498499
<div class="span6 offset6">6 offset 6</div>
499500
</div><!-- /row -->
500501
</div>
501-
<pre class="prettyprint linenums">
502-
&lt;div class="row"&gt;
503-
&lt;div class="span4"&gt;...&lt;/div&gt;
504-
&lt;div class="span4 offset4"&gt;...&lt;/div&gt;
505-
&lt;/div&gt;
506-
</pre>
502+
{% highlight html linenos %}
503+
<div class="row">
504+
<div class="span4">...</div>
505+
<div class="span4 offset4">...</div>
506+
</div>
507+
{% endhighlight %}
507508

508509

509510
<h2>Nesting columns</h2>
@@ -521,17 +522,22 @@ <h2>Nesting columns</h2>
521522
</div>
522523
</div>
523524
</div>
524-
<pre class="prettyprint linenums">
525-
&lt;div class="row"&gt;
526-
&lt;div class="span9"&gt;
525+
{% highlight html linenos %}
526+
<div class="row">
527+
<div class="span9">
527528
Level 1: 9 columns
528-
&lt;div class="row"&gt;
529-
&lt;div class="span6"&gt;Level 2: 6 columns&lt;/div&gt;
530-
&lt;div class="span6"&gt;Level 2: 6 columns&lt;/div&gt;
531-
&lt;/div&gt;
532-
&lt;/div&gt;
533-
&lt;/div&gt;
534-
</pre>
529+
<div class="row">
530+
<div class="span6">
531+
Level 2: 6 columns
532+
</div>
533+
<div class="span6">
534+
Level 2: 6 columns
535+
</div>
536+
</div>
537+
</div>
538+
</div>
539+
{% endhighlight %}
540+
535541
</section>
536542

537543

0 commit comments

Comments
 (0)
0