Skip to content

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

Merge pull request #16176 from twbs/input_group_sizing 

Static form control sizing in input groups, again
parents f76d1a0e 27da9b29
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
less/forms.less
View file @ 6d2599be
...@@ -338,10 +338,10 @@ input[type="checkbox"] { ...@@ -338,10 +338,10 @@ input[type="checkbox"] {
} }
.form-control-static { .form-control-static {
height: @input-height-small; height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal; min-height: (@line-height-computed + @font-size-small);
padding: (@padding-small-vertical + 1) @padding-small-horizontal;
font-size: @font-size-small; font-size: @font-size-small;
line-height: @line-height-small; line-height: @line-height-small;
min-height: (@line-height-computed + @font-size-small);
} }
} }
...@@ -366,10 +366,10 @@ input[type="checkbox"] { ...@@ -366,10 +366,10 @@ input[type="checkbox"] {
} }
.form-control-static { .form-control-static {
height: @input-height-large; height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal; min-height: (@line-height-computed + @font-size-large);
padding: (@padding-large-vertical + 1) @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
line-height: @line-height-large; line-height: @line-height-large;
min-height: (@line-height-computed + @font-size-large);
} }
} }
...@@ -587,6 +587,7 @@ input[type="checkbox"] { ...@@ -587,6 +587,7 @@ input[type="checkbox"] {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: ((@padding-large-vertical * @line-height-large) + 1); padding-top: ((@padding-large-vertical * @line-height-large) + 1);
font-size: @font-size-large;
} }
} }
} }
...@@ -594,6 +595,7 @@ input[type="checkbox"] { ...@@ -594,6 +595,7 @@ input[type="checkbox"] {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: (@padding-small-vertical + 1); padding-top: (@padding-small-vertical + 1);
font-size: @font-size-small;
} }
} }
} }
......
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