aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-29 17:30:36 -0700
committerMark Otto <[email protected]>2013-07-29 17:30:36 -0700
commit8b5e41d900987aa46f38ec990e1a1170fc69fc00 (patch)
treef6d45752c71a95bec5a496403520b447085df923 /dist/css/bootstrap.css
parent09edfcf8c2525cb9ff397d48d8b6c9990ede30aa (diff)
downloadbootstrap-8b5e41d900987aa46f38ec990e1a1170fc69fc00.tar.xz
bootstrap-8b5e41d900987aa46f38ec990e1a1170fc69fc00.zip
Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672)
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css9
1 files changed, 7 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 3ba7d8f91..6afdbde29 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1438,14 +1438,14 @@ textarea.form-control {
margin-left: 10px;
}
-.form-control.input-large {
+.input-large {
height: 56px;
padding: 14px 16px;
font-size: 18px;
border-radius: 6px;
}
-.form-control.input-small {
+.input-small {
height: 30px;
padding: 5px 10px;
font-size: 12px;
@@ -1462,6 +1462,11 @@ select.input-small {
line-height: 30px;
}
+textarea.input-large,
+textarea.input-small {
+ height: auto;
+}
+
.has-warning .help-block,
.has-warning .control-label {
color: #c09853;