diff options
| author | Mark Otto <[email protected]> | 2015-09-15 21:11:15 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-09-15 21:11:15 -0700 |
| commit | 85f08df3b0b3c9b8c0cf625475a4ec66a809d968 (patch) | |
| tree | 0ff8b432fbf1d5bf6d4c84bb18fcddb2bc27a69f | |
| parent | 3c4b61583f06ce4b7a6138e301596bd3249c6220 (diff) | |
| download | bootstrap-85f08df3b0b3c9b8c0cf625475a4ec66a809d968.tar.xz bootstrap-85f08df3b0b3c9b8c0cf625475a4ec66a809d968.zip | |
fixes border-width issues when customizing font-size by using 1px instead of .0625rem as default -width
| -rw-r--r-- | scss/_forms.scss | 6 | ||||
| -rw-r--r-- | scss/_variables.scss | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index 7879f6384..df2886338 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -76,7 +76,7 @@ // For use with horizontal and inline forms, when you need the label text to // align with the form controls. .form-control-label { - padding: ($input-padding-y + $border-width) $input-padding-x; + padding: $input-padding-y $input-padding-x; margin-bottom: 0; // Override the `<label>` default } @@ -120,8 +120,8 @@ .form-control-static { min-height: $input-height; // Size it appropriately next to real form controls - padding-top: ($input-padding-y + $border-width); - padding-bottom: ($input-padding-y + $border-width); + padding-top: $input-padding-y; + padding-bottom: $input-padding-y; // Remove default margin from `p` margin-bottom: 0; diff --git a/scss/_variables.scss b/scss/_variables.scss index b54308e97..471c88f34 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -60,7 +60,7 @@ $enable-grid-classes: true !default; $spacer: 1rem !default; $spacer-x: $spacer !default; $spacer-y: $spacer !default; -$border-width: .0625rem !default; +$border-width: 1px !default; // Body @@ -283,9 +283,9 @@ $input-padding-y-sm: .275rem !default; $input-padding-x-lg: 1.25rem !default; $input-padding-y-lg: .75rem !default; -$input-height: (($font-size-base * $line-height) + ($input-padding-y * 2) + ($border-width * 2)) !default; -$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) !default; -$input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) !default; +$input-height: (($font-size-base * $line-height) + ($input-padding-y * 2)) !default; +$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default; +$input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default; $form-group-margin-bottom: $spacer-y !default; |