rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2013-07-18 15:36:41 -07:00
parent 7d9fb1dda7
commit 820558916f
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/assets/css/bootstrap.css vendored
View File

@ -1573,7 +1573,6 @@ textarea::-webkit-input-placeholder {
margin-left: 10px; margin-left: 10px;
} }
select.input-large,
textarea.input-large, textarea.input-large,
input[type="text"].input-large, input[type="text"].input-large,
input[type="password"].input-large, input[type="password"].input-large,
@ -1595,7 +1594,6 @@ input[type="color"].input-large {
border-radius: 6px; border-radius: 6px;
} }
select.input-small,
textarea.input-small, textarea.input-small,
input[type="text"].input-small, input[type="text"].input-small,
input[type="password"].input-small, input[type="password"].input-small,
@ -1617,6 +1615,16 @@ input[type="color"].input-small {
border-radius: 3px; 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 .help-block,
.has-warning .control-label { .has-warning .control-label {
color: #c09853; color: #c09853;

11
less/forms.less
View File

@ -231,7 +231,6 @@ textarea {
// INPUT SIZES // INPUT SIZES
// ----------- // -----------
select,
textarea, textarea,
input[type="text"], input[type="text"],
input[type="password"], input[type="password"],
@ -260,6 +259,16 @@ input[type="color"] {
border-radius: @border-radius-small; 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;
}
}