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

Simplify site icon animation on hover. #38783

Merged
merged 2 commits into from
Feb 15, 2022
Merged

Simplify site icon animation on hover. #38783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93afa8a
Simplify site icon animation on hover.
jasmussen Feb 14, 2022
a2af352
Fix for site editor.
jasmussen Feb 14, 2022
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
13 changes: 9 additions & 4 deletions packages/edit-post/src/components/header/fullscreen-mode-close/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* External dependencies
*/
import { get } from 'lodash';
import classnames from 'classnames';

/**
* WordPress dependencies
Expand Down Expand Up @@ -59,9 +60,8 @@ function FullscreenModeClose( { showTooltip, icon, href } ) {

const effect = {
expand: {
scale: 1.7,
borderRadius: 0,
transition: { type: 'tween', duration: '0.2' },
scale: 1.25,
transition: { type: 'tween', duration: '0.3' },
},
};

Expand All @@ -85,10 +85,15 @@ function FullscreenModeClose( { showTooltip, icon, href } ) {
buttonIcon = <Icon size="36px" icon={ icon } />;
}

const classes = classnames( {
'edit-post-fullscreen-mode-close': true,
'has-icon': siteIconUrl,
} );

return (
<motion.div whileHover="expand">
<Button
className="edit-post-fullscreen-mode-close has-icon"
className={ classes }
href={
href ??
addQueryArgs( 'edit.php', {
Expand Down
6 changes: 5 additions & 1 deletion packages/edit-post/src/components/header/fullscreen-mode-close/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Developer notes: these rules are duplicated for the site editor.
// They need to be updated in both places.

.edit-post-fullscreen-mode-close.has-icon {
.edit-post-fullscreen-mode-close.components-button {
// Do not show the toolbar icon on small screens,
// when Fullscreen Mode is not an option in the "More" menu.
display: none;
Expand Down Expand Up @@ -46,6 +46,10 @@
box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-700;
}

&.has-icon:hover::before {
box-shadow: none;
}

// Lightened spot color focus.
&:focus::before {
box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) rgba($white, 0.1), inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
Expand Down
17 changes: 13 additions & 4 deletions packages/edit-site/src/components/navigation-sidebar/navigation-toggle/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* External dependencies
*/
import classnames from 'classnames';

/**
* WordPress dependencies
*/
Expand Down Expand Up @@ -58,9 +63,8 @@ function NavigationToggle( { icon } ) {

const effect = {
expand: {
scale: 1.7,
borderRadius: 0,
transition: { type: 'tween', duration: '0.2' },
scale: 1.25,
transition: { type: 'tween', duration: '0.3' },
},
};

Expand All @@ -79,6 +83,11 @@ function NavigationToggle( { icon } ) {
buttonIcon = <Icon size="36px" icon={ icon } />;
}

const classes = classnames( {
'edit-site-navigation-toggle__button': true,
'has-icon': siteIconUrl,
} );

return (
<motion.div
className={
Expand All @@ -88,7 +97,7 @@ function NavigationToggle( { icon } ) {
whileHover="expand"
>
<Button
className="edit-site-navigation-toggle__button has-icon"
className={ classes }
label={ __( 'Toggle navigation' ) }
ref={ navigationToggleRef }
// isPressed will add unwanted styles.
Expand Down
63 changes: 32 additions & 31 deletions packages/edit-site/src/components/navigation-sidebar/navigation-toggle/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
width: $header-height;
}

.edit-site-navigation-toggle__button {
.edit-site-navigation-toggle__button.components-button {
align-items: center;
background: $gray-900;
border-radius: 0;
Expand All @@ -21,42 +21,43 @@
width: $header-height;
z-index: 1;
margin-bottom: - $border-width;
min-width: $header-height;

&.has-icon {
min-width: $header-height;
&:hover,
&:active {
color: $white;
}

&:hover,
&:active {
color: $white;
}
&:focus {
box-shadow: none;
}

&:focus {
box-shadow: none;
}
&::before {
transition: box-shadow 0.1s ease;
@include reduce-motion("transition");
content: "";
display: block;
position: absolute;
top: 9px;
right: 9px;
bottom: 9px;
left: 9px;
border-radius: $radius-block-ui + $border-width + $border-width;
box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-900;
}

&::before {
transition: box-shadow 0.1s ease;
@include reduce-motion("transition");
content: "";
display: block;
position: absolute;
top: 9px;
right: 9px;
bottom: 9px;
left: 9px;
border-radius: $radius-block-ui + $border-width + $border-width;
box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-900;
}
// Hover color.
&:hover::before {
box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-700;
}

// Hover color.
&:hover::before {
box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) $gray-700;
}
&.has-icon:hover::before {
box-shadow: none;
}

// Lightened spot color focus.
&:focus::before {
box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) rgba($white, 0.1), inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
}
// Lightened spot color focus.
&:focus::before {
box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) rgba($white, 0.1), inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
}

.edit-site-navigation-toggle__site-icon {
Expand Down