Commit 9e7f4ebd authored by Jacob Thornton's avatar Jacob Thornton

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

parents 7d52e1dc b0a351d8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Tue Jan 24 10:45:20 PST 2012 * Date: Tue Jan 24 12:27:30 PST 2012
*/ */
article, article,
aside, aside,
...@@ -537,7 +537,6 @@ select, input[type=file] { ...@@ -537,7 +537,6 @@ select, input[type=file] {
} }
select { select {
width: 220px; width: 220px;
padding: 0;
vertical-align: middle; vertical-align: middle;
background-color: #ffffff; background-color: #ffffff;
} }
......
...@@ -98,7 +98,7 @@ input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto; ...@@ -98,7 +98,7 @@ input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;
input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color: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;} input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;} select,input[type=file]{height:27px;*margin-top:4px;line-height:27px;}
select{width:220px;padding:0;vertical-align:middle;background-color:#ffffff;} select{width:220px;vertical-align:middle;background-color:#ffffff;}
select[multiple],select[size]{height:inherit;} select[multiple],select[size]{height:inherit;}
input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} input[type=image]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
textarea{height:auto;} textarea{height:auto;}
......
This diff is collapsed.
...@@ -107,7 +107,6 @@ input[type=file] { ...@@ -107,7 +107,6 @@ input[type=file] {
// Chrome on Linux and Mobile Safari need background-color // Chrome on Linux and Mobile Safari need background-color
select { select {
width: 220px; // default input width + 10px of padding that doesn't get applied width: 220px; // default input width + 10px of padding that doesn't get applied
padding: 0;
vertical-align: middle; vertical-align: middle;
background-color: @white; background-color: @white;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment