From 2bb5568533f77bfbeb6ca50ec3a464a69a238bde Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Fri, 29 Dec 2017 03:59:01 +0200 Subject: rake update[v4-dev] --- assets/stylesheets/_bootstrap-grid.scss | 2 +- assets/stylesheets/_bootstrap-reboot.scss | 2 +- assets/stylesheets/_bootstrap.scss | 4 +- assets/stylesheets/bootstrap/_alert.scss | 2 +- assets/stylesheets/bootstrap/_button-group.scss | 90 ++------ assets/stylesheets/bootstrap/_buttons.scss | 25 ++- assets/stylesheets/bootstrap/_card.scss | 9 +- assets/stylesheets/bootstrap/_close.scss | 7 +- assets/stylesheets/bootstrap/_code.scss | 14 +- assets/stylesheets/bootstrap/_custom-forms.scss | 195 +++++++++-------- assets/stylesheets/bootstrap/_dropdown.scss | 30 ++- assets/stylesheets/bootstrap/_forms.scss | 113 ++++------ assets/stylesheets/bootstrap/_functions.scss | 4 +- assets/stylesheets/bootstrap/_input-group.scss | 239 ++++++++------------- assets/stylesheets/bootstrap/_list-group.scss | 3 +- assets/stylesheets/bootstrap/_modal.scss | 12 ++ assets/stylesheets/bootstrap/_nav.scss | 4 +- assets/stylesheets/bootstrap/_navbar.scss | 7 +- assets/stylesheets/bootstrap/_pagination.scss | 8 + assets/stylesheets/bootstrap/_popover.scss | 223 +++++++++---------- assets/stylesheets/bootstrap/_progress.scss | 5 +- assets/stylesheets/bootstrap/_reboot.scss | 3 +- assets/stylesheets/bootstrap/_tables.scss | 2 +- assets/stylesheets/bootstrap/_tooltip.scss | 122 ++++++----- assets/stylesheets/bootstrap/_type.scss | 4 +- assets/stylesheets/bootstrap/_variables.scss | 182 ++++++++++------ .../bootstrap/mixins/_background-variant.scss | 3 +- .../stylesheets/bootstrap/mixins/_breakpoints.scss | 6 +- assets/stylesheets/bootstrap/mixins/_buttons.scss | 43 ++-- assets/stylesheets/bootstrap/mixins/_caret.scss | 30 +++ assets/stylesheets/bootstrap/mixins/_forms.scss | 56 +++-- .../stylesheets/bootstrap/mixins/_text-hide.scss | 1 + .../stylesheets/bootstrap/utilities/_borders.scss | 7 +- 33 files changed, 769 insertions(+), 688 deletions(-) (limited to 'assets/stylesheets') diff --git a/assets/stylesheets/_bootstrap-grid.scss b/assets/stylesheets/_bootstrap-grid.scss index 34b4fd9..94d40a4 100644 --- a/assets/stylesheets/_bootstrap-grid.scss +++ b/assets/stylesheets/_bootstrap-grid.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Grid v4.0.0-beta.2 (https://getbootstrap.com) + * Bootstrap Grid v4.0.0-beta.3 (https://getbootstrap.com) * Copyright 2011-2017 The Bootstrap Authors * Copyright 2011-2017 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/assets/stylesheets/_bootstrap-reboot.scss b/assets/stylesheets/_bootstrap-reboot.scss index 976e7e7..b285bc7 100644 --- a/assets/stylesheets/_bootstrap-reboot.scss +++ b/assets/stylesheets/_bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot v4.0.0-beta.2 (https://getbootstrap.com) + * Bootstrap Reboot v4.0.0-beta.3 (https://getbootstrap.com) * Copyright 2011-2017 The Bootstrap Authors * Copyright 2011-2017 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/assets/stylesheets/_bootstrap.scss b/assets/stylesheets/_bootstrap.scss index ccc5186..966cb67 100644 --- a/assets/stylesheets/_bootstrap.scss +++ b/assets/stylesheets/_bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap v4.0.0-beta.2 (https://getbootstrap.com) + * Bootstrap v4.0.0-beta.3 (https://getbootstrap.com) * Copyright 2011-2017 The Bootstrap Authors * Copyright 2011-2017 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) @@ -9,7 +9,6 @@ @import "bootstrap/variables"; @import "bootstrap/mixins"; @import "bootstrap/root"; -@import "bootstrap/print"; @import "bootstrap/reboot"; @import "bootstrap/type"; @import "bootstrap/images"; @@ -40,3 +39,4 @@ @import "bootstrap/popover"; @import "bootstrap/carousel"; @import "bootstrap/utilities"; +@import "bootstrap/print"; diff --git a/assets/stylesheets/bootstrap/_alert.scss b/assets/stylesheets/bootstrap/_alert.scss index c2d5c81..dd43e23 100644 --- a/assets/stylesheets/bootstrap/_alert.scss +++ b/assets/stylesheets/bootstrap/_alert.scss @@ -46,6 +46,6 @@ @each $color, $value in $theme-colors { .alert-#{$color} { - @include alert-variant(theme-color-level($color, -10), theme-color-level($color, -9), theme-color-level($color, 6)); + @include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level)); } } diff --git a/assets/stylesheets/bootstrap/_button-group.scss b/assets/stylesheets/bootstrap/_button-group.scss index 12d4982..c1b8265 100644 --- a/assets/stylesheets/bootstrap/_button-group.scss +++ b/assets/stylesheets/bootstrap/_button-group.scss @@ -28,7 +28,7 @@ .btn + .btn-group, .btn-group + .btn, .btn-group + .btn-group { - margin-left: -$input-btn-border-width; + margin-left: -$btn-border-width; } } @@ -44,46 +44,18 @@ } .btn-group { - > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { - border-radius: 0; - } - - // Set corners individual because sometimes a single button can be in a .btn-group - // and we need :first-child and :last-child to both match > .btn:first-child { margin-left: 0; - - &:not(:last-child):not(.dropdown-toggle) { - @include border-right-radius(0); - } - } - - - // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu - // immediately after it - > .btn:last-child:not(:first-child), - > .dropdown-toggle:not(:first-child) { - @include border-left-radius(0); - } - - // Custom edits for including btn-groups within btn-groups (useful for including - // dropdown buttons within a btn-group) - > .btn-group { - float: left; - } - - > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; } - > .btn-group:first-child:not(:last-child) { - > .btn:last-child, - > .dropdown-toggle { - @include border-right-radius(0); - } + // Reset rounded corners + > .btn:not(:last-child):not(.dropdown-toggle), + > .btn-group:not(:last-child) > .btn { + @include border-right-radius(0); } - > .btn-group:last-child:not(:first-child) > .btn:first-child { + > .btn:not(:first-child), + > .btn-group:not(:first-child) > .btn { @include border-left-radius(0); } } @@ -100,9 +72,9 @@ // Split button dropdowns // -.btn + .dropdown-toggle-split { - padding-right: $input-btn-padding-x * .75; - padding-left: $input-btn-padding-x * .75; +.dropdown-toggle-split { + padding-right: $btn-padding-x * .75; + padding-left: $btn-padding-x * .75; &::after { margin-left: 0; @@ -110,13 +82,13 @@ } .btn-sm + .dropdown-toggle-split { - padding-right: $input-btn-padding-x-sm * .75; - padding-left: $input-btn-padding-x-sm * .75; + padding-right: $btn-padding-x-sm * .75; + padding-left: $btn-padding-x-sm * .75; } .btn-lg + .dropdown-toggle-split { - padding-right: $input-btn-padding-x-lg * .75; - padding-left: $input-btn-padding-x-lg * .75; + padding-right: $btn-padding-x-lg * .75; + padding-left: $btn-padding-x-lg * .75; } @@ -150,36 +122,18 @@ > .btn + .btn-group, > .btn-group + .btn, > .btn-group + .btn-group { - margin-top: -$input-btn-border-width; + margin-top: -$btn-border-width; margin-left: 0; } - > .btn { - &:not(:first-child):not(:last-child) { - border-radius: 0; - } - - &:first-child:not(:last-child) { - @include border-bottom-radius(0); - } - - &:last-child:not(:first-child) { - @include border-top-radius(0); - } - } - - > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; - } - - > .btn-group:first-child:not(:last-child) { - > .btn:last-child, - > .dropdown-toggle { - @include border-bottom-radius(0); - } + // Reset rounded corners + > .btn:not(:last-child):not(.dropdown-toggle), + > .btn-group:not(:last-child) > .btn { + @include border-bottom-radius(0); } - > .btn-group:last-child:not(:first-child) > .btn:first-child { + > .btn:not(:first-child), + > .btn-group:not(:first-child) > .btn { @include border-top-radius(0); } } @@ -197,7 +151,7 @@ // See https://github.com/twbs/bootstrap/pull/12794 and // https://github.com/twbs/bootstrap/pull/14559 for more information. -[data-toggle="buttons"] { +.btn-group-toggle { > .btn, > .btn-group > .btn { margin-bottom: 0; // Override default `