From 6b14de292a53e00dc4fd9ef02b1d05dec391b613 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 14 Feb 2013 00:43:43 -0800 Subject: [PATCH] pygmentize grid section; update bs-docs-example corners --- docs/assets/css/docs.css | 4 ++++ docs/css.html | 50 ++++++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ac04b339c1..8c3c090a3d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -198,6 +198,8 @@ section > ul li { padding: 39px 14px 14px; margin-bottom: -1px; border: 1px solid #ddd; + border-top-left-radius: 4px; + border-top-right-radius: 4px; } /* Echo out a label for the example */ .bs-docs-example:after { @@ -211,6 +213,8 @@ section > ul li { color: #9da0a4; background-color: #f5f5f5; border: 1px solid #ddd; + border-top-left-radius: 4px; + border-bottom-right-radius: 4px; } /* Tweak display of the examples */ diff --git a/docs/css.html b/docs/css.html index aba4198a91..fd6e158e4d 100644 --- a/docs/css.html +++ b/docs/css.html @@ -475,12 +475,13 @@ title: CSS

Basic grid HTML

For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* 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).

-
-<div class="row">
-  <div class="span4">...</div>
-  <div class="span8">...</div>
-</div>
-
+{% highlight html linenos %} +
+
8
+
4
+
+{% endhighlight %} +

Given this example, we have .span4 and .span8, making for 12 total columns and a complete row.

Offsetting columns

@@ -498,12 +499,12 @@ title: CSS
6 offset 6
-
-<div class="row">
-  <div class="span4">...</div>
-  <div class="span4 offset4">...</div>
-</div>
-
+{% highlight html linenos %} +
+
...
+
...
+
+{% endhighlight %}

Nesting columns

@@ -521,17 +522,22 @@ title: CSS -
-<div class="row">
-  <div class="span9">
+{% highlight html linenos %}
+
+
Level 1: 9 columns - <div class="row"> - <div class="span6">Level 2: 6 columns</div> - <div class="span6">Level 2: 6 columns</div> - </div> - </div> -</div> -
+
+
+ Level 2: 6 columns +
+
+ Level 2: 6 columns +
+
+ + +{% endhighlight %} +