rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

fixes border-width issues when customizing font-size by using 1px instead of .0625rem as default -width

Browse Source
This commit is contained in:
Mark Otto 2015-09-15 21:11:15 -07:00
parent 3c4b61583f
commit 85f08df3b0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scss/_forms.scss
View File

@ -76,7 +76,7 @@
// For use with horizontal and inline forms, when you need the label text to // For use with horizontal and inline forms, when you need the label text to
// align with the form controls. // align with the form controls.
.form-control-label { .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 margin-bottom: 0; // Override the `<label>` default
} }
@ -120,8 +120,8 @@
.form-control-static { .form-control-static {
min-height: $input-height; min-height: $input-height;
// Size it appropriately next to real form controls // Size it appropriately next to real form controls
padding-top: ($input-padding-y + $border-width); padding-top: $input-padding-y;
padding-bottom: ($input-padding-y + $border-width); padding-bottom: $input-padding-y;
// Remove default margin from `p` // Remove default margin from `p`
margin-bottom: 0; margin-bottom: 0;

8
scss/_variables.scss
View File

@ -60,7 +60,7 @@ $enable-grid-classes: true !default;
$spacer: 1rem !default; $spacer: 1rem !default;
$spacer-x: $spacer !default; $spacer-x: $spacer !default;
$spacer-y: $spacer !default; $spacer-y: $spacer !default;
$border-width: .0625rem !default; $border-width: 1px !default;
// Body // Body
@ -283,9 +283,9 @@ $input-padding-y-sm: .275rem !default;
$input-padding-x-lg: 1.25rem !default; $input-padding-x-lg: 1.25rem !default;
$input-padding-y-lg: .75rem !default; $input-padding-y-lg: .75rem !default;
$input-height: (($font-size-base * $line-height) + ($input-padding-y * 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) + ($border-width * 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) + ($border-width * 2)) !default; $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default;
$form-group-margin-bottom: $spacer-y !default; $form-group-margin-bottom: $spacer-y !default;