remove select from the new form grid sizes and let them inherit the default grid ones

4 files changed, 45 insertions, 37 deletions

diff --git a/bootstrap.css b/bootstrap.css
index 3b4a24009..f18a5ffa0 100644
--- a/bootstrap.css
+++ b/bootstrap.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 Oct  8 00:18:37 PDT 2011
+ * Date: Sat Oct  8 00:26:36 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).
@@ -643,7 +643,9 @@ select,
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
-/* mini reset for non-html5 file types */
+select {
+  padding: initial;
+}
 input[type=checkbox], input[type=radio] {
   width: auto;
   height: auto;
@@ -787,67 +789,67 @@ select.xxlarge {
 textarea.xxlarge {
   overflow-y: auto;
 }
-input.span1, textarea.span1, select.span1 {
+input.span1, textarea.span1 {
   display: inline-block;
   width: 30px;
 }
-input.span2, textarea.span2, select.span2 {
+input.span2, textarea.span2 {
   display: inline-block;
   width: 90px;
 }
-input.span3, textarea.span3, select.span3 {
+input.span3, textarea.span3 {
   display: inline-block;
   width: 150px;
 }
-input.span4, textarea.span4, select.span4 {
+input.span4, textarea.span4 {
   display: inline-block;
   width: 210px;
 }
-input.span5, textarea.span5, select.span5 {
+input.span5, textarea.span5 {
   display: inline-block;
   width: 270px;
 }
-input.span6, textarea.span6, select.span6 {
+input.span6, textarea.span6 {
   display: inline-block;
   width: 330px;
 }
-input.span7, textarea.span7, select.span7 {
+input.span7, textarea.span7 {
   display: inline-block;
   width: 390px;
 }
-input.span8, textarea.span8, select.span8 {
+input.span8, textarea.span8 {
   display: inline-block;
   width: 450px;
 }
-input.span9, textarea.span9, select.span9 {
+input.span9, textarea.span9 {
   display: inline-block;
   width: 510px;
 }
-input.span10, textarea.span10, select.span10 {
+input.span10, textarea.span10 {
   display: inline-block;
   width: 570px;
 }
-input.span11, textarea.span11, select.span11 {
+input.span11, textarea.span11 {
   display: inline-block;
   width: 630px;
 }
-input.span12, textarea.span12, select.span12 {
+input.span12, textarea.span12 {
   display: inline-block;
   width: 690px;
 }
-input.span13, textarea.span13, select.span13 {
+input.span13, textarea.span13 {
   display: inline-block;
   width: 750px;
 }
-input.span14, textarea.span14, select.span14 {
+input.span14, textarea.span14 {
   display: inline-block;
   width: 810px;
 }
-input.span15, textarea.span15, select.span15 {
+input.span15, textarea.span15 {
   display: inline-block;
   width: 870px;
 }
-input.span16, textarea.span16, select.span16 {
+input.span16, textarea.span16 {
   display: inline-block;
   width: 930px;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 472177f00..fa5a85935 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -113,6 +113,7 @@ label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;tex
 form .input{margin-left:150px;}
 input[type=checkbox],input[type=radio]{cursor:pointer;}
 input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+select{padding:initial;}
 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:#ffffff;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;}
@@ -135,22 +136,22 @@ form .clearfix.error .input-prepend span.add-on,form .clearfix.error .input-appe
 .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{display:inline-block;width:30px;}
-input.span2,textarea.span2,select.span2{display:inline-block;width:90px;}
-input.span3,textarea.span3,select.span3{display:inline-block;width:150px;}
-input.span4,textarea.span4,select.span4{display:inline-block;width:210px;}
-input.span5,textarea.span5,select.span5{display:inline-block;width:270px;}
-input.span6,textarea.span6,select.span6{display:inline-block;width:330px;}
-input.span7,textarea.span7,select.span7{display:inline-block;width:390px;}
-input.span8,textarea.span8,select.span8{display:inline-block;width:450px;}
-input.span9,textarea.span9,select.span9{display:inline-block;width:510px;}
-input.span10,textarea.span10,select.span10{display:inline-block;width:570px;}
-input.span11,textarea.span11,select.span11{display:inline-block;width:630px;}
-input.span12,textarea.span12,select.span12{display:inline-block;width:690px;}
-input.span13,textarea.span13,select.span13{display:inline-block;width:750px;}
-input.span14,textarea.span14,select.span14{display:inline-block;width:810px;}
-input.span15,textarea.span15,select.span15{display:inline-block;width:870px;}
-input.span16,textarea.span16,select.span16{display:inline-block;width:930px;}
+input.span1,textarea.span1{display:inline-block;width:30px;}
+input.span2,textarea.span2{display:inline-block;width:90px;}
+input.span3,textarea.span3{display:inline-block;width:150px;}
+input.span4,textarea.span4{display:inline-block;width:210px;}
+input.span5,textarea.span5{display:inline-block;width:270px;}
+input.span6,textarea.span6{display:inline-block;width:330px;}
+input.span7,textarea.span7{display:inline-block;width:390px;}
+input.span8,textarea.span8{display:inline-block;width:450px;}
+input.span9,textarea.span9{display:inline-block;width:510px;}
+input.span10,textarea.span10{display:inline-block;width:570px;}
+input.span11,textarea.span11{display:inline-block;width:630px;}
+input.span12,textarea.span12{display:inline-block;width:690px;}
+input.span13,textarea.span13{display:inline-block;width:750px;}
+input.span14,textarea.span14{display:inline-block;width:810px;}
+input.span15,textarea.span15{display:inline-block;width:870px;}
+input.span16,textarea.span16{display:inline-block;width:930px;}
 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 ea80e965c..0b345d79f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1318,6 +1318,7 @@
         <div class="clearfix"><input class="span2" id="" name="" type="text" placeholder=".span2" /></div>
         <div class="clearfix"><input class="span3" id="" name="" type="text" placeholder=".span3" /></div>
         <div class="clearfix"><input class="span4" id="" name="" type="text" placeholder=".span4" /></div>
+        <div class="clearfix"><select class="span4" id="" name=""></select></div>
         <div class="clearfix"><input class="span5" id="" name="" type="text" placeholder=".span5" /></div>
         <div class="clearfix"><input class="span6" id="" name="" type="text" placeholder=".span6" /></div>
         <div class="clearfix"><input class="span7" id="" name="" type="text" placeholder=".span7" /></div>
diff --git a/lib/forms.less b/lib/forms.less
index dffdb37d4..ec459c908 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -77,7 +77,12 @@ select,
   .border-radius(3px);
 }
 
-/* mini reset for non-html5 file types */
+// remove padding from select
+select {
+  padding: initial;
+}
+
+// mini reset for non-html5 file types
 input[type=checkbox],
 input[type=radio] {
   width: auto;
@@ -239,8 +244,7 @@ textarea.xxlarge {
   width: ((@gridColumnWidth - 10) * @columnSpan) + ((@gridColumnWidth - 10) * (@columnSpan - 1));
 }
 input,
-textarea,
-select {
+textarea {
   // Default columns
   &.span1     { .formColumns(1); }
   &.span2     { .formColumns(2); }