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

Nav unification: consolidate color-sidebar-menu-hover-heading-background with non-"heading" version #47300

Merged
merged 3 commits into from
Nov 11, 2020
Merged

Nav unification: consolidate color-sidebar-menu-hover-heading-background with non-"heading" version #47300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72690e5
Consolidate color-sidebar-menu-hover-heading-background with non-"hea…
mreishus Nov 10, 2020
0bc7645
Merge branch 'master' into fix/consolidate-nav-unification-vars-2
mreishus Nov 11, 2020
60fbc94
--color-sidebar-menu-hover-background-rgb computed via rgb function
mreishus Nov 11, 2020
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
15 changes: 7 additions & 8 deletions client/my-sites/sidebar-unified/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@

--color-sidebar-background: #23282d;
--color-sidebar-background-rgb: 35, 40, 45;
--color-sidebar-menu-hover-background: #32373c;
--color-sidebar-menu-hover-background-rgb: rgb( #32373c );
--color-sidebar-menu-hover-heading-background: #1a1e23;
--color-sidebar-menu-hover-background: #1a1e23;
--color-sidebar-menu-hover-background-rgb: rgb( var( --color-sidebar-menu-hover-background ) );
--color-sidebar-menu-hover-text: #00b9eb;
--color-sidebar-menu-selected-background: #0073aa;
--color-sidebar-border: #333333;
Expand Down Expand Up @@ -79,7 +78,7 @@ $font-size: rem( 14px );

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

Expand Down Expand Up @@ -203,7 +202,7 @@ $font-size: rem( 14px );
// Is toggled open
.sidebar__menu.is-toggle-open {
.sidebar__heading {
background: var( --color-sidebar-menu-hover-heading-background );
background: var( --color-sidebar-menu-hover-background );

&:hover {
.sidebar__menu-icon {
Expand Down Expand Up @@ -279,7 +278,7 @@ $font-size: rem( 14px );

//client/components/site-selector/style.scss
.site-selector .site.is-highlighted {
background-color: var ( --color-sidebar-menu-hover-background );
background-color: var ( --color-sidebar-submenu-background );
}

.site-selector .site.is-highlighted .site__domain,
Expand Down Expand Up @@ -313,7 +312,7 @@ $font-size: rem( 14px );

// client/my-sites/current-site/style.scss
.current-site__switch-sites:hover .button.is-borderless:hover {
background-color: var( --color-sidebar-menu-hover-heading-background );
background-color: var( --color-sidebar-menu-hover-background );
}

.current-site__switch-sites .button.is-borderless {
Expand Down Expand Up @@ -494,7 +493,7 @@ $font-size: rem( 14px );
position: relative;

.sidebar__heading {
background-color: var( --color-sidebar-menu-hover-heading-background );
background-color: var( --color-sidebar-menu-hover-background );
color: var( --color-sidebar-menu-hover-text );
}

Expand Down
2 changes: 0 additions & 2 deletions packages/calypso-color-schemes/src/shared/color-schemes/_blue.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ Used studio-blue for the primary+accent.
--color-sidebar-menu-hover-text: var( --theme-text-color );

/* Sidebar Hover - Nav unification */
--color-sidebar-menu-hover-background: var( --theme-highlight-color );
--color-sidebar-menu-hover-heading-background: var( --theme-highlight-color );

/* Sidebar Submenu - Nav Unification */
--color-sidebar-submenu-background: var( --theme-submenu-background-color );
Expand Down
2 changes: 0 additions & 2 deletions packages/calypso-color-schemes/src/shared/color-schemes/_coffee.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,7 @@ The wp-admin highlight color hue is 27, while studio-orange ranges from 25 to 35
--color-sidebar-menu-hover-text: var( --theme-text-color );

/* Sidebar Hover - Nav unification */
--color-sidebar-menu-hover-background: var( --theme-highlight-color );
--color-sidebar-menu-hover: var( --theme-text-color );
--color-sidebar-menu-hover-heading-background: var( --theme-highlight-color );

/* Sidebar Submenu - Nav Unification */
--color-sidebar-submenu-background: var( --theme-submenu-background-color );
Expand Down
2 changes: 0 additions & 2 deletions packages/calypso-color-schemes/src/shared/color-schemes/_ectoplasm.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ Created this definition in color-studio to generate 0-100 shades:
--color-sidebar-menu-hover-text: var( --theme-text-color );

/* Sidebar Hover - Nav unification */
--color-sidebar-menu-hover-background: var( --theme-highlight-color );
--color-sidebar-menu-hover-heading-background: var( --theme-highlight-color );

/* Sidebar Submenu - Nav Unification */
--color-sidebar-submenu-background: var( --theme-submenu-background-color );
Expand Down
1 change: 0 additions & 1 deletion packages/calypso-color-schemes/src/shared/color-schemes/_light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ Primary+Accent is studio blue.
--color-sidebar-menu-hover-background: #888;
--color-sidebar-menu-hover-background-rgb: 136, 136, 136;
--color-sidebar-menu-hover-text: #fff;
--color-sidebar-menu-hover-heading-background: #888;

/* Sidebar Hover - Nav unification */

Expand Down
2 changes: 0 additions & 2 deletions packages/calypso-color-schemes/src/shared/color-schemes/_modern.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ Used studio-blue for the primary+accent.
--color-sidebar-menu-hover-text: var( --theme-text-color );

/* Sidebar Hover - Nav unification */
--color-sidebar-menu-hover-background: var( --theme-highlight-color );
--color-sidebar-menu-hover-heading-background: var( --theme-highlight-color );

/* Sidebar Submenu - Nav Unification */
--color-sidebar-submenu-background: var( --theme-submenu-background-color );
Expand Down
2 changes: 0 additions & 2 deletions packages/calypso-color-schemes/src/shared/color-schemes/_sunrise.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ Well use studio-orange for both the primary and accent colors
--color-sidebar-menu-hover-text: var( --theme-text-color );

/* Sidebar Hover - Nav unification */
--color-sidebar-menu-hover-background: var( --theme-highlight-color );
--color-sidebar-menu-hover-heading-background: var( --theme-highlight-color );

/* Sidebar Submenu - Nav Unification */
--color-sidebar-submenu-background: var( --theme-submenu-background-color );
Expand Down