aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-25 11:21:44 -0800
committerMark Otto <[email protected]>2012-01-25 11:21:44 -0800
commitd3c5dd4e6acc421e06ef72680e794cfd9d52a04a (patch)
tree6e7c14e5c7b50e61856d90bdb7421107d11b4a95 /bootstrap.css
parentcfa925cab6dbb10af28ddca6d38e76aed97bb1ef (diff)
downloadbootstrap-d3c5dd4e6acc421e06ef72680e794cfd9d52a04a.tar.xz
bootstrap-d3c5dd4e6acc421e06ef72680e794cfd9d52a04a.zip
updated comments in forms.less and added uneditable-textarea class to extend uneditable-input
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css10
1 files changed, 8 insertions, 2 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 8069c5d25..0166a3201 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: Wed Jan 25 11:15:41 PST 2012
+ * Date: Wed Jan 25 11:21:22 PST 2012
*/
article,
aside,
@@ -510,13 +510,17 @@ select,
-moz-border-radius: 3px;
border-radius: 3px;
}
+.uneditable-textarea {
+ width: auto;
+ height: auto;
+}
input[type=image], input[type=checkbox], input[type=radio] {
width: auto;
height: auto;
padding: 0;
margin: 3px 0;
*margin-top: 0;
- /* IE6-7 */
+ /* IE7 */
line-height: normal;
border: none;
@@ -538,6 +542,8 @@ input[type=button], input[type=reset], input[type=submit] {
}
select, input[type=file] {
height: 27px;
+ /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
*margin-top: 4px;
/* For IE7, add top margin to align select with labels */