diff options
| author | Mark Otto <[email protected]> | 2016-02-07 23:35:45 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-07 23:35:45 -0800 |
| commit | e8b6e5fc696fcd6d1dadd3601677f8c972790e28 (patch) | |
| tree | 7d3ee33ae188ac37734fb92ec1d29d695d21fd63 /scss/_forms.scss | |
| parent | e3b55aadea895bdb0910f3ffd3f74d89fee37925 (diff) | |
| parent | e455b6b8d2cd028d53640f14134f0e8b3f575786 (diff) | |
| download | bootstrap-e8b6e5fc696fcd6d1dadd3601677f8c972790e28.tar.xz bootstrap-e8b6e5fc696fcd6d1dadd3601677f8c972790e28.zip | |
Merge pull request #19121 from twbs/v4-form-sizing
v4: Updated form and button sizing
Diffstat (limited to 'scss/_forms.scss')
| -rw-r--r-- | scss/_forms.scss | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index 6fd349620..7055cad23 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -11,6 +11,7 @@ // height: $input-height; padding: $input-padding-y $input-padding-x; font-size: $font-size-base; + line-height: $input-line-height; color: $input-color; background-color: $input-bg; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214. @@ -141,18 +142,14 @@ input[type="month"] { // issue documented in https://github.com/twbs/bootstrap/issues/15074. .form-control-sm { - // height: $input-height-sm; padding: $input-padding-y-sm $input-padding-x-sm; font-size: $font-size-sm; - line-height: $line-height-sm; @include border-radius($input-border-radius-sm); } .form-control-lg { - // height: $input-height-lg; padding: $input-padding-y-lg $input-padding-x-lg; font-size: $font-size-lg; - line-height: $line-height-lg; @include border-radius($input-border-radius-lg); } |
