Skip to content

B
bootstrap
Commit dbffb0b4 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Fixes #15536, #15559: Add .form-group sizing support to .form-control-static

parent ec2ccf42
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 1 deletion
dist/css/bootstrap.css
View file @ dbffb0b4
...@@ -2706,6 +2706,12 @@ textarea.form-group-sm .form-control, ...@@ -2706,6 +2706,12 @@ textarea.form-group-sm .form-control,
select[multiple].form-group-sm .form-control { select[multiple].form-group-sm .form-control {
height: auto; height: auto;
} }
.form-group-sm .form-control-static {
height: 30px;
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
}
.input-lg { .input-lg {
height: 46px; height: 46px;
padding: 10px 16px; padding: 10px 16px;
...@@ -2736,6 +2742,12 @@ textarea.form-group-lg .form-control, ...@@ -2736,6 +2742,12 @@ textarea.form-group-lg .form-control,
select[multiple].form-group-lg .form-control { select[multiple].form-group-lg .form-control {
height: auto; height: auto;
} }
.form-group-lg .form-control-static {
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
}
.has-feedback { .has-feedback {
position: relative; position: relative;
} }
......
dist/css/bootstrap.css.map
View file @ dbffb0b4
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ dbffb0b4
This source diff could not be displayed because it is too large. You can view the blob instead.
less/forms.less
View file @ dbffb0b4
...@@ -318,6 +318,12 @@ input[type="checkbox"] { ...@@ -318,6 +318,12 @@ input[type="checkbox"] {
.form-control { .form-control {
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small); .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
} }
.form-control-static {
height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
line-height: @line-height-small;
}
} }
.input-lg { .input-lg {
...@@ -327,6 +333,12 @@ input[type="checkbox"] { ...@@ -327,6 +333,12 @@ input[type="checkbox"] {
.form-control { .form-control {
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large); .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
} }
.form-control-static {
height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
line-height: @line-height-large;
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment