diff options
| author | Mark Otto <[email protected]> | 2013-07-18 19:53:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-18 19:53:32 -0700 |
| commit | e440ff4b3f872af175873283899cb40f50b8010f (patch) | |
| tree | 5d85cf9f4a540fc4ca88cb7785816c20c364b8a7 /less/forms.less | |
| parent | 0a3722112c9dff08785689051e581857cce572de (diff) | |
| download | bootstrap-e440ff4b3f872af175873283899cb40f50b8010f.tar.xz bootstrap-e440ff4b3f872af175873283899cb40f50b8010f.zip | |
`<input>` and `<select>` sizing update
Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.
Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).
Diffstat (limited to 'less/forms.less')
| -rw-r--r-- | less/forms.less | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/less/forms.less b/less/forms.less index dd75bee8b..bafe1cac6 100644 --- a/less/forms.less +++ b/less/forms.less @@ -55,7 +55,7 @@ input[type="search"], input[type="tel"], input[type="color"] { display: block; - min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border) + height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border) padding: @padding-base-vertical @padding-base-horizontal; font-size: @font-size-base; line-height: @line-height-base; @@ -123,7 +123,6 @@ input[type="checkbox"] { } // Set the height of select and file controls to match text inputs -select, input[type="file"] { height: @input-height-base; /* In IE7, the height of the select element cannot be changed by height, only font-size. TODO: Check if this is still needed when dropping IE7 support */ line-height: @input-height-base; @@ -231,6 +230,7 @@ textarea { // INPUT SIZES // ----------- +select, textarea, input[type="text"], input[type="password"], @@ -247,13 +247,13 @@ input[type="search"], input[type="tel"], input[type="color"] { &.input-large { - min-height: @input-height-large; + height: @input-height-large; padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; border-radius: @border-radius-large; } &.input-small { - min-height: @input-height-small; + height: @input-height-small; padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; border-radius: @border-radius-small; |
