diff options
| -rw-r--r-- | scss/_buttons.scss | 2 | ||||
| -rw-r--r-- | scss/_progress.scss | 2 | ||||
| -rw-r--r-- | scss/_reboot.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 26 | ||||
| -rw-r--r-- | scss/mixins/_transition.scss | 2 | ||||
| -rw-r--r-- | site/content/docs/4.3/migration.md | 1 |
6 files changed, 18 insertions, 17 deletions
diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 7381de5332..db9d172e8e 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -12,7 +12,7 @@ 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); + cursor: if($enable-button-pointers, pointer, null); user-select: none; background-color: transparent; border: $btn-border-width solid transparent; diff --git a/scss/_progress.scss b/scss/_progress.scss index 1dbaa67c0c..a3fbecf2b5 100644 --- a/scss/_progress.scss +++ b/scss/_progress.scss @@ -36,7 +36,7 @@ .progress-bar-animated { animation: progress-bar-stripes $progress-bar-animation-timing; - @if $enable-prefers-reduced-motion-media-query { + @if $enable-reduced-motion { @media (prefers-reduced-motion: reduce) { animation: none; } diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 4c5dfcba41..73b974b570 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -463,7 +463,7 @@ button, [type="submit"] { -webkit-appearance: button; // 2 - @if $enable-pointer-cursor-for-buttons { + @if $enable-button-pointers { &:not(:disabled) { cursor: pointer; // 3 } diff --git a/scss/_variables.scss b/scss/_variables.scss index e95343496a..a3d1df747b 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -204,19 +204,19 @@ $escaped-characters: ( // // Quickly modify global styling by enabling or disabling optional features. -$enable-caret: true !default; -$enable-rounded: true !default; -$enable-shadows: false !default; -$enable-gradients: false !default; -$enable-transitions: true !default; -$enable-prefers-reduced-motion-media-query: true !default; -$enable-grid-classes: true !default; -$enable-pointer-cursor-for-buttons: true !default; -$enable-rfs: true !default; -$enable-validation-icons: true !default; -$enable-negative-margins: false !default; -$enable-deprecation-messages: true !default; -$enable-important-utilities: true !default; +$enable-caret: true !default; +$enable-rounded: true !default; +$enable-shadows: false !default; +$enable-gradients: false !default; +$enable-transitions: true !default; +$enable-reduced-motion: true !default; +$enable-grid-classes: true !default; +$enable-button-pointers: true !default; +$enable-rfs: true !default; +$enable-validation-icons: true !default; +$enable-negative-margins: false !default; +$enable-deprecation-messages: true !default; +$enable-important-utilities: true !default; // Spacing diff --git a/scss/mixins/_transition.scss b/scss/mixins/_transition.scss index 54553deb9c..bf4c00a64b 100644 --- a/scss/mixins/_transition.scss +++ b/scss/mixins/_transition.scss @@ -17,7 +17,7 @@ transition: $transition; } - @if $enable-prefers-reduced-motion-media-query and nth($transition, 1) != null and nth($transition, 1) != none { + @if $enable-reduced-motion and nth($transition, 1) != null and nth($transition, 1) != none { @media (prefers-reduced-motion: reduce) { transition: none; } diff --git a/site/content/docs/4.3/migration.md b/site/content/docs/4.3/migration.md index 3806b6049a..eef9193ac5 100644 --- a/site/content/docs/4.3/migration.md +++ b/site/content/docs/4.3/migration.md @@ -38,6 +38,7 @@ Changes to our source Sass files and compiled CSS. - Dropped `color()`, `theme-color()` & `gray()` functions in favor of variables. [See #29083](https://github.com/twbs/bootstrap/pull/29083) - The `theme-color-level()` function is renamed to `color-level()` and now accepts any color you want instead of only `$theme-color` colors. [See #29083](https://github.com/twbs/bootstrap/pull/29083) - `$enable-grid-classes` doesn't disable the generation of container classes anymore [See #29146](https://github.com/twbs/bootstrap/pull/29146) +- Renamed `$enable-prefers-reduced-motion-media-query` and `$enable-pointer-cursor-for-buttons` to `$enable-reduced-motion` and `$enable-button-pointers` for brevity. - Line heights are dropped from several components to simplify our codebase. The `button-size()` and `pagination-size()` do not accept line height parameters anymore. [See #29271](https://github.com/twbs/bootstrap/pull/29271) - The `button-variant()` mixin now accepts 3 optional color parameters, for each button state, to override the color provided by `color-contrast()`. By default, these parameters will find which color provides more contrast against the button state's background color with `color-contrast()`. - The `button-outline-variant()` mixin now accepts an additional argument, `$active-color`, for setting the button's active state text color. By default, this parameter will find which color provides more contrast against the button's active background color with `color-contrast()`. |