From 0c656e29fc77472381d9673d58b53da391c31773 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Sep 2011 22:50:59 -0700 Subject: [PATCH 1/8] updated styles for the media grids --- bootstrap-1.3.0.css | 12 ++++++------ bootstrap-1.3.0.min.css | 4 ++-- docs/index.html | 40 ++++++++++++++++++++-------------------- lib/patterns.less | 8 ++++---- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index de9b0045f0..fef02501d6 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: Sat Sep 10 22:46:48 PDT 2011 + * Date: Sat Sep 10 22:50:02 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). @@ -2252,7 +2252,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .media-grid li { display: inline; } -.media-grid .thumbnail { +.media-grid a { float: left; padding: 4px; margin: 0 0 20px 20px; @@ -2264,12 +2264,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); } -.media-grid .thumbnail:hover { +.media-grid a img { + display: block; +} +.media-grid a:hover { border-color: #0069d6; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } -.media-grid img { - display: block; -} diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index ee4918fe5a..f497bd367b 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -308,5 +308,5 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .media-grid{margin-left:-20px;margin-bottom:0;zoom:1;}.media-grid:before,.media-grid:after{display:table;content:"";zoom:1;*display:inline;} .media-grid:after{clear:both;} .media-grid li{display:inline;} -.media-grid .thumbnail{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid .thumbnail:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -.media-grid img{display:block;} +.media-grid a{float:left;padding:4px;margin:0 0 20px 20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}.media-grid a img{display:block;} +.media-grid a:hover{border-color:#0069d6;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} diff --git a/docs/index.html b/docs/index.html index 12b8c52913..771adabe71 100644 --- a/docs/index.html +++ b/docs/index.html @@ -717,59 +717,59 @@

Large

Medium

Small

diff --git a/lib/patterns.less b/lib/patterns.less index 1e601adf42..901ac12de1 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -941,19 +941,19 @@ input[type=submit].btn { li { display: inline; } - .thumbnail { + a { float: left; padding: 4px; margin: 0 0 20px 20px; border: 1px solid #ddd; .border-radius(4px); .box-shadow(0 1px 1px rgba(0,0,0,.075)); + img { + display: block; + } &:hover { border-color: @linkColor; .box-shadow(0 1px 4px rgba(0,105,214,.25)); } } - img { - display: block; - } } From 1ae603fda05c96a4bc3eed284aa6b5ce7a2a93cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Sep 2011 23:05:30 -0700 Subject: [PATCH 2/8] make the less compile docs text now have widows, fix broken table markup --- docs/index.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/index.html b/docs/index.html index c8e7df7a44..4fc9154f3c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1772,7 +1772,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita - Node with makefile @@ -1784,7 +1783,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita Javascript -

Download the latest Less.js and include the path to it (and your Bootstrap code) in the head.

+

Download the latest Less.js and include the path to it (and Bootstrap) in the head.

 <link rel="stylesheet/less" href="/path/to/bootstrap.less">
 <script src="/path/to/less.js"></script>
@@ -1795,9 +1794,9 @@ Lorem ipsum dolar sit amet illo error ipsum verita
         
           Command line
           
-            
If you already have the less command line tool installed you can simply run the following command:

+            
If you already have the less command line tool installed, simply run the following command:

               
$ lessc ./lib/bootstrap.less > bootstrap-1.3.0.css

-            
Be sure to include the --compress flag in that command if you're trying to save some bytes!
+            
Be sure to include --compress in that command if you're trying to save some bytes!

           
         
         

From 3ad034ea9671ffbc44278085ca3bb30979808278 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 11 Sep 2011 17:36:15 -0700
Subject: [PATCH 3/8] fix legends in ie7

---
 bootstrap-1.3.0.css     |  6 +++---
 bootstrap-1.3.0.min.css |  2 +-
 docs/index.html         | 19 ++++++++++++++++++-
 lib/forms.less          |  4 ++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index fef02501d6..a792c99eae 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: Sat Sep 10 22:50:02 PDT 2011
+ * Date: Sun Sep 11 17:36:01 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).
@@ -692,13 +692,13 @@ fieldset legend {
   padding-left: 150px;
   font-size: 19.5px;
   line-height: 1;
-  *margin: 0 0 5px 145px;
+  color: #404040;
+  *padding: 0 0 5px 145px;
   /* IE6-7 */
 
   *line-height: 1.5;
   /* IE6-7 */
 
-  color: #404040;
 }
 form .clearfix {
   margin-bottom: 18px;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index f497bd367b..c92c6f4e13 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -112,7 +112,7 @@ code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospa
 code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
 pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
 form{margin-bottom:18px;}
-fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padding-left:150px;font-size:19.5px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
+fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padding-left:150px;font-size:19.5px;line-height:1;color:#404040;*padding:0 0 5px 145px;*line-height:1.5;}
 form .clearfix{margin-bottom:18px;}
 label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
 label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
diff --git a/docs/index.html b/docs/index.html
index 4fc9154f3c..adf58e64f2 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -940,6 +940,23 @@
       

         

           Example form legend
+
+          
+            
+              
+                
+                
+              
+            
+            
+              
+                
+                
+              
+            
+          
12
12

+
+
           

             
             

@@ -1764,7 +1781,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
     
Compiling Less

     
After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

     
Ways to compile

-    
+    

diff --git a/lib/forms.less b/lib/forms.less
index 2333718e05..fc30618a4f 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -19,9 +19,9 @@ fieldset {
     padding-left: 150px;
     font-size: @basefont * 1.5;
     line-height: 1;
-    *margin: 0 0 5px 145px; /* IE6-7 */
-    *line-height: 1.5; /* IE6-7 */
     color: @grayDark;
+    *padding: 0 0 5px 145px; /* IE6-7 */
+    *line-height: 1.5; /* IE6-7 */
   }
 }
 

From 18a5ef83eff25130927e5b3a5ffb522752974eb8 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 11 Sep 2011 18:01:29 -0700
Subject: [PATCH 4/8] fix legends in ie7

---
 lib/forms.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/forms.less b/lib/forms.less
index fc30618a4f..a1fdbd9373 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -108,6 +108,9 @@ input[type=file] {
   height: @baseline * 1.5;
   line-height: @baseline * 1.5;
 }
+select {
+  float: left;
+}
 
 textarea {
   height: auto;

From f3f60b21a6104be999cb04f6414878fc4dea98cd Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 11 Sep 2011 18:09:01 -0700
Subject: [PATCH 5/8] oops, double commit last time; apply fixes to make select
 elements line up in IE7 with their labels, but no height fix

---
 bootstrap-1.3.0.css     |  5 ++++-
 bootstrap-1.3.0.min.css |  2 +-
 docs/index.html         | 17 -----------------
 lib/forms.less          |  6 ++----
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index a792c99eae..0c20b8d640 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: Sun Sep 11 17:36:01 PDT 2011
+ * Date: Sun Sep 11 18:08:25 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).
@@ -771,6 +771,9 @@ input[type=button], input[type=reset], input[type=submit] {
 select, input[type=file] {
   height: 27px;
   line-height: 27px;
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
 }
 textarea {
   height: auto;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index c92c6f4e13..b2b38bbf86 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -122,7 +122,7 @@ input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:
 input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;}
 input[type=file]{background-color:#fff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
-select,input[type=file]{height:27px;line-height:27px;}
+select,input[type=file]{height:27px;line-height:27px;*margin-top:4px;}
 textarea{height:auto;}
 .uneditable-input{background-color:#fff;display:block;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
 :-moz-placeholder{color:#bfbfbf;}
diff --git a/docs/index.html b/docs/index.html
index adf58e64f2..110b4f46bd 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -940,23 +940,6 @@
       
         

           Example form legend
-
-          

       
         

           Method

-            
-              
-                
-                
-              
-            
-            
-              
-                
-                
-              
-            
-          
12
12

-
-
           

             
             

diff --git a/lib/forms.less b/lib/forms.less
index a1fdbd9373..90b8720f03 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -105,11 +105,9 @@ input[type=submit] {
 
 select,
 input[type=file] {
-  height: @baseline * 1.5;
+  height: @baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
   line-height: @baseline * 1.5;
-}
-select {
-  float: left;
+  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
 }
 
 textarea {

From 53812bc2d82adb1a4a96afb33391a1d59990c4fe Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 11 Sep 2011 18:44:25 -0700
Subject: [PATCH 6/8] remove qualifying tags in .span selectors for built in
 grid so that we can use .span-n classes in form styles

---
 bootstrap-1.3.0.css     | 148 ++++++++++++++++++++++++++++------------
 bootstrap-1.3.0.min.css |  98 +++++++++++++++-----------
 docs/index.html         |  25 ++++++-
 lib/forms.less          |  29 ++++++++
 lib/scaffolding.less    | 100 +++++++++++++--------------
 5 files changed, 266 insertions(+), 134 deletions(-)

diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index 0c20b8d640..fc1746408d 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: Sun Sep 11 18:08:25 PDT 2011
+ * Date: Sun Sep 11 18:43:05 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).
@@ -374,129 +374,129 @@ a:hover {
 .row:after {
   clear: both;
 }
-.row [class*="span"] {
+[class*="span"] {
   display: inline;
   float: left;
   margin-left: 20px;
 }
-.row .span1 {
+.span1 {
   width: 40px;
 }
-.row .span2 {
+.span2 {
   width: 100px;
 }
-.row .span3 {
+.span3 {
   width: 160px;
 }
-.row .span4 {
+.span4 {
   width: 220px;
 }
-.row .span5 {
+.span5 {
   width: 280px;
 }
-.row .span6 {
+.span6 {
   width: 340px;
 }
-.row .span7 {
+.span7 {
   width: 400px;
 }
-.row .span8 {
+.span8 {
   width: 460px;
 }
-.row .span9 {
+.span9 {
   width: 520px;
 }
-.row .span10 {
+.span10 {
   width: 580px;
 }
-.row .span11 {
+.span11 {
   width: 640px;
 }
-.row .span12 {
+.span12 {
   width: 700px;
 }
-.row .span13 {
+.span13 {
   width: 760px;
 }
-.row .span14 {
+.span14 {
   width: 820px;
 }
-.row .span15 {
+.span15 {
   width: 880px;
 }
-.row .span16 {
+.span16 {
   width: 940px;
 }
-.row .span17 {
+.span17 {
   width: 1000px;
 }
-.row .span18 {
+.span18 {
   width: 1060px;
 }
-.row .span19 {
+.span19 {
   width: 1120px;
 }
-.row .span20 {
+.span20 {
   width: 1180px;
 }
-.row .span21 {
+.span21 {
   width: 1240px;
 }
-.row .span22 {
+.span22 {
   width: 1300px;
 }
-.row .span23 {
+.span23 {
   width: 1360px;
 }
-.row .span24 {
+.span24 {
   width: 1420px;
 }
-.row .offset1 {
+.offset1 {
   margin-left: 80px;
 }
-.row .offset2 {
+.offset2 {
   margin-left: 140px;
 }
-.row .offset3 {
+.offset3 {
   margin-left: 200px;
 }
-.row .offset4 {
+.offset4 {
   margin-left: 260px;
 }
-.row .offset5 {
+.offset5 {
   margin-left: 320px;
 }
-.row .offset6 {
+.offset6 {
   margin-left: 380px;
 }
-.row .offset7 {
+.offset7 {
   margin-left: 440px;
 }
-.row .offset8 {
+.offset8 {
   margin-left: 500px;
 }
-.row .offset9 {
+.offset9 {
   margin-left: 560px;
 }
-.row .offset10 {
+.offset10 {
   margin-left: 620px;
 }
-.row .offset11 {
+.offset11 {
   margin-left: 680px;
 }
-.row .offset12 {
+.offset12 {
   margin-left: 740px;
 }
-.row .span-one-third {
+.span-one-third {
   width: 300px;
 }
-.row .span-two-thirds {
+.span-two-thirds {
   width: 620px;
 }
-.row .offset-one-third {
+.offset-one-third {
   margin-left: 340px;
 }
-.row .offset-two-thirds {
+.offset-two-thirds {
   margin-left: 660px;
 }
 /* Typography.less
@@ -883,6 +883,70 @@ select.xxlarge {
 textarea.xxlarge {
   overflow-y: auto;
 }
+input.span1, textarea.span1, select.span1 {
+  width: 30px;
+  margin-left: 0;
+}
+input.span2, textarea.span2, select.span2 {
+  width: 90px;
+  margin-left: 0;
+}
+input.span3, textarea.span3, select.span3 {
+  width: 150px;
+  margin-left: 0;
+}
+input.span4, textarea.span4, select.span4 {
+  width: 210px;
+  margin-left: 0;
+}
+input.span5, textarea.span5, select.span5 {
+  width: 270px;
+  margin-left: 0;
+}
+input.span6, textarea.span6, select.span6 {
+  width: 330px;
+  margin-left: 0;
+}
+input.span7, textarea.span7, select.span7 {
+  width: 390px;
+  margin-left: 0;
+}
+input.span8, textarea.span8, select.span8 {
+  width: 450px;
+  margin-left: 0;
+}
+input.span9, textarea.span9, select.span9 {
+  width: 510px;
+  margin-left: 0;
+}
+input.span10, textarea.span10, select.span10 {
+  width: 570px;
+  margin-left: 0;
+}
+input.span11, textarea.span11, select.span11 {
+  width: 630px;
+  margin-left: 0;
+}
+input.span12, textarea.span12, select.span12 {
+  width: 690px;
+  margin-left: 0;
+}
+input.span13, textarea.span13, select.span13 {
+  width: 750px;
+  margin-left: 0;
+}
+input.span14, textarea.span14, select.span14 {
+  width: 810px;
+  margin-left: 0;
+}
+input.span15, textarea.span15, select.span15 {
+  width: 870px;
+  margin-left: 0;
+}
+input.span16, textarea.span16, select.span16 {
+  width: 930px;
+  margin-left: 0;
+}
 input[disabled],
 select[disabled],
 textarea[disabled],
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index b2b38bbf86..66337455c0 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -42,47 +42,47 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:
 .pull-left{float:left;}
 .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;}
 .row:after{clear:both;}
-.row [class*="span"]{display:inline;float:left;margin-left:20px;}
-.row .span1{width:40px;}
-.row .span2{width:100px;}
-.row .span3{width:160px;}
-.row .span4{width:220px;}
-.row .span5{width:280px;}
-.row .span6{width:340px;}
-.row .span7{width:400px;}
-.row .span8{width:460px;}
-.row .span9{width:520px;}
-.row .span10{width:580px;}
-.row .span11{width:640px;}
-.row .span12{width:700px;}
-.row .span13{width:760px;}
-.row .span14{width:820px;}
-.row .span15{width:880px;}
-.row .span16{width:940px;}
-.row .span17{width:1000px;}
-.row .span18{width:1060px;}
-.row .span19{width:1120px;}
-.row .span20{width:1180px;}
-.row .span21{width:1240px;}
-.row .span22{width:1300px;}
-.row .span23{width:1360px;}
-.row .span24{width:1420px;}
-.row .offset1{margin-left:80px;}
-.row .offset2{margin-left:140px;}
-.row .offset3{margin-left:200px;}
-.row .offset4{margin-left:260px;}
-.row .offset5{margin-left:320px;}
-.row .offset6{margin-left:380px;}
-.row .offset7{margin-left:440px;}
-.row .offset8{margin-left:500px;}
-.row .offset9{margin-left:560px;}
-.row .offset10{margin-left:620px;}
-.row .offset11{margin-left:680px;}
-.row .offset12{margin-left:740px;}
-.row .span-one-third{width:300px;}
-.row .span-two-thirds{width:620px;}
-.row .offset-one-third{margin-left:340px;}
-.row .offset-two-thirds{margin-left:660px;}
+[class*="span"]{display:inline;float:left;margin-left:20px;}
+.span1{width:40px;}
+.span2{width:100px;}
+.span3{width:160px;}
+.span4{width:220px;}
+.span5{width:280px;}
+.span6{width:340px;}
+.span7{width:400px;}
+.span8{width:460px;}
+.span9{width:520px;}
+.span10{width:580px;}
+.span11{width:640px;}
+.span12{width:700px;}
+.span13{width:760px;}
+.span14{width:820px;}
+.span15{width:880px;}
+.span16{width:940px;}
+.span17{width:1000px;}
+.span18{width:1060px;}
+.span19{width:1120px;}
+.span20{width:1180px;}
+.span21{width:1240px;}
+.span22{width:1300px;}
+.span23{width:1360px;}
+.span24{width:1420px;}
+.offset1{margin-left:80px;}
+.offset2{margin-left:140px;}
+.offset3{margin-left:200px;}
+.offset4{margin-left:260px;}
+.offset5{margin-left:320px;}
+.offset6{margin-left:380px;}
+.offset7{margin-left:440px;}
+.offset8{margin-left:500px;}
+.offset9{margin-left:560px;}
+.offset10{margin-left:620px;}
+.offset11{margin-left:680px;}
+.offset12{margin-left:740px;}
+.span-one-third{width:300px;}
+.span-two-thirds{width:620px;}
+.offset-one-third{margin-left:340px;}
+.offset-two-thirds{margin-left:660px;}
 p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
 h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
 h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
@@ -140,6 +140,22 @@ form div.error .input-prepend span.add-on,form div.error .input-append span.add-
 .input-xlarge,input.xlarge,textarea.xlarge,select.xlarge{width:270px;}
 .input-xxlarge,input.xxlarge,textarea.xxlarge,select.xxlarge{width:530px;}
 textarea.xxlarge{overflow-y:auto;}
+input.span1,textarea.span1,select.span1{width:30px;margin-left:0;}
+input.span2,textarea.span2,select.span2{width:90px;margin-left:0;}
+input.span3,textarea.span3,select.span3{width:150px;margin-left:0;}
+input.span4,textarea.span4,select.span4{width:210px;margin-left:0;}
+input.span5,textarea.span5,select.span5{width:270px;margin-left:0;}
+input.span6,textarea.span6,select.span6{width:330px;margin-left:0;}
+input.span7,textarea.span7,select.span7{width:390px;margin-left:0;}
+input.span8,textarea.span8,select.span8{width:450px;margin-left:0;}
+input.span9,textarea.span9,select.span9{width:510px;margin-left:0;}
+input.span10,textarea.span10,select.span10{width:570px;margin-left:0;}
+input.span11,textarea.span11,select.span11{width:630px;margin-left:0;}
+input.span12,textarea.span12,select.span12{width:690px;margin-left:0;}
+input.span13,textarea.span13,select.span13{width:750px;margin-left:0;}
+input.span14,textarea.span14,select.span14{width:810px;margin-left:0;}
+input.span15,textarea.span15,select.span15{width:870px;margin-left:0;}
+input.span16,textarea.span16,select.span16{width:930px;margin-left:0;}
 input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
 .actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;}
 .help-inline,.help-block{font-size:11px;line-height:18px;color:#bfbfbf;}
diff --git a/docs/index.html b/docs/index.html
index 110b4f46bd..02335fd758 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1186,11 +1186,34 @@
     

   

 
+  

+    

+      
Form field sizes

+      
Customize any form input, select, or textarea width by adding just a few classes to your markup.

+      
As of v1.3.0, we have added the grid-based sizing classes for form elements. Please use the these over the existing .mini, .small, etc classes.

+    

+    

+      
+        

+        

+        

+        

+        

+        

+        

+        

+        

+        

+        

+      
+    

+  

+
   

     

       
Buttons

       
As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

-      
All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class. Plus, rolling your own styles is easy peasy.

+      
All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class.

     

     

       
Example buttons

diff --git a/lib/forms.less b/lib/forms.less
index 90b8720f03..c867511936 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -184,6 +184,7 @@ form div.error {
 }
 
 // Form element sizes
+// TODO v2: remove duplication here and just stick to .input-[size] in light of adding .spanN sizes
 .input-mini,
 input.mini,
 textarea.mini,
@@ -224,6 +225,34 @@ textarea.xxlarge {
   overflow-y: auto;
 }
 
+// Grid style input sizes
+// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
+.formColumns(@columnSpan: 1) {
+  width: ((@gridColumnWidth - 10) * @columnSpan) + ((@gridColumnWidth - 10) * (@columnSpan - 1));
+  margin-left: 0;
+}
+input,
+textarea,
+select {
+  // Default columns
+  &.span1     { .formColumns(1); }
+  &.span2     { .formColumns(2); }
+  &.span3     { .formColumns(3); }
+  &.span4     { .formColumns(4); }
+  &.span5     { .formColumns(5); }
+  &.span6     { .formColumns(6); }
+  &.span7     { .formColumns(7); }
+  &.span8     { .formColumns(8); }
+  &.span9     { .formColumns(9); }
+  &.span10    { .formColumns(10); }
+  &.span11    { .formColumns(11); }
+  &.span12    { .formColumns(12); }
+  &.span13    { .formColumns(13); }
+  &.span14    { .formColumns(14); }
+  &.span15    { .formColumns(15); }
+  &.span16    { .formColumns(16); }
+}
+
 // Disabled and read-only inputs
 input[disabled],
 select[disabled],
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 263087b066..2dc67c6532 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -79,58 +79,58 @@ a {
 .row {
   .clearfix();
   margin-left: -1 * @gridGutterWidth;
+}
 
-  // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
-  // Credit to @dhg for the idea
-  [class*="span"] {
-    .gridColumn();
-  }
+// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
+// Credit to @dhg for the idea
+[class*="span"] {
+  .gridColumn();
+}
 
-  // Default columns
-  .span1     { .columns(1); }
-  .span2     { .columns(2); }
-  .span3     { .columns(3); }
-  .span4     { .columns(4); }
-  .span5     { .columns(5); }
-  .span6     { .columns(6); }
-  .span7     { .columns(7); }
-  .span8     { .columns(8); }
-  .span9     { .columns(9); }
-  .span10    { .columns(10); }
-  .span11    { .columns(11); }
-  .span12    { .columns(12); }
-  .span13    { .columns(13); }
-  .span14    { .columns(14); }
-  .span15    { .columns(15); }
-  .span16    { .columns(16); }
+// Default columns
+.span1     { .columns(1); }
+.span2     { .columns(2); }
+.span3     { .columns(3); }
+.span4     { .columns(4); }
+.span5     { .columns(5); }
+.span6     { .columns(6); }
+.span7     { .columns(7); }
+.span8     { .columns(8); }
+.span9     { .columns(9); }
+.span10    { .columns(10); }
+.span11    { .columns(11); }
+.span12    { .columns(12); }
+.span13    { .columns(13); }
+.span14    { .columns(14); }
+.span15    { .columns(15); }
+.span16    { .columns(16); }
 
-  // For optional 24-column grid
-  .span17    { .columns(17); }
-  .span18    { .columns(18); }
-  .span19    { .columns(19); }
-  .span20    { .columns(20); }
-  .span21    { .columns(21); }
-  .span22    { .columns(22); }
-  .span23    { .columns(23); }
-  .span24    { .columns(24); }
+// For optional 24-column grid
+.span17    { .columns(17); }
+.span18    { .columns(18); }
+.span19    { .columns(19); }
+.span20    { .columns(20); }
+.span21    { .columns(21); }
+.span22    { .columns(22); }
+.span23    { .columns(23); }
+.span24    { .columns(24); }
 
-  // Offset column options
-  .offset1   { .offset(1); }
-  .offset2   { .offset(2); }
-  .offset3   { .offset(3); }
-  .offset4   { .offset(4); }
-  .offset5   { .offset(5); }
-  .offset6   { .offset(6); }
-  .offset7   { .offset(7); }
-  .offset8   { .offset(8); }
-  .offset9   { .offset(9); }
-  .offset10  { .offset(10); }
-  .offset11  { .offset(11); }
-  .offset12  { .offset(12); }
+// Offset column options
+.offset1   { .offset(1); }
+.offset2   { .offset(2); }
+.offset3   { .offset(3); }
+.offset4   { .offset(4); }
+.offset5   { .offset(5); }
+.offset6   { .offset(6); }
+.offset7   { .offset(7); }
+.offset8   { .offset(8); }
+.offset9   { .offset(9); }
+.offset10  { .offset(10); }
+.offset11  { .offset(11); }
+.offset12  { .offset(12); }
 
-  // Unique column sizes for 16-column grid
-  .span-one-third     { width: 300px; }
-  .span-two-thirds    { width: 620px; }
-  .offset-one-third   { margin-left: 340px; }
-  .offset-two-thirds  { margin-left: 660px; }
-}
\ No newline at end of file
+// Unique column sizes for 16-column grid
+.span-one-third     { width: 300px; }
+.span-two-thirds    { width: 620px; }
+.offset-one-third   { margin-left: 340px; }
+.offset-two-thirds  { margin-left: 660px; }
\ No newline at end of file

From 6bc867ed5c20972801226467feb63e85c9dec060 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 11 Sep 2011 19:53:48 -0700
Subject: [PATCH 7/8] change template diagrams to be .media-grid

---
 docs/assets/css/docs.css |  5 -----
 docs/index.html          | 23 +++++++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index a4bd11b3e0..f45c77745d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -203,7 +203,6 @@ section > .row {
 
 /* Render mini layout previews
 -------------------------------------------------- */
-.diagram,
 .mini-layout {
   border: 1px solid #ddd;
   -webkit-border-radius: 6px;
@@ -213,10 +212,6 @@ section > .row {
      -moz-box-shadow: 0 1px 2px rgba(0,0,0,.075);
           box-shadow: 0 1px 2px rgba(0,0,0,.075);
 }
-.diagram {
-  height: 140px;
-  padding: 4px;
-}
 .mini-layout {
   height: 340px;
   margin-bottom: 20px;
diff --git a/docs/index.html b/docs/index.html
index 02335fd758..560343ed6d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -151,18 +151,17 @@
     

       
Quick-start examples

       
Need some quick templates? Check out these basic examples we've put together:

-
-      

-        

-          Simple three-column layout with hero unit
-        

-        

-          Fluid layout with static sidebar
-        

-        

-          Simple hanging container for apps
-        

-      

+      
    
+        
  • 
+          Simple three-column layout with hero unit
+        
    • 
+        
  • 
+          Fluid layout with static sidebar
+        
    • 
+        
  • 
+          Simple hanging container for apps
+        
    • 
+      

     

     

       
Theming Bootstrap


From 2674210ff06a9ceaaa98263a2cbe2246fcd21111 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 11 Sep 2011 20:00:45 -0700
Subject: [PATCH 8/8] move the .brand from the parent to the a tag in the
 topbar; fix the moving text in IE7

---
 bootstrap-1.3.0.css     |  6 +++---
 bootstrap-1.3.0.min.css |  3 ++-
 docs/index.html         |  2 +-
 lib/patterns.less       | 22 +++++++++++-----------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index fc1746408d..966ce6d2ee 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: Sun Sep 11 18:43:05 PDT 2011
+ * Date: Sun Sep 11 19:59:57 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).
@@ -1304,10 +1304,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   color: #ffffff;
   text-decoration: none;
 }
-.topbar .brand, .topbar h3 {
+.topbar h3 {
   position: relative;
 }
-.topbar .brand a, .topbar h3 a {
+.topbar h3 a, .topbar .brand {
   float: left;
   display: block;
   padding: 8px 20px 12px;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index 66337455c0..37c3f2a239 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -215,7 +215,8 @@ table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
 table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
 .topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
 .topbar a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
-.topbar .brand,.topbar h3{position:relative;}.topbar .brand a,.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
+.topbar h3{position:relative;}
+.topbar h3 a,.topbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
 .topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;}
 .topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
 .topbar form.pull-right{float:right;}
diff --git a/docs/index.html b/docs/index.html
index 560343ed6d..f9bcb784e4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -40,7 +40,7 @@
     

       

         

-          
Bootstrap

+          Bootstrap
           
    
             
  • Overview
    • 
             
  • About
    • 
diff --git a/lib/patterns.less b/lib/patterns.less
index 901ac12de1..88f56ea597 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -33,19 +33,19 @@
 
   // Website name
   // h3 left for backwards compatibility
-  .brand,
   h3 {
     position: relative;
-    a {
-      float: left;
-      display: block;
-      padding: 8px 20px 12px;
-      margin-left: -20px; // negative indent to left-align the text down the page
-      color: @white;
-      font-size: 20px;
-      font-weight: 200;
-      line-height: 1;
-    }
+  }
+  h3 a,
+  .brand {
+    float: left;
+    display: block;
+    padding: 8px 20px 12px;
+    margin-left: -20px; // negative indent to left-align the text down the page
+    color: @white;
+    font-size: 20px;
+    font-weight: 200;
+    line-height: 1;
   }
 
   // Plain text in topbar