aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-18 15:36:41 -0700
committerMark Otto <[email protected]>2013-07-18 15:36:41 -0700
commit820558916f6b8d7d333de6d4d21404b75fd40fc2 (patch)
treed478b169b0551d453fcf5eed83996b20098d147c
parent7d9fb1dda7a3009e986364b714313037bfb67d0c (diff)
downloadbootstrap-820558916f6b8d7d333de6d4d21404b75fd40fc2.tar.xz
bootstrap-820558916f6b8d7d333de6d4d21404b75fd40fc2.zip
Fixes #8516: correct input-small and input-large on select elements
-rw-r--r--docs/assets/css/bootstrap.css12
-rw-r--r--less/forms.less11
2 files changed, 20 insertions, 3 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 257cbacb1..195249c93 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1573,7 +1573,6 @@ textarea::-webkit-input-placeholder {
margin-left: 10px;
}
-select.input-large,
textarea.input-large,
input[type="text"].input-large,
input[type="password"].input-large,
@@ -1595,7 +1594,6 @@ input[type="color"].input-large {
border-radius: 6px;
}
-select.input-small,
textarea.input-small,
input[type="text"].input-small,
input[type="password"].input-small,
@@ -1617,6 +1615,16 @@ input[type="color"].input-small {
border-radius: 3px;
}
+select.input-large {
+ height: 56px;
+ line-height: 56px;
+}
+
+select.input-small {
+ height: 30px;
+ line-height: 30px;
+}
+
.has-warning .help-block,
.has-warning .control-label {
color: #c09853;
diff --git a/less/forms.less b/less/forms.less
index eaa7c11d2..dd75bee8b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -231,7 +231,6 @@ textarea {
// INPUT SIZES
// -----------
-select,
textarea,
input[type="text"],
input[type="password"],
@@ -260,6 +259,16 @@ input[type="color"] {
border-radius: @border-radius-small;
}
}
+select {
+ &.input-large {
+ height: @input-height-large;
+ line-height: @input-height-large;
+ }
+ &.input-small {
+ height: @input-height-small;
+ line-height: @input-height-small;
+ }
+}