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

Jump to bottom

Sakura Color Scheme: Update to match wp-admin #92414

Closed
wants to merge 9 commits into from
Closed

Sakura Color Scheme: Update to match wp-admin #92414

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1952afd
add specifity to sidebar styles
chad1008 Jul 3, 2024
f4a70ab
fix expandable and selected background color
chad1008 Jul 4, 2024
d35b588
add variable to target the "collapse menu" link
chad1008 Jul 4, 2024
c28810d
add var for submenu selected hover color
chad1008 Jul 4, 2024
678438f
add navredesign submenu selected hover variable
chad1008 Jul 4, 2024
cf545a2
fix "collapse menu", nav redesign and regular sidebar submenu selecte…
chad1008 Jul 4, 2024
5cec36f
fix submenu text color
chad1008 Jul 4, 2024
5b21468
edit code comment
chad1008 Jul 9, 2024
934c1df
remove empty line
chad1008 Jul 9, 2024
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
28 changes: 22 additions & 6 deletions client/my-sites/sidebar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,19 @@ $font-size: rem(14px);

&:hover,
&:focus {
background-color: var(--color-sidebar-menu-hover-background);
color: var(--color-sidebar-menu-hover-text);
background-color: var(--color-sidebar-submenu-hover-background);
color: var(--color-sidebar-submenu-hover-text);
}
}

.selected .sidebar__menu-link {
background-color: var(--color-sidebar-menu-selected-background);
color: var(--color-sidebar-menu-selected-text);
background-color: var(--color-sidebar-submenu-selected-background);
color: var(--color-sidebar-submenu-selected-text);
font-weight: 600;

&:hover {
color: var(--color-sidebar-submenu-selected-hover-text);
}
}

.sidebar__menu-link-text {
Expand Down Expand Up @@ -314,7 +318,8 @@ $font-size: rem(14px);
// Is toggled open
.sidebar__menu.sidebar__menu--selected {
.sidebar__heading {
background: var(--color-sidebar-menu-hover-background);
background: var(--color-sidebar-menu-selected-background);
color: var(--color-sidebar-menu-selected-text);

&::after {
display: block;
Expand Down Expand Up @@ -633,6 +638,11 @@ $font-size: rem(14px);
background-color: revert;
color: var(--color-navredesign-sidebar-submenu-selected-text);
font-weight: 600;

&:hover,
&:focus {
color: var(--color-navredesign-sidebar-submenu-selected-hover-text);
}
}
.sidebar__menu-link {
color: var(--color-navredesign-sidebar-submenu-text);
Expand Down Expand Up @@ -866,12 +876,18 @@ $font-size: rem(14px);
.collapse-sidebar__toggle {
.sidebar__menu-link {
cursor: pointer;
color: var(--color-sidebar-text-alternative);
color: var(--color-collapse-menu-text);
font-size: rem(13px);

&:hover,
&:focus {
color: var(--color-sidebar-submenu-hover-text);
background-color: transparent;
box-shadow: none;

.sidebar__menu-icon {
color: var(--color-sidebar-submenu-hover-text);
}
}
}

Expand Down
14 changes: 12 additions & 2 deletions packages/calypso-color-schemes/src/shared/color-schemes/_sakura.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,21 @@
--color-sidebar-menu-hover-background-rgb: var(--studio-pink-10-rgb);
--color-sidebar-menu-hover-text: var(--studio-pink-90);


/* Sidebar Submenu - Nav Unification */
--color-sidebar-submenu-background: var(--studio-pink-90);
--color-sidebar-submenu-text: var(--studio-pink-0);
--color-sidebar-submenu-text: #f5e9ed; /* Direct from wp-admin */
--color-sidebar-submenu-hover-text: var(--studio-blue-20);
--color-sidebar-submenu-selected-text: var(--studio-pink-0);
--color-sidebar-submenu-selected-text: var(--color-sidebar-submenu-text);
--color-sidebar-submenu-selected-hover-text: var(--color-sidebar-submenu-text);

/* Sidebar Submenu - Nav Redesign */
--color-navredesign-sidebar-submenu-text: var(--color-sidebar-submenu-text);
--color-navredesign-sidebar-submenu-selected-text: var(--color-sidebar-submenu-text);
--color-navredesign-sidebar-submenu-selected-hover-text: var(--color-sidebar-submenu-text);

/* Collapse Menu Button Fix */
--color-collapse-menu-text: #8c1749; /* Direct from wp-admin */

/* Command Palette Items */
--wp-admin-theme-color: var(--studio-blue-50);
Expand Down
Loading