Update hero with flag animation (fixes #15515 and #15597) #15525
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
|
|
||
| .m24-c-flag { | ||
| @include container; | ||
| padding-top: $spacer-xl; | ||
| padding-bottom: $spacer-xl; | ||
| } | ||
|
|
||
|
|
@@ -20,17 +20,81 @@ | |
|
|
||
| .m24-c-flag-subtitle { | ||
| font-size: $text-title-md; | ||
stephaniehobson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| margin-bottom: $spacer-xl; | ||
| } | ||
|
|
||
| .m24-c-flag-cta { | ||
| margin-bottom: 0; | ||
|
There was a problem hiding this comment. removes default p spacing |
||
| } | ||
|
|
||
| .m24-c-flag-media { | ||
| --delay: 1s; // leave some space to read before introducing movement | ||
| --wave-h: 8px; | ||
|
|
||
| svg { | ||
| transform: translateZ(0); | ||
| width: 100px; | ||
| height: auto; | ||
| fill: $m24-color-green; // zilla green | ||
| } | ||
| } | ||
|
|
||
| .m24-c-flag-button { | ||
| $font-size: 0.75; | ||
| all: unset; | ||
|
There was a problem hiding this comment. This removed the focus ring. Can you add it back please? Ideally with the native focus ring . But if that is finiky any kind of outline would be a good addition. |
||
| background-color: $m24-color-dark-mid-gray; | ||
| color: $m24-color-white; | ||
| font-family: $primary-font; | ||
| font-size: calc(#{$font-size} * 1rem); | ||
| font-weight: 600; | ||
| line-height: $font-size; | ||
| padding: 8px; | ||
| cursor: pointer; | ||
| transition: background-color $fast; | ||
|
|
||
| &:hover, | ||
| &:focus { | ||
| background-color: $m24-color-black; // inverts to white in dark theme section | ||
| } | ||
|
|
||
| &:active { | ||
| background-color: $m24-color-dark-mid-gray; | ||
| } | ||
| } | ||
|
|
||
| .m24-c-flag-button-pause, | ||
| .m24-c-flag-button-play { | ||
| align-items: center; | ||
| display: flex; | ||
| gap: 8px; | ||
| } | ||
|
|
||
| .m24-c-flag-button-pause { | ||
| .m24-c-flag-button-text { | ||
| position: relative; | ||
| top: 0.0175rem; // flex alignment isn't totally centered, so we're manually adjusting | ||
| } | ||
| } | ||
|
|
||
| @media screen and (width < #{$screen-lg}) { | ||
| .m24-c-flag-cta { | ||
| margin-bottom: $spacer-xl; | ||
| } | ||
|
|
||
| .m24-c-flag-button { | ||
| border-radius: 50%; | ||
| display: block; | ||
| margin-bottom: $spacer-md; | ||
| margin-inline-start: auto; | ||
|
There was a problem hiding this comment. logical properties have pretty good support now, so I decided to use them as enhancement here instead of bidi mixin |
||
| } | ||
|
|
||
| .m24-c-flag-button-text { | ||
| @include visually-hidden; | ||
| } | ||
|
|
||
| .m24-c-flag-media { | ||
| width: fit-content; | ||
| margin-inline-start: auto; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -44,29 +108,36 @@ | |
| @media #{$mq-lg} { | ||
| .m24-c-flag { | ||
| @include grid; | ||
| grid-template-rows: [button-row-start] auto [button-row-end] auto; | ||
| padding-bottom: $spacer-2xl; | ||
| } | ||
|
|
||
| .m24-c-flag-button { | ||
| grid-column: 1 / -1; | ||
| grid-row: button-row; | ||
| justify-self: end; | ||
| } | ||
|
|
||
| .m24-c-flag-subtitle { | ||
| font-size: 24px; | ||
| } | ||
|
|
||
| .m24-c-flag-media { | ||
| grid-column: 10/12; | ||
| grid-row-start: button-row-end; | ||
| display: flex; | ||
| place-content: center center; | ||
| margin-bottom: 0; | ||
|
|
||
| svg { | ||
| width: 100%; | ||
| max-width: 216px; | ||
| } | ||
| } | ||
|
|
||
| .m24-c-flag-text { | ||
| grid-column: 2/9; | ||
| grid-row-start: button-row-end; | ||
| } | ||
|
|
||
| .m24-c-flag-cta { | ||
|
|
@@ -86,3 +157,143 @@ | |
| .m24-c-products { | ||
| background-color: $m24-color-white; | ||
| } | ||
|
|
||
| // static fallback | ||
| .m24-c-flag-media-static { | ||
| display: none; | ||
| } | ||
|
|
||
| // When no JS or M24_HERO_ANIMATION switch is off | ||
| // - hide animation SVG and button | ||
| // - show static SVG | ||
| .no-js, | ||
| [data-m24-hero-animation="false"] { | ||
| .m24-c-flag-button { | ||
| visibility: hidden; // reserve space | ||
| } | ||
|
|
||
| .m24-c-flag-media-animation { | ||
| display: none; | ||
| } | ||
|
|
||
| .m24-c-flag-media-static { | ||
| display: block; | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| Note from Inclusive Components, "Changing labels": https://inclusive-components.design/toggle-button/ | ||
| As a rule of thumb, you should never change pressed state and label together. | ||
| If the label changes, the button has already changed state in a sense, | ||
| just not via explicit WAI-ARIA state management. | ||
| */ | ||
| [data-animation-running="false"] { | ||
| .m24-c-flag-button-pause { | ||
| display: none; | ||
| } | ||
|
|
||
| .flag-one, | ||
| .flag-two, | ||
| .flag-three, | ||
| .flag-four, | ||
| .flag-five { | ||
| animation-play-state: paused; | ||
| } | ||
| } | ||
|
|
||
| [data-animation-running="true"] { | ||
| .m24-c-flag-button-play { | ||
| display: none; | ||
| } | ||
|
|
||
| .flag-one, | ||
| .flag-two, | ||
| .flag-three, | ||
| .flag-four, | ||
| .flag-five { | ||
| animation-play-state: running; | ||
| } | ||
| } | ||
|
|
||
| /* Common Element Styles */ | ||
| .flag, | ||
| .flag-one, | ||
| .flag-two, | ||
| .flag-three, | ||
| .flag-four, | ||
| .flag-five, | ||
| .pole, | ||
| .head, | ||
| .pole-one, | ||
| .pole-two, | ||
| .eye, | ||
| .mouth { | ||
| shape-rendering: crispEdges; | ||
| -webkit-font-smoothing: none; | ||
| -moz-osx-font-smoothing: none; | ||
| } | ||
|
|
||
| /* Wave Animations Base */ | ||
| .flag-one, | ||
| .flag-two, | ||
| .flag-three, | ||
| .flag-four, | ||
| .flag-five { | ||
| animation: 1s var(--delay) $bezier infinite; | ||
| will-change: transform; | ||
| filter: url("#dilate"); | ||
| } | ||
|
|
||
| /* Flag Animation Names */ | ||
| .flag-one { animation-name: flag-one; } | ||
| .flag-two { animation-name: flag-two; } | ||
| .flag-three { animation-name: flag-three; } | ||
| .flag-four { animation-name: flag-four; } | ||
| .flag-five { animation-name: flag-five; } | ||
|
|
||
|
|
||
| /* Flag Movement Keyframes */ | ||
| @keyframes flag-one { | ||
| 0%, 15% { | ||
| transform: translate3d(0, 0, 0); | ||
| animation-timing-function: ease-in; | ||
| } | ||
| 16%, 40% { transform: translate3d(0, var(--wave-h), 0); } | ||
| 41%, 65% { transform: translate3d(0, 0, 0); } | ||
| 66%, 91% { transform: translate3d(0, calc(-1 * var(--wave-h)), 0); } | ||
| 92%, 100% { transform: translate3d(0, 0, 0); } | ||
| } | ||
|
|
||
| @keyframes flag-two { | ||
| 0%, 24% { transform: translate3d(0, 0, 0); } | ||
| 25%, 49% { transform: translate3d(0, var(--wave-h), 0); } | ||
| 50%, 74% { transform: translate3d(0, 0, 0); } | ||
| 75%, 99% { transform: translate3d(0, calc(-1 * var(--wave-h)), 0); } | ||
| 100% { transform: translate3d(0, 0, 0); } | ||
| } | ||
|
|
||
| @keyframes flag-three { | ||
| 0%, 7% { transform: translate3d(0, calc(-1 * var(--wave-h)), 0); } | ||
| 8%, 32% { transform: translate3d(0, 0, 0); } | ||
| 33%, 57% { transform: translate3d(0, var(--wave-h), 0); } | ||
| 58%, 82% { transform: translate3d(0, 0, 0); } | ||
| 83%, 100% { transform: translate3d(0, calc(-1 * var(--wave-h)), 0); } | ||
| } | ||
|
|
||
| @keyframes flag-four { | ||
| 0%, 15% { transform: translate3d(0, calc(-1 * var(--wave-h)), 0); } | ||
| 16%, 49% { transform: translate3d(0, 0, 0); } | ||
| 50%, 65% { transform: translate3d(0, var(--wave-h), 0); } | ||
| 66%, 100% { transform: translate3d(0, 0, 0); } | ||
| } | ||
|
|
||
| @keyframes flag-five { | ||
| 0%, 24% { transform: translate3d(0, calc(-1 * var(--wave-h)), 0); } | ||
| 25%, 49% { transform: translate3d(0, 0, 0); } | ||
| 50%, 74% { transform: translate3d(0, var(--wave-h), 0); } | ||
|
|
||
| 75%, 100% { | ||
| transform: translate3d(0, 0, 0); | ||
| animation-timing-function: ease-out; | ||
| } | ||
| } | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
| */ | ||
|
|
||
| const ANIMATION_RUNNING = 'data-animation-running'; | ||
|
|
||
| function togglePlayState(e) { | ||
| const animationContainer = e.target.closest(`[${ANIMATION_RUNNING}]`); | ||
| if (animationContainer.getAttribute(ANIMATION_RUNNING) === 'true') { | ||
| animationContainer.setAttribute(ANIMATION_RUNNING, 'false'); | ||
| } else { | ||
| animationContainer.setAttribute(ANIMATION_RUNNING, 'true'); | ||
| } | ||
| } | ||
|
|
||
| function init() { | ||
| // play animations if motion is allowed | ||
| if (window.Mozilla.Utils.allowsMotion()) { | ||
| const animationContainers = document.querySelectorAll( | ||
| `[${ANIMATION_RUNNING}]` | ||
| ); | ||
| animationContainers.forEach((container) => | ||
| container.setAttribute(ANIMATION_RUNNING, 'true') | ||
| ); | ||
| } | ||
|
|
||
| // play or pause animations on button click | ||
| const playStateButtons = document.querySelectorAll('.js-animation-button'); | ||
| playStateButtons.forEach((button) => | ||
| button.addEventListener('click', (e) => togglePlayState(e)) | ||
| ); | ||
| } | ||
|
|
||
| init(); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
went for assertive here as the text change might be confusing if not announced immediately after button click