diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d6f04fd6bc..c1c3b218e1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -7,6 +7,7 @@ Changelog * Added Aging Pages report (Tidjani Dia) * Add more SketchFab oEmbed patterns for models (Tom Usher) * Fix: Accessibility fixes for Windows high contrast mode; Dashboard icons colour and contrast (Sakshi Uppoor) + * Fix: Rename additional 'spin' CSS animations to avoid clashes with other libraries (Kevin GutiƩrrez) 2.15.1 (11.11.2021) diff --git a/client/scss/components/_loading-mask.scss b/client/scss/components/_loading-mask.scss index 5947df6f5f..92432b7c78 100644 --- a/client/scss/components/_loading-mask.scss +++ b/client/scss/components/_loading-mask.scss @@ -27,7 +27,7 @@ top: 50%; margin: -15px 0 0 -15px; font-family: wagtail; - animation: spin 0.5s infinite linear; + animation: spin-wag 0.5s infinite linear; content: map-get($icons, 'spinner'); z-index: 2; color: $color-teal; diff --git a/client/src/components/LoadingSpinner/LoadingSpinner.scss b/client/src/components/LoadingSpinner/LoadingSpinner.scss index 25ab74fb8c..0fc00d8430 100644 --- a/client/src/components/LoadingSpinner/LoadingSpinner.scss +++ b/client/src/components/LoadingSpinner/LoadingSpinner.scss @@ -3,5 +3,5 @@ display: inline-block; width: 1em; height: 1em; - animation: spin 0.5s infinite linear; + animation: spin-wag 0.5s infinite linear; } diff --git a/docs/releases/2.16.md b/docs/releases/2.16.md index f40ec09448..82eb0d29e9 100644 --- a/docs/releases/2.16.md +++ b/docs/releases/2.16.md @@ -18,6 +18,7 @@ ### Bug fixes * Accessibility fixes for Windows high contrast mode; Dashboard icons colour and contrast (Sakshi Uppoor) + * Rename additional 'spin' CSS animations to avoid clashes with other libraries (Kevin GutiƩrrez) ## Upgrade considerations diff --git a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html index f54227e6f3..ed0b7bfd7d 100644 --- a/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html +++ b/wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html @@ -788,12 +788,12 @@