mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 17:11:48 +02:00
Code Issues Releases Wiki Activity

Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672)

Browse Source
This commit is contained in:
Mark Otto
2013-07-29 17:30:36 -07:00
parent 09edfcf8c2
commit 8b5e41d900
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dist/css/bootstrap.css vendored
View File

@@ -1438,14 +1438,14 @@ textarea.form-control {
margin-left: 10px; margin-left: 10px;
} }
.form-control.input-large { .input-large {
height: 56px; height: 56px;
padding: 14px 16px; padding: 14px 16px;
font-size: 18px; font-size: 18px;
border-radius: 6px; border-radius: 6px;
} }
.form-control.input-small { .input-small {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
@@ -1462,6 +1462,11 @@ select.input-small {
line-height: 30px; line-height: 30px;
} }
textarea.input-large,
textarea.input-small {
height: auto;
}
.has-warning .help-block, .has-warning .help-block,
.has-warning .control-label { .has-warning .control-label {
color: #c09853; color: #c09853;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

31
less/forms.less
View File

@@ -218,20 +218,19 @@ input[type="number"] {
// horizontal sizing, wrap controls in the predefined grid classes. `<select>` // horizontal sizing, wrap controls in the predefined grid classes. `<select>`
// element gets special love because it's special, and that's a fact! // element gets special love because it's special, and that's a fact!
.form-control { .input-large {
&.input-large { height: @input-height-large;
height: @input-height-large; padding: @padding-large-vertical @padding-large-horizontal;
padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large;
font-size: @font-size-large; border-radius: @border-radius-large;
border-radius: @border-radius-large;
}
&.input-small {
height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
border-radius: @border-radius-small;
}
} }
.input-small {
height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
border-radius: @border-radius-small;
}
select { select {
&.input-large { &.input-large {
height: @input-height-large; height: @input-height-large;
@@ -242,6 +241,12 @@ select {
line-height: @input-height-small; line-height: @input-height-small;
} }
} }
textarea {
&.input-large,
&.input-small {
height: auto;
}
}
// Form control feedback states // Form control feedback states