1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-17 19:06:40 +02:00

Merge pull request #15699 from kkirsche/patch-8

Fix #15691: .form-control-static changes height when empty
This commit is contained in:
Chris Rebert
2015-02-19 15:42:29 -08:00

View File

@@ -298,6 +298,7 @@ input[type="checkbox"] {
padding-bottom: (@padding-base-vertical + 1); padding-bottom: (@padding-base-vertical + 1);
// Remove default margin from `p` // Remove default margin from `p`
margin-bottom: 0; margin-bottom: 0;
min-height: (@line-height-computed + @font-size-base);
&.input-lg, &.input-lg,
&.input-sm { &.input-sm {
@@ -327,6 +328,7 @@ input[type="checkbox"] {
padding: @padding-small-vertical @padding-small-horizontal; padding: @padding-small-vertical @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);
} }
} }
@@ -342,6 +344,7 @@ input[type="checkbox"] {
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @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);
} }
} }