From 53135839f549a3278e39f912283b48180a2b6c8c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Sep 2011 10:04:07 -0700 Subject: adding nested columns to the grid section --- docs/assets/css/docs.css | 10 ++++-- docs/index.html | 79 ++++++++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 32 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b8ac95c42..31ed82a7f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -142,15 +142,21 @@ section > .row { } .show-grid [class*="span"] { background-color: #eee; + background-color: rgba(0,0,0,.1); text-align: center; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - height: 30px; + min-height: 30px; line-height: 30px; } .show-grid:hover [class*="span"] { - background: rgba(0, 0, 0, 0.25); + background-color: #ddd; + background-color: rgba(0,0,0,.2); +} +.show-grid .show-grid { + margin-top: 0; + margin-bottom: 0; } /* Render mini layout previews -------------------------------------------------- */ diff --git a/docs/index.html b/docs/index.html index 558f3fcf2..083e38b0b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -196,22 +196,22 @@
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
-
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
2
@@ -238,13 +238,13 @@
4
-
1/3
-
1/3
-
1/3
+
1/3
+
1/3
+
1/3
-
1/3
-
2/3
+
1/3
+
2/3
4
@@ -262,25 +262,44 @@
16
-

Offsetting columns

+

Offsetting columns

4
-
8 offset 4
+
8 offset 4
-
1/3 offset 2/3s
+
1/3 offset 2/3s
-
4 offset 4
-
4 offset 4
+
4 offset 4
+
4 offset 4
-
5 offset 3
-
5 offset 3
+
5 offset 3
+
5 offset 3
-
10 offset 6
+
10 offset 6
+ +

Nesting columns

+

Nest your content if you must by creating a .row within an existing column.

+
+
+ Level 1 of column +
+
+ Level 2 +
+
+ Level 2 +
+
+
+
+ Level 1 of column +
+
@@ -1540,4 +1559,4 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- + \ No newline at end of file -- cgit v1.2.3 From dad058326e5aca45161887c246861e64d7192dca Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Sep 2011 16:00:59 -0700 Subject: add version # to docs --- docs/assets/css/docs.css | 4 ++++ docs/index.html | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 31ed82a7f..536446c23 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -111,6 +111,10 @@ section > .row { margin-bottom: 9px; color: #333; } +.quickstart .current-version, +.quickstart .current-version a { + color: #999; +} .quickstart h6 { color: #999; } diff --git a/docs/index.html b/docs/index.html index 083e38b0b..4d722d867 100644 --- a/docs/index.html +++ b/docs/index.html @@ -97,6 +97,7 @@
Fork on GitHub

Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.

Bootstrap on GitHub »

+

Currently v1.2.0

@@ -1275,8 +1276,8 @@

One fine body…

- Primary Secondary + Primary
-- cgit v1.2.3 From c56e229ed73824778c672a67e7e70c4521623fe9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Sep 2011 20:47:38 -0700 Subject: start updating the grid docs for customizing it --- docs/index.html | 80 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 4d722d867..79f8f3012 100644 --- a/docs/index.html +++ b/docs/index.html @@ -263,7 +263,10 @@
16
-

Offsetting columns

+ +
+ +

Offsetting columns

4
8 offset 4
@@ -283,22 +286,73 @@
10 offset 6
-

Nesting columns

-

Nest your content if you must by creating a .row within an existing column.

-
-
- Level 1 of column +
+ +
+
+

Nesting columns

+

Nest your content if you must by creating a .row within an existing column.

+
+
+

Example of nested columns

-
- Level 2 -
-
- Level 2 +
+ Level 1 of column +
+
+ Level 2 +
+
+ Level 2 +
+
-
- Level 1 of column +
+ +
+ +
+
+

Roll your own grid

+

Built into Bootstrap are a handful of variables for customizing the default 940px grid system. With a bit of customization, you can modify the size of columns, their gutters, and the container they reside in.

+
+
+

Inside the grid

+

The variables needed to modify the grid system currently all reside in preboot.less.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariableDefault valueDescription
@gridColumns16The number of columns within the grid
@gridColumnWidth40pxThe width of each column within the grid
@gridGutterWidth20pxThe negative space between each column
@siteWidthComputed sum of all columns and guttersWe use some basic match to count the number of columns and gutters and set the width of the .fixed-container() mixin.
+

-- cgit v1.2.3 From a0c3d4834225a2dd9fe3f3100b44ea316137c2d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Sep 2011 21:43:19 -0700 Subject: fix the stacked form legend style --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 79f8f3012..f6c6d65b8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -352,7 +352,7 @@ -

+

Modifying the grid means changing these values and recompiling.

-- cgit v1.2.3 From 0b43bc9bb9266fa8e8d830b82ede20fb3a939acd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 9 Sep 2011 21:50:41 -0700 Subject: adding docs for customizing the grid --- docs/index.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index f6c6d65b8..d88e812d1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -352,7 +352,13 @@ -

Modifying the grid means changing these values and recompiling.

+

Now to customize

+

Modifying the grid means changing the three @grid-* variables and recompiling the Less files.

+

Bootstrap comes equipped to handle a grid system with up to 24 columns; the default is just 16. Here's how your grid variables would look customized to a 24-column grid.

+ 
@gridColumns:       24;
+@gridColumnWidth:   20px;
+@gridGutterWidth:   20px;
+

Once recompiled, you'll be set!

-- cgit v1.2.3