Fixes #8516: correct input-small and input-large on select elements

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 257cbacb15b0dca871febdd738940ece48f1cf24..195249c93f9da132fe05c9eee513c571231ed409 100644 (file)
--- 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 eaa7c11d2ce0db0091de403020f6dd2ce5703218..dd75bee8b2eb8937c608d30bf680046e281343f0 100644 (file)
--- 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;
+  }
+}