diff options
author | Julian <julian@vantage-design.com> | 2020-05-13 23:04:16 +0300 |
---|---|---|
committer | Julian <julian@vantage-design.com> | 2020-05-13 23:04:16 +0300 |
commit | c3e9fedca8577469dc58981e59a71ab78d0ced34 (patch) | |
tree | f1d69328b12553024a9b4817ccc4b808ed989dcd /assets | |
parent | 9073616c736fc95709ebc0dab3556e1f235e8b87 (diff) |
v1.0.4 - updated Bootstrap to v4.5
Diffstat (limited to 'assets')
32 files changed, 220 insertions, 101 deletions
diff --git a/assets/css/ace.scss b/assets/css/ace.scss index 45a370b..1d34591 100644 --- a/assets/css/ace.scss +++ b/assets/css/ace.scss @@ -2,7 +2,7 @@ * ACE DOCUMENTATION * Stylesheet * @author Vantage Design -* @version 1.0.0 +* @version 1.0.4 * @license https://github.com/vantagedesign/ace-documentation/blob/master/LICENSE * ------------------------------------------------------------------------ */ diff --git a/assets/css/bootstrap/_breadcrumb.scss b/assets/css/bootstrap/_breadcrumb.scss index d748894..a0cf7e2 100644 --- a/assets/css/bootstrap/_breadcrumb.scss +++ b/assets/css/bootstrap/_breadcrumb.scss @@ -10,6 +10,8 @@ } .breadcrumb-item { + display: flex; + // The separator between breadcrumbs (by default, a forward-slash: "/") + .breadcrumb-item { padding-left: $breadcrumb-item-padding; diff --git a/assets/css/bootstrap/_buttons.scss b/assets/css/bootstrap/_buttons.scss index e87d339..6ee24ba 100644 --- a/assets/css/bootstrap/_buttons.scss +++ b/assets/css/bootstrap/_buttons.scss @@ -10,9 +10,9 @@ font-weight: $btn-font-weight; color: $body-color; text-align: center; + text-decoration: if($link-decoration == none, null, none); white-space: $btn-white-space; vertical-align: middle; - cursor: if($enable-pointer-cursor-for-buttons, pointer, null); user-select: none; background-color: transparent; border: $btn-border-width solid transparent; @@ -37,12 +37,16 @@ @include box-shadow(none); } - &:not(:disabled):not(.disabled):active, - &:not(:disabled):not(.disabled).active { - @include box-shadow($btn-active-box-shadow); + &:not(:disabled):not(.disabled) { + cursor: if($enable-pointer-cursor-for-buttons, pointer, null); - &:focus { - @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); + &:active, + &.active { + @include box-shadow($btn-active-box-shadow); + + &:focus { + @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); + } } } } @@ -89,7 +93,6 @@ fieldset:disabled a.btn { &:focus, &.focus { text-decoration: $link-hover-decoration; - box-shadow: none; } &:disabled, diff --git a/assets/css/bootstrap/_card.scss b/assets/css/bootstrap/_card.scss index d6759fd..fabe9f3 100644 --- a/assets/css/bootstrap/_card.scss +++ b/assets/css/bootstrap/_card.scss @@ -19,15 +19,18 @@ margin-left: 0; } - > .list-group:first-child { - .list-group-item:first-child { - @include border-top-radius($card-border-radius); + > .list-group { + border-top: inherit; + border-bottom: inherit; + + &:first-child { + border-top-width: 0; + @include border-top-radius($card-inner-border-radius); } - } - > .list-group:last-child { - .list-group-item:last-child { - @include border-bottom-radius($card-border-radius); + &:last-child { + border-bottom-width: 0; + @include border-bottom-radius($card-inner-border-radius); } } } @@ -90,6 +93,7 @@ .card-footer { padding: $card-spacer-y $card-spacer-x; + color: $card-cap-color; background-color: $card-cap-bg; border-top: $card-border-width solid $card-border-color; diff --git a/assets/css/bootstrap/_close.scss b/assets/css/bootstrap/_close.scss index 071aebe..82e9593 100644 --- a/assets/css/bootstrap/_close.scss +++ b/assets/css/bootstrap/_close.scss @@ -30,7 +30,6 @@ button.close { padding: 0; background-color: transparent; border: 0; - appearance: none; } // Future-proof disabling of clicks on `<a>` elements diff --git a/assets/css/bootstrap/_custom-forms.scss b/assets/css/bootstrap/_custom-forms.scss index 21e72da..0804c63 100644 --- a/assets/css/bootstrap/_custom-forms.scss +++ b/assets/css/bootstrap/_custom-forms.scss @@ -237,8 +237,9 @@ border-color: $custom-select-focus-border-color; outline: 0; @if $enable-shadows { - box-shadow: $custom-select-box-shadow, $custom-select-focus-box-shadow; + @include box-shadow($custom-select-box-shadow, $custom-select-focus-box-shadow); } @else { + // Avoid using mixin so we can pass custom focus shadow properly box-shadow: $custom-select-focus-box-shadow; } diff --git a/assets/css/bootstrap/_dropdown.scss b/assets/css/bootstrap/_dropdown.scss index 76f33a4..2ab7536 100644 --- a/assets/css/bootstrap/_dropdown.scss +++ b/assets/css/bootstrap/_dropdown.scss @@ -128,6 +128,7 @@ font-weight: $font-weight-normal; color: $dropdown-link-color; text-align: inherit; // For `<button>`s + text-decoration: if($link-decoration == none, null, none); white-space: nowrap; // prevent links from randomly breaking onto new lines background-color: transparent; // For `<button>`s border: 0; // For `<button>`s @@ -176,7 +177,7 @@ // Dropdown section headers .dropdown-header { display: block; - padding: $dropdown-padding-y $dropdown-item-padding-x; + padding: $dropdown-header-padding; margin-bottom: 0; // for use with heading elements @include font-size($font-size-sm); color: $dropdown-header-color; diff --git a/assets/css/bootstrap/_forms.scss b/assets/css/bootstrap/_forms.scss index b2edb7b..66a4efe 100644 --- a/assets/css/bootstrap/_forms.scss +++ b/assets/css/bootstrap/_forms.scss @@ -59,6 +59,15 @@ } } +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { + &.form-control { + appearance: none; // Fix appearance for date inputs in Safari + } +} + select.form-control { &:focus::-ms-value { // Suppress the nested default white text on blue background highlight given to diff --git a/assets/css/bootstrap/_functions.scss b/assets/css/bootstrap/_functions.scss index 695e6cd..eb2471d 100644 --- a/assets/css/bootstrap/_functions.scss +++ b/assets/css/bootstrap/_functions.scss @@ -23,10 +23,12 @@ // Starts at zero // Used to ensure the min-width of the lowest breakpoint starts at 0. @mixin _assert-starts-at-zero($map, $map-name: "$grid-breakpoints") { - $values: map-values($map); - $first-value: nth($values, 1); - @if $first-value != 0 { - @warn "First breakpoint in #{$map-name} must start at 0, but starts at #{$first-value}."; + @if length($map) > 0 { + $values: map-values($map); + $first-value: nth($values, 1); + @if $first-value != 0 { + @warn "First breakpoint in #{$map-name} must start at 0, but starts at #{$first-value}."; + } } } @@ -52,7 +54,12 @@ @function escape-svg($string) { @if str-index($string, "data:image/svg+xml") { @each $char, $encoded in $escaped-characters { - $string: str-replace($string, $char, $encoded); + // Do not escape the url brackets + @if str-index($string, "url(") == 1 { + $string: url("#{str-replace(str-slice($string, 6, -3), $char, $encoded)}"); + } @else { + $string: str-replace($string, $char, $encoded); + } } } diff --git a/assets/css/bootstrap/_grid.scss b/assets/css/bootstrap/_grid.scss index d36ee75..57ec5a9 100644 --- a/assets/css/bootstrap/_grid.scss +++ b/assets/css/bootstrap/_grid.scss @@ -25,11 +25,19 @@ max-width: $container-max-width; } + // Extend each breakpoint which is smaller or equal to the current breakpoint + $extend-breakpoint: true; + @each $name, $width in $grid-breakpoints { - @if ($container-max-width > $width or $breakpoint == $name) { + @if ($extend-breakpoint) { .container#{breakpoint-infix($name, $grid-breakpoints)} { @extend %responsive-container-#{$breakpoint}; } + + // Once the current breakpoint is reached, stop extending + @if ($breakpoint == $name) { + $extend-breakpoint: false; + } } } } diff --git a/assets/css/bootstrap/_input-group.scss b/assets/css/bootstrap/_input-group.scss index bf69ddb..cad8ea3 100644 --- a/assets/css/bootstrap/_input-group.scss +++ b/assets/css/bootstrap/_input-group.scss @@ -16,7 +16,8 @@ > .custom-select, > .custom-file { position: relative; // For focus state's z-index - flex: 1 1 0%; + flex: 1 1 auto; + width: 1%; min-width: 0; // https://stackoverflow.com/questions/36247140/why-dont-flex-items-shrink-past-content-size margin-bottom: 0; diff --git a/assets/css/bootstrap/_list-group.scss b/assets/css/bootstrap/_list-group.scss index 468c2e3..37c307e 100644 --- a/assets/css/bootstrap/_list-group.scss +++ b/assets/css/bootstrap/_list-group.scss @@ -9,6 +9,7 @@ // No need to set list-style: none; since .list-group-item is block level padding-left: 0; // reset padding because ul and ol margin-bottom: 0; + @include border-radius($list-group-border-radius); } @@ -46,15 +47,16 @@ display: block; padding: $list-group-item-padding-y $list-group-item-padding-x; color: $list-group-color; + text-decoration: if($link-decoration == none, null, none); background-color: $list-group-bg; border: $list-group-border-width solid $list-group-border-color; &:first-child { - @include border-top-radius($list-group-border-radius); + @include border-top-radius(inherit); } &:last-child { - @include border-bottom-radius($list-group-border-radius); + @include border-bottom-radius(inherit); } &.disabled, @@ -94,7 +96,7 @@ .list-group-horizontal#{$infix} { flex-direction: row; - .list-group-item { + > .list-group-item { &:first-child { @include border-bottom-left-radius($list-group-border-radius); @include border-top-right-radius(0); @@ -130,18 +132,12 @@ // useful within other components (e.g., cards). .list-group-flush { - .list-group-item { - border-right-width: 0; - border-left-width: 0; - @include border-radius(0); + @include border-radius(0); - &:first-child { - border-top-width: 0; - } - } + > .list-group-item { + border-width: 0 0 $list-group-border-width; - &:last-child { - .list-group-item:last-child { + &:last-child { border-bottom-width: 0; } } diff --git a/assets/css/bootstrap/_modal.scss b/assets/css/bootstrap/_modal.scss index 9053c17..a6d0f06 100644 --- a/assets/css/bootstrap/_modal.scss +++ b/assets/css/bootstrap/_modal.scss @@ -83,6 +83,7 @@ &::before { display: block; // IE10 height: subtract(100vh, $modal-dialog-margin * 2); + height: min-content; // Reset height to 0 except on IE content: ""; } @@ -217,6 +218,7 @@ &::before { height: subtract(100vh, $modal-dialog-margin-y-sm-up * 2); + height: min-content; } } diff --git a/assets/css/bootstrap/_nav.scss b/assets/css/bootstrap/_nav.scss index 667d682..b8b73bb 100644 --- a/assets/css/bootstrap/_nav.scss +++ b/assets/css/bootstrap/_nav.scss @@ -14,6 +14,7 @@ .nav-link { display: block; padding: $nav-link-padding-y $nav-link-padding-x; + text-decoration: if($link-decoration == none, null, none); @include hover-focus() { text-decoration: none; diff --git a/assets/css/bootstrap/_pagination.scss b/assets/css/bootstrap/_pagination.scss index 953a35a..d7d553c 100644 --- a/assets/css/bootstrap/_pagination.scss +++ b/assets/css/bootstrap/_pagination.scss @@ -11,6 +11,7 @@ margin-left: -$pagination-border-width; line-height: $pagination-line-height; color: $pagination-color; + text-decoration: if($link-decoration == none, null, none); background-color: $pagination-bg; border: $pagination-border-width solid $pagination-border-color; diff --git a/assets/css/bootstrap/_progress.scss b/assets/css/bootstrap/_progress.scss index 37ef602..1a03704 100644 --- a/assets/css/bootstrap/_progress.scss +++ b/assets/css/bootstrap/_progress.scss @@ -10,6 +10,7 @@ display: flex; height: $progress-height; overflow: hidden; // force rounded corners by cropping it + line-height: 0; @include font-size($progress-font-size); background-color: $progress-bg; @include border-radius($progress-border-radius); diff --git a/assets/css/bootstrap/_reboot.scss b/assets/css/bootstrap/_reboot.scss index b6c98cc..5a52b58 100644 --- a/assets/css/bootstrap/_reboot.scss +++ b/assets/css/bootstrap/_reboot.scss @@ -229,6 +229,9 @@ pre { margin-bottom: 1rem; // Don't allow content to break outside overflow: auto; + // Disable auto-hiding scrollbar in IE & legacy Edge to avoid overlap, + // making it impossible to interact with the content + -ms-overflow-style: scrollbar; } @@ -330,6 +333,13 @@ select { text-transform: none; // Remove the inheritance of text transform in Firefox } +// Set the cursor for non-`<button>` buttons +// +// Details at https://github.com/twbs/bootstrap/pull/30562 +[role="button"] { + cursor: pointer; +} + // Remove the inheritance of word-wrap in Safari. // // Details at https://github.com/twbs/bootstrap/issues/24990 @@ -376,18 +386,6 @@ input[type="checkbox"] { } -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - // Remove the default appearance of temporal inputs to avoid a Mobile Safari - // bug where setting a custom line-height prevents text from being vertically - // centered within the input. - // See https://bugs.webkit.org/show_bug.cgi?id=139848 - // and https://github.com/twbs/bootstrap/issues/11266 - -webkit-appearance: listbox; -} - textarea { overflow: auto; // Remove the default vertical scrollbar in IE. // Textareas should really only resize vertically so they don't break their (horizontal) containers. diff --git a/assets/css/bootstrap/_spinners.scss b/assets/css/bootstrap/_spinners.scss index 364a5c1..27c9241 100644 --- a/assets/css/bootstrap/_spinners.scss +++ b/assets/css/bootstrap/_spinners.scss @@ -34,6 +34,7 @@ } 50% { opacity: 1; + transform: none; } } diff --git a/assets/css/bootstrap/_utilities.scss b/assets/css/bootstrap/_utilities.scss index a5de31b..10e31dd 100644 --- a/assets/css/bootstrap/_utilities.scss +++ b/assets/css/bootstrap/_utilities.scss @@ -6,12 +6,13 @@ @import "utilities/embed"; @import "utilities/flex"; @import "utilities/float"; +@import "utilities/interactions"; @import "utilities/overflow"; @import "utilities/position"; @import "utilities/screenreaders"; @import "utilities/shadows"; @import "utilities/sizing"; -@import "utilities/stretched-link"; @import "utilities/spacing"; +@import "utilities/stretched-link"; @import "utilities/text"; @import "utilities/visibility"; diff --git a/assets/css/bootstrap/_variables.scss b/assets/css/bootstrap/_variables.scss index 5d3135c..22fafe1 100644 --- a/assets/css/bootstrap/_variables.scss +++ b/assets/css/bootstrap/_variables.scss @@ -106,6 +106,8 @@ $escaped-characters: ( ("<","%3c"), (">","%3e"), ("#","%23"), + ("(","%28"), + (")","%29"), ) !default; @@ -786,6 +788,7 @@ $dropdown-item-padding-y: .25rem !default; $dropdown-item-padding-x: 1.5rem !default; $dropdown-header-color: $gray-600 !default; +$dropdown-header-padding: $dropdown-padding-y $dropdown-item-padding-x !default; // Pagination @@ -1135,6 +1138,7 @@ $pre-scrollable-max-height: 340px !default; $displays: none, inline, inline-block, block, table, table-row, table-cell, flex, inline-flex !default; $overflows: auto, hidden !default; $positions: static, relative, absolute, fixed, sticky !default; +$user-selects: all, auto, none !default; // Printing diff --git a/assets/css/bootstrap/bootstrap-grid.scss b/assets/css/bootstrap/bootstrap-grid.scss new file mode 100644 index 0000000..4109e4f --- /dev/null +++ b/assets/css/bootstrap/bootstrap-grid.scss @@ -0,0 +1,29 @@ +/*! + * Bootstrap Grid v4.5.0 (https://getbootstrap.com/) + * Copyright 2011-2020 The Bootstrap Authors + * Copyright 2011-2020 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +html { + box-sizing: border-box; + -ms-overflow-style: scrollbar; +} + +*, +*::before, +*::after { + box-sizing: inherit; +} + +@import "functions"; +@import "variables"; + +@import "mixins/breakpoints"; +@import "mixins/grid-framework"; +@import "mixins/grid"; + +@import "grid"; +@import "utilities/display"; +@import "utilities/flex"; +@import "utilities/spacing"; diff --git a/assets/css/bootstrap/bootstrap-reboot.scss b/assets/css/bootstrap/bootstrap-reboot.scss new file mode 100644 index 0000000..e61235a --- /dev/null +++ b/assets/css/bootstrap/bootstrap-reboot.scss @@ -0,0 +1,12 @@ +/*! + * Bootstrap Reboot v4.5.0 (https://getbootstrap.com/) + * Copyright 2011-2020 The Bootstrap Authors + * Copyright 2011-2020 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md) + */ + +@import "functions"; +@import "variables"; +@import "mixins"; +@import "reboot"; diff --git a/assets/css/bootstrap/bootstrap.scss b/assets/css/bootstrap/bootstrap.scss index 881e4d8..8ae96de 100644 --- a/assets/css/bootstrap/bootstrap.scss +++ b/assets/css/bootstrap/bootstrap.scss @@ -1,7 +1,7 @@ /*! - * Bootstrap v4.4.1 (https://getbootstrap.com/) - * Copyright 2011-2019 The Bootstrap Authors - * Copyright 2011-2019 Twitter, Inc. + * Bootstrap v4.5.0 (https://getbootstrap.com/) + * Copyright 2011-2020 The Bootstrap Authors + * Copyright 2011-2020 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/assets/css/bootstrap/mixins/_background-variant.scss b/assets/css/bootstrap/mixins/_background-variant.scss index 3ceb5c5..8058018 100644 --- a/assets/css/bootstrap/mixins/_background-variant.scss +++ b/assets/css/bootstrap/mixins/_background-variant.scss @@ -15,8 +15,9 @@ @include deprecate("The `bg-variant` mixin", "v4.4.0", "v5", $ignore-warning); } -@mixin bg-gradient-variant($parent, $color) { +@mixin bg-gradient-variant($parent, $color, $ignore-warning: false) { #{$parent} { background: $color linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x !important; } + @include deprecate("The `bg-gradient-variant` mixin", "v4.5.0", "v5", $ignore-warning); } diff --git a/assets/css/bootstrap/mixins/_border-radius.scss b/assets/css/bootstrap/mixins/_border-radius.scss index 88aeb37..aee9bf3 100644 --- a/assets/css/bootstrap/mixins/_border-radius.scss +++ b/assets/css/bootstrap/mixins/_border-radius.scss @@ -1,9 +1,22 @@ // stylelint-disable property-blacklist // Single side border-radius +// Helper function to replace negative values with 0 +@function valid-radius($radius) { + $return: (); + @each $value in $radius { + @if type-of($value) == number { + $return: append($return, max($value, 0)); + } @else { + $return: append($return, $value); + } + } + @return $return; +} + @mixin border-radius($radius: $border-radius, $fallback-border-radius: false) { @if $enable-rounded { - border-radius: $radius; + border-radius: valid-radius($radius); } @else if $fallback-border-radius != false { border-radius: $fallback-border-radius; @@ -12,52 +25,52 @@ @mixin border-top-radius($radius) { @if $enable-rounded { - border-top-left-radius: $radius; - border-top-right-radius: $radius; + border-top-left-radius: valid-radius($radius); + border-top-right-radius: valid-radius($radius); } } @mixin border-right-radius($radius) { @if $enable-rounded { - border-top-right-radius: $radius; - border-bottom-right-radius: $radius; + border-top-right-radius: valid-radius($radius); + border-bottom-right-radius: valid-radius($radius); } } @mixin border-bottom-radius($radius) { @if $enable-rounded { - border-bottom-right-radius: $radius; - border-bottom-left-radius: $radius; + border-bottom-right-radius: valid-radius($radius); + border-bottom-left-radius: valid-radius($radius); } } @mixin border-left-radius($radius) { @if $enable-rounded { - border-top-left-radius: $radius; - border-bottom-left-radius: $radius; + border-top-left-radius: valid-radius($radius); + border-bottom-left-radius: valid-radius($radius); } } @mixin border-top-left-radius($radius) { @if $enable-rounded { - border-top-left-radius: $radius; + border-top-left-radius: valid-radius($radius); } } @mixin border-top-right-radius($radius) { @if $enable-rounded { - border-top-right-radius: $radius; + border-top-right-radius: valid-radius($radius); } } @mixin border-bottom-right-radius($radius) { @if $enable-rounded { - border-bottom-right-radius: $radius; + border-bottom-right-radius: valid-radius($radius); } } @mixin border-bottom-left-radius($radius) { @if $enable-rounded { - border-bottom-left-radius: $radius; + border-bottom-left-radius: valid-radius($radius); } } diff --git a/assets/css/bootstrap/mixins/_buttons.scss b/assets/css/bootstrap/mixins/_buttons.scss index c82c4d6..d6235aa 100644 --- a/assets/css/bootstrap/mixins/_buttons.scss +++ b/assets/css/bootstrap/mixins/_buttons.scss @@ -20,10 +20,10 @@ color: color-yiq($hover-background); @include gradient-bg($hover-background); border-color: $hover-border; - // Avoid using mixin so we can pass custom focus shadow properly @if $enable-shadows { - box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5); + @include box-shadow($btn-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5)); } @else { + // Avoid using mixin so we can pass custom focus shadow properly box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5); } } @@ -51,10 +51,10 @@ border-color: $active-border; &:focus { - // Avoid using mixin so we can pass custom focus shadow properly @if $enable-shadows and $btn-active-box-shadow != none { - box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5); + @include box-shadow($btn-active-box-shadow, 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5)); } @else { + // Avoid using mixin so we can pass custom focus shadow properly box-shadow: 0 0 0 $btn-focus-width rgba(mix(color-yiq($background), $border, 15%), .5); } } @@ -90,10 +90,10 @@ border-color: $active-border; &:focus { - // Avoid using mixin so we can pass custom focus shadow properly @if $enable-shadows and $btn-active-box-shadow != none { - box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($color, .5); + @include box-shadow($btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($color, .5)); } @else { + // Avoid using mixin so we can pass custom focus shadow properly box-shadow: 0 0 0 $btn-focus-width rgba($color, .5); } } diff --git a/assets/css/bootstrap/mixins/_forms.scss b/assets/css/bootstrap/mixins/_forms.scss index 418470d..57c2d79 100644 --- a/assets/css/bootstrap/mixins/_forms.scss +++ b/assets/css/bootstrap/mixins/_forms.scss @@ -16,10 +16,10 @@ background-color: $input-focus-bg; border-color: $input-focus-border-color; outline: 0; - // Avoid using mixin so we can pass custom focus shadow properly @if $enable-shadows { - box-shadow: $input-box-shadow, $input-focus-box-shadow; + @include box-shadow($input-box-shadow, $input-focus-box-shadow); } @else { + // Avoid using mixin so we can pass custom focus shadow properly box-shadow: $input-focus-box-shadow; } } diff --git a/assets/css/bootstrap/mixins/_grid-framework.scss b/assets/css/bootstrap/mixins/_grid-framework.scss index 8e291f7..191fb56 100644 --- a/assets/css/bootstrap/mixins/_grid-framework.scss +++ b/assets/css/bootstrap/mixins/_grid-framework.scss @@ -15,12 +15,15 @@ @each $breakpoint in map-keys($breakpoints) { $infix: breakpoint-infix($breakpoint, $breakpoints); - // Allow columns to stretch full width below their breakpoints - @for $i from 1 through $columns { - .col#{$infix}-#{$i} { - @extend %grid-column; + @if $columns > 0 { + // Allow columns to stretch full width below their breakpoints + @for $i from 1 through $columns { + .col#{$infix}-#{$i} { + @extend %grid-column; + } } } + .col#{$infix}, .col#{$infix}-auto { @extend %grid-column; @@ -31,12 +34,15 @@ .col#{$infix} { flex-basis: 0; flex-grow: 1; + min-width: 0; // See https://github.com/twbs/bootstrap/issues/25410 max-width: 100%; } - @for $i from 1 through $grid-row-columns { - .row-cols#{$infix}-#{$i} { - @include row-cols($i); + @if $grid-row-columns > 0 { + @for $i from 1 through $grid-row-columns { + .row-cols#{$infix}-#{$i} { + @include row-cols($i); + } } } @@ -44,9 +50,11 @@ @include make-col-auto(); } - @for $i from 1 through $columns { - .col#{$infix}-#{$i} { - @include make-col($i, $columns); + @if $columns > 0 { + @for $i from 1 through $columns { + .col#{$infix}-#{$i} { + @include make-col($i, $columns); + } } } @@ -58,11 +66,13 @@ .order#{$infix}-#{$i} { order: $i; } } - // `$columns - 1` because offsetting by the width of an entire row isn't possible - @for $i from 0 through ($columns - 1) { - @if not ($infix == "" and $i == 0) { // Avoid emitting useless .offset-0 - .offset#{$infix}-#{$i} { - @include make-col-offset($i, $columns); + @if $columns > 0 { + // `$columns - 1` because offsetting by the width of an entire row isn't possible + @for $i from 0 through ($columns - 1) { + @if not ($infix == "" and $i == 0) { // Avoid emitting useless .offset-0 + .offset#{$infix}-#{$i} { + @include make-col-offset($i, $columns); + } } } } diff --git a/assets/css/bootstrap/mixins/_transition.scss b/assets/css/bootstrap/mixins/_transition.scss index 8ce35a6..54553de 100644 --- a/assets/css/bootstrap/mixins/_transition.scss +++ b/assets/css/bootstrap/mixins/_transition.scss @@ -1,16 +1,26 @@ // stylelint-disable property-blacklist @mixin transition($transition...) { + @if length($transition) == 0 { + $transition: $transition-base; + } + + @if length($transition) > 1 { + @each $value in $transition { + @if $value == null or $value == none { + @warn "The keyword 'none' or 'null' must be used as a single argument."; + } + } + } + @if $enable-transitions { - @if length($transition) == 0 { - transition: $transition-base; - } @else { + @if nth($transition, 1) != null { transition: $transition; } - } - @if $enable-prefers-reduced-motion-media-query { - @media (prefers-reduced-motion: reduce) { - transition: none; + @if $enable-prefers-reduced-motion-media-query and nth($transition, 1) != null and nth($transition, 1) != none { + @media (prefers-reduced-motion: reduce) { + transition: none; + } } } } diff --git a/assets/css/bootstrap/utilities/_background.scss b/assets/css/bootstrap/utilities/_background.scss index a997b1b..3accbc4 100644 --- a/assets/css/bootstrap/utilities/_background.scss +++ b/assets/css/bootstrap/utilities/_background.scss @@ -6,7 +6,7 @@ @if $enable-gradients { @each $color, $value in $theme-colors { - @include bg-gradient-variant(".bg-gradient-#{$color}", $value); + @include bg-gradient-variant(".bg-gradient-#{$color}", $value, true); } } diff --git a/assets/css/bootstrap/utilities/_interactions.scss b/assets/css/bootstrap/utilities/_interactions.scss new file mode 100644 index 0000000..cc75fc2 --- /dev/null +++ b/assets/css/bootstrap/utilities/_interactions.scss @@ -0,0 +1,5 @@ +// stylelint-disable declaration-no-important + +@each $value in $user-selects { + .user-select-#{$value} { user-select: $value !important; } +} diff --git a/assets/css/bootstrap/utilities/_text.scss b/assets/css/bootstrap/utilities/_text.scss index 5d0f1c8..d2b2a22 100644 --- a/assets/css/bootstrap/utilities/_text.scss +++ b/assets/css/bootstrap/utilities/_text.scss @@ -63,8 +63,7 @@ .text-decoration-none { text-decoration: none !important; } .text-break { - word-break: break-word !important; // IE & < Edge 18 - overflow-wrap: break-word !important; + word-wrap: break-word !important; } // Reset |