diff options
| -rw-r--r-- | assets/stylesheets/bootstrap/_forms.scss | 6 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 8 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/mixins/_grid.scss | 5 | ||||
| -rw-r--r-- | lib/bootstrap/version.rb | 2 | ||||
| -rw-r--r-- | templates/project/_bootstrap-variables.scss | 8 |
5 files changed, 16 insertions, 13 deletions
diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss index 7879f63..df28863 100644 --- a/assets/stylesheets/bootstrap/_forms.scss +++ b/assets/stylesheets/bootstrap/_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/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index b54308e..471c88f 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_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; diff --git a/assets/stylesheets/bootstrap/mixins/_grid.scss b/assets/stylesheets/bootstrap/mixins/_grid.scss index 87b4ac9..585c80f 100644 --- a/assets/stylesheets/bootstrap/mixins/_grid.scss +++ b/assets/stylesheets/bootstrap/mixins/_grid.scss @@ -7,7 +7,10 @@ margin-left: auto; padding-left: ($gutter / 2); padding-right: ($gutter / 2); - @include clearfix(); + @if $enable-flex { + } @else { + @include clearfix(); + } } diff --git a/lib/bootstrap/version.rb b/lib/bootstrap/version.rb index ca240be..ac50e45 100644 --- a/lib/bootstrap/version.rb +++ b/lib/bootstrap/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '4.0.0.dev' - BOOTSTRAP_SHA = 'b811f8cf9628dbcbfe994f71588c5a0c921a092d' + BOOTSTRAP_SHA = '64cdb791dfa2f04bd50062b76fcf25345c073a36' end diff --git a/templates/project/_bootstrap-variables.scss b/templates/project/_bootstrap-variables.scss index 4e603ef..34a659b 100644 --- a/templates/project/_bootstrap-variables.scss +++ b/templates/project/_bootstrap-variables.scss @@ -61,7 +61,7 @@ // $spacer: 1rem; // $spacer-x: $spacer; // $spacer-y: $spacer; -// $border-width: .0625rem; +// $border-width: 1px; // Body @@ -284,9 +284,9 @@ // $input-padding-x-lg: 1.25rem; // $input-padding-y-lg: .75rem; -// $input-height: (($font-size-base * $line-height) + ($input-padding-y * 2) + ($border-width * 2)); -// $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)); -// $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)); +// $input-height: (($font-size-base * $line-height) + ($input-padding-y * 2)); +// $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)); +// $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)); // $form-group-margin-bottom: $spacer-y; |