diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index fd1a173c65..f42e314a2e 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Sep 9 20:23:37 PDT 2011 + * Date: Fri Sep 9 22:48:53 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -2006,6 +2006,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { box-shadow: inset 0 1px 0 #ffffff; zoom: 1; margin-bottom: 0; + text-align: right; } .modal-footer:before, .modal-footer:after { display: table; @@ -2015,8 +2016,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { clear: both; } .modal-footer .btn { - float: right; - margin-left: 10px; + margin-left: 5px; } .twipsy { display: block; diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index fc3e09b9e7..de1d659b35 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -277,9 +277,9 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} .modal-header{border-bottom:1px solid #eee;padding:5px 15px;} .modal-body{padding:15px;} -.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";} +.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;text-align:right;}.modal-footer:before,.modal-footer:after{display:table;content:"";} .modal-footer:after{clear:both;} -.modal-footer .btn{float:right;margin-left:10px;} +.modal-footer .btn{margin-left:5px;} .twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b8ac95c426..536446c234 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; } @@ -142,15 +146,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 4a3f1a8c42..ab66d968ce 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

@@ -196,22 +197,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 +239,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 +263,104 @@
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.

+
+
+

Example of nested columns

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

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.
+

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!

+
+
@@ -1256,8 +1336,8 @@

One fine body…

- Primary Secondary + Primary
diff --git a/lib/patterns.less b/lib/patterns.less index f308e5ebf3..0b72054f76 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -771,9 +771,9 @@ input[type=submit].btn { .box-shadow(inset 0 1px 0 #fff); .clearfix(); margin-bottom: 0; + text-align: right; .btn { - float: right; - margin-left: 10px; + margin-left: 5px; } }