Consolidate color-sidebar-menu-hover and color-sidebar-menu-hover-tex…

…t variables (#47294)
Automattic · Nov 11, 2020 · febfdad · febfdad
1 parent f618169
commit febfdad
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 10 deletions.
diff --git a/client/my-sites/sidebar-unified/style.scss b/client/my-sites/sidebar-unified/style.scss
@@ -12,7 +12,6 @@
 	--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: #00b9eb;
 	--color-sidebar-menu-hover-text: #00b9eb;
 	--color-sidebar-menu-selected-background: #0073aa;
 	--color-sidebar-border: #333333;
@@ -81,7 +80,7 @@ $font-size: rem( 14px );
 			&:hover,
 			&:focus {
 				background-color: var( --color-sidebar-menu-hover-heading-background );
-				color: var( --color-sidebar-menu-hover );
+				color: var( --color-sidebar-menu-hover-text );
 			}
 
 			&::after {
@@ -178,7 +177,7 @@ $font-size: rem( 14px );
 		.sidebar__menu-link {
 			&:hover {
 				.sidebar__menu-icon {
-					color: var( --color-sidebar-menu-hover );
+					color: var( --color-sidebar-menu-hover-text );
 				}
 				img.sidebar__menu-icon {
 					opacity: 1;
@@ -208,7 +207,7 @@ $font-size: rem( 14px );
 
 				&:hover {
 					.sidebar__menu-icon {
-						color: var( --color-sidebar-menu-hover );
+						color: var( --color-sidebar-menu-hover-text );
 					}
 					img.sidebar__menu-icon {
 						opacity: 1;
@@ -496,7 +495,7 @@ $font-size: rem( 14px );
 
 			.sidebar__heading {
 				background-color: var( --color-sidebar-menu-hover-heading-background );
-				color: var( --color-sidebar-menu-hover );
+				color: var( --color-sidebar-menu-hover-text );
 			}
 
 			// indicator arrow

diff --git a/packages/calypso-color-schemes/src/shared/color-schemes/_blue.scss b/packages/calypso-color-schemes/src/shared/color-schemes/_blue.scss
@@ -137,7 +137,6 @@ Used studio-blue for the primary+accent.
 
 	/* 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 */

diff --git a/packages/calypso-color-schemes/src/shared/color-schemes/_ectoplasm.scss b/packages/calypso-color-schemes/src/shared/color-schemes/_ectoplasm.scss
@@ -174,7 +174,6 @@ Created this definition in color-studio to generate 0-100 shades:
 
 	/* 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 */

diff --git a/packages/calypso-color-schemes/src/shared/color-schemes/_light.scss b/packages/calypso-color-schemes/src/shared/color-schemes/_light.scss
@@ -153,7 +153,6 @@ Primary+Accent is studio blue.
 	--color-sidebar-menu-hover-heading-background: #888;
 
 	/* Sidebar Hover - Nav unification */
-	--color-sidebar-menu-hover: #fff;
 
 	/* Sidebar Submenu - Nav Unification */
 	--color-sidebar-submenu-background: var( --theme-submenu-background-color );

diff --git a/packages/calypso-color-schemes/src/shared/color-schemes/_modern.scss b/packages/calypso-color-schemes/src/shared/color-schemes/_modern.scss
@@ -140,7 +140,6 @@ Used studio-blue for the primary+accent.
 
 	/* 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 */

diff --git a/packages/calypso-color-schemes/src/shared/color-schemes/_sunrise.scss b/packages/calypso-color-schemes/src/shared/color-schemes/_sunrise.scss
@@ -139,7 +139,6 @@ Well use studio-orange for both the primary and accent colors
 
 	/* 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 */