mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 16:50:00 +02:00
Code Issues Releases Wiki Activity

<input> and <select> sizing update

Browse Source 
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).
This commit is contained in:
Mark Otto
2013-07-18 19:53:32 -07:00
parent 0a3722112c
commit e440ff4b3f
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
less/forms.less
View File

@@ -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;