aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2020-02-15 13:41:33 +0200
committerGitHub <[email protected]>2020-02-15 12:41:33 +0100
commit8d791f2800009737d822f3baa3bdc7b7162928f0 (patch)
tree2648c682a8838145640e9efcef424712ad7efe8b
parentdaf0c438f1f982d3e7fc9302f337e8eb21e6bb3d (diff)
downloadbootstrap-8d791f2800009737d822f3baa3bdc7b7162928f0.tar.xz
bootstrap-8d791f2800009737d822f3baa3bdc7b7162928f0.zip
Revert "Placeholder for transitions reset to prevent code duplication #29862"
This reverts commit cd7e5d111102e4422858aa6f255dc243b4cca1ca. Co-authored-by: Martijn Cuppens <[email protected]>
-rw-r--r--scss/_reboot.scss11
-rw-r--r--scss/_variables.scss8
-rw-r--r--scss/mixins/_transition.scss15
-rw-r--r--site/assets/scss/docs.scss9
-rw-r--r--site/content/docs/4.3/migration.md1
5 files changed, 2 insertions, 42 deletions
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index e05b541fd..e6be84e40 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -583,14 +583,3 @@ main {
[hidden] {
display: none !important;
}
-
-// Placeholder used to reset transitions, when user prefers reduced motion
-
-@if $enable-prefers-reduced-motion-media-query {
- @media (prefers-reduced-motion: reduce) {
- %no-transition {
- // stylelint-disable-next-line property-blacklist
- transition: none !important;
- }
- }
-}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 8c6232837..7ad08dc82 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -212,14 +212,6 @@ $escaped-characters: (
(")","%29"),
) !default;
-// Selectors which are isolated in the transition mixin to prevent invalid selector stack
-$pseudo-vendor-prefixes: (
- "::-webkit-",
- "::-moz-",
- "::-ms-"
-) !default;
-
-
// Options
//
// Quickly modify global styling by enabling or disabling optional features.
diff --git a/scss/mixins/_transition.scss b/scss/mixins/_transition.scss
index 43843e3f2..8ce35a6b8 100644
--- a/scss/mixins/_transition.scss
+++ b/scss/mixins/_transition.scss
@@ -9,19 +9,8 @@
}
@if $enable-prefers-reduced-motion-media-query {
- $isolate: false;
- @each $selector in $pseudo-vendor-prefixes {
- @if str-index(quote(#{&}), $selector) {
- $isolate: true;
- }
- }
-
- @if $isolate {
- @media (prefers-reduced-motion: reduce) {
- transition: none;
- }
- } @else {
- @extend %no-transition;
+ @media (prefers-reduced-motion: reduce) {
+ transition: none;
}
}
}
diff --git a/site/assets/scss/docs.scss b/site/assets/scss/docs.scss
index 67e8413bd..53622b9c2 100644
--- a/site/assets/scss/docs.scss
+++ b/site/assets/scss/docs.scss
@@ -51,12 +51,3 @@
@import "syntax";
@import "anchor";
@import "algolia";
-
-@if $enable-prefers-reduced-motion-media-query {
- @media (prefers-reduced-motion: reduce) {
- %no-transition {
- // stylelint-disable-next-line property-blacklist, declaration-no-important
- transition: none !important;
- }
- }
-}
diff --git a/site/content/docs/4.3/migration.md b/site/content/docs/4.3/migration.md
index 6517b664d..4a5d43ede 100644
--- a/site/content/docs/4.3/migration.md
+++ b/site/content/docs/4.3/migration.md
@@ -41,7 +41,6 @@ Changes to our source Sass files and compiled CSS.
- 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-yiq()`. By default, these parameters will find which color provides more contrast against the button state's background color with `color-yiq()`.
- 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-yiq()`.
-- The `transition()` mixin now extends `%no-transition` placeholder to handle `prefers-reduced-motion` media query-except vendor prefixes listed in new `$pseudo-vendor-prefixes` variable. [See #29870](https://github.com/twbs/bootstrap/pull/29870/)
## JavaScript