Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code Quality: Improve prefix, better scope, for animations #11752

Merged
merged 5 commits into from
Nov 14, 2018
Merged

Code Quality: Improve prefix, better scope, for animations #11752

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b87c5e9
Code Quality: Improve prefix, better scope, for animations
Nov 12, 2018
f17a91a
Address feedback.
Nov 12, 2018
8f232ce
Address comment.
Nov 13, 2018
097e10f
Address feedback.
Nov 14, 2018
dfa040c
Address final point.
Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 6 additions & 71 deletions assets/stylesheets/_animations.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,13 @@
@keyframes fade-in {
from {
opacity: 0;
}
to {
opacity: 1;
}
@mixin editor-animation__loading-fade {
animation: editor-animation__loading-fade 1.6s ease-in-out infinite;
}

@mixin animate_fade {
animation: animate_fade 0.1s ease-out;
@mixin editor-animation__fade-in($speed: 0.2s, $delay: 0s) {
animation: editor-animation__fade-in $speed ease-out $delay;
animation-fill-mode: forwards;
}

@mixin move_background {
background-size: 28px 28px;
animation: move_background 0.5s linear infinite;
}

@mixin loading_fade {
animation: loading_fade 1.6s ease-in-out infinite;
}

@mixin slide_in_right {
transform: translateX(+100%);
animation: slide_in_right 0.1s forwards;
}

@mixin slide_in_top {
transform: translateY(-100%);
animation: slide_in_top 0.1s forwards;
}

@mixin fade_in($speed: 0.2s, $delay: 0s) {
animation: fade-in $speed ease-out $delay;
animation-fill-mode: forwards;
}

@keyframes editor_region_focus {
from {
box-shadow: inset 0 0 0 0 $blue-medium-400;
}
to {
box-shadow: inset 0 0 0 4px $blue-medium-400;
}
}

@mixin region_focus($speed: 0.2s) {
animation: editor_region_focus $speed ease-out;
animation-fill-mode: forwards;
}

@keyframes rotation {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

@mixin animate_rotation($speed: 1s) {
animation: rotation $speed infinite linear;
}

@keyframes modal-appear {
from {
margin-top: $grid-size * 4;
}
to {
margin-top: 0;
}
}

@mixin modal_appear() {
animation: modal-appear 0.1s ease-out;
@mixin editor-animation__modal-appear() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This mixin doesn't seem useful as use only once, we can move it and rename it as well?

animation: editor-animation__modal-appear 0.1s ease-out;
animation-fill-mode: forwards;
}
2 changes: 1 addition & 1 deletion packages/block-library/src/file/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
margin-bottom: 0;

&.is-transient {
@include loading_fade;
@include editor-animation__loading-fade;
}

.wp-block-file__content-wrapper {
Expand Down
13 changes: 12 additions & 1 deletion packages/block-library/src/gallery/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ul.wp-block-gallery li {
}

&.is-transient img {
@include loading_fade;
@include editor-animation__loading-fade;
}

.editor-rich-text {
Expand Down Expand Up @@ -121,3 +121,14 @@ ul.wp-block-gallery li {
left: 50%;
transform: translate(-50%, -50%);
}

// Last item always needs margins reset.
// When block is selected, only reset the right margin of the 2nd to last item.
.wp-block-gallery {
.is-selected & .blocks-gallery-image:nth-last-child(2),
.is-selected & .blocks-gallery-item:nth-last-child(2),
.is-typing & .blocks-gallery-image:nth-last-child(2),
.is-typing & .blocks-gallery-item:nth-last-child(2) {
margin-right: 0;
}
}
7 changes: 1 addition & 6 deletions packages/block-library/src/gallery/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,8 @@
}

// Last item always needs margins reset.
// When block is selected, only reset the right margin of the 2nd to last item.
.blocks-gallery-image:last-child,
.blocks-gallery-item:last-child,
.is-selected & .blocks-gallery-image:nth-last-child(2),
.is-selected & .blocks-gallery-item:nth-last-child(2),
.is-typing & .blocks-gallery-image:nth-last-child(2),
.is-typing & .blocks-gallery-item:nth-last-child(2) {
.blocks-gallery-item:last-child {
margin-right: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/image/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
position: relative;

&.is-transient img {
@include loading_fade;
@include editor-animation__loading-fade;
}

figcaption img {
Expand Down
12 changes: 11 additions & 1 deletion packages/components/src/higher-order/navigate-regions/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
right: 0;
pointer-events: none;
outline: 4px solid transparent; // Shown in Windows High Contrast mode.
@include region_focus(0.1s);
animation: editor-animation__region-focus 0.2s ease-out;
animation-fill-mode: forwards;
}
}

@keyframes editor-animation__region-focus {
from {
box-shadow: inset 0 0 0 0 $blue-medium-400;
}
to {
box-shadow: inset 0 0 0 4px $blue-medium-400;
}
}
4 changes: 2 additions & 2 deletions packages/components/src/modal/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
z-index: z-index(".components-modal__screen-overlay");

// This animates the appearance of the white background.
@include fade-in();
@include editor-animation__fade-in();
}

// The modal window element.
Expand Down Expand Up @@ -40,7 +40,7 @@
transform: translate(-50%, -50%);

// Animate the modal frame/contents appearing on the page.
@include modal_appear();
@include editor_animation__modal-appear();
}
}

Expand Down
11 changes: 10 additions & 1 deletion packages/components/src/spinner/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@
height: 4px;
border-radius: 100%;
transform-origin: 6px 6px;
@include animate_rotation;
animation: editor-animation__rotation 1s infinite linear;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we give it a name using our guidelines: components-spinner__animation ?

}
}

@keyframes editor-animation__rotation {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
11 changes: 9 additions & 2 deletions packages/edit-post/src/components/fullscreen-mode/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,16 @@ body.is-fullscreen-mode {
}

// Animations
@include fade_in(0.3s);
@include editor-animation__fade-in(0.3s);

.edit-post-header {
@include slide_in_top();
transform: translateY(-100%);
animation: editor-animation__slide-in-top 0.1s forwards;
}
}

@keyframes editor-animation__slide-in-top {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could this be edit-post-fullscreen-mode__slide-in-animation?

100% {
transform: translateY(0%);
}
}
9 changes: 8 additions & 1 deletion packages/edit-post/src/components/layout/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,21 @@
left: auto;
width: $sidebar-width;
border-left: $border-width solid $light-gray-500;
@include slide_in_right;
transform: translateX(+100%);
animation: editor-animation__slide-in-right 0.1s forwards;

body.is-fullscreen-mode & {
top: 0;
}
}
}

@keyframes editor-animation__slide-in-right {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be edit-post-layout__slide-in-animation

100% {
transform: translateX(0%);
}
}

.edit-post-layout .editor-post-publish-panel__header-publish-button {
// Match the size of the Publish... button.
.components-button.is-large {
Expand Down
45 changes: 19 additions & 26 deletions packages/edit-post/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,15 @@
@import "./components/visual-editor/style.scss";
@import "./components/options-modal/style.scss";

// Fade animations
@keyframes animate_fade {
from {
opacity: 0;
transform: translateY(4px);
}
to {
opacity: 1;
transform: translateY(0);
}
}

@keyframes move_background {
from {
background-position: 0 0;
}
to {
background-position: 28px 0;
}
}
/**
* Animations
*/

@keyframes loading_fade {
// These keyframes should not be part of the _animations.scss mixins file.
// Because keyframe animations can't be defined as mixins properly, they are duplicated.
// Since hey are intended only for the editor, we add them here instead.
@keyframes editor-animation__loading-fade {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe more edit-post__loading-fade-animation

0% {
opacity: 0.5;
}
Expand All @@ -53,15 +40,21 @@
}
}

@keyframes slide_in_right {
100% {
transform: translateX(0%);
@keyframes editor-animation__fade-in {
from {
opacity: 0;
}
to {
opacity: 1;
}
}

@keyframes slide_in_top {
100% {
transform: translateY(0%);
@keyframes editor-animation__modal-appear {
from {
margin-top: $grid-size * 4;
}
to {
margin-top: 0;
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/components/block-list/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@
// Animate in
.editor-block-list__block:hover & {
opacity: 0;
@include fade_in(60ms, 0.5s);
@include editor-animation__fade-in(60ms, 0.5s);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/components/block-mover/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
opacity: 0;

&.is-visible {
@include fade_in;
@include editor-animation__fade-in;
}

// 24px is the smallest size of a good pressable button.
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/components/post-saved-state/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
overflow: hidden;

&.is-saving {
animation: loading_fade 0.5s infinite;
animation: editor-animation__loading-fade 0.5s infinite;
}

.dashicon {
Expand Down
4 changes: 2 additions & 2 deletions packages/editor/src/editor-styles/transforms/test/__snapshots__/wrap.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ src: url(sansation_light.woff);
`;

exports[`CSS selector wrap should ignore keyframes 1`] = `
"@keyframes move_background {
"@keyframes editor-animation__fade-in {
from {
background-position: 0 0;
opacity: 0;
}
}"
`;
Expand Down
4 changes: 2 additions & 2 deletions packages/editor/src/editor-styles/transforms/test/wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ describe( 'CSS selector wrap', () => {
it( 'should ignore keyframes', () => {
const callback = wrap( '.my-namespace' );
const input = `
@keyframes move_background {
@keyframes editor-animation__fade-in {
from {
background-position: 0 0;
opacity: 0;
}
}`;
const output = traverse( input, callback );
Expand Down