Merge pull request #2936 from Automattic/fix/varia-menu-colors

Varia + children: Fix new mobile menu to work with wpcom colors

alves/inc/wpcom-colors.php

@@ -13,7 +13,10 @@ add_color_rule( 'bg', '#ffffff', array(
 			body .widget_eu_cookie_law_widget #eu-cookie-law,
 			body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept,
 			.main-navigation > div > ul > li > .sub-menu,
-			.site-header .main-navigation > div > ul > li .sub-menu a', 'background-color' ),
+			.site-header .main-navigation > div > ul > li .sub-menu a,
+			.main-navigation > div > ul > li.current-menu-item li.current-menu-item > a,
+			.mobile-nav-side .site-header #site-navigation.main-navigation .woocommerce-menu-container, 
+			.mobile-nav-side .site-header #site-navigation.main-navigation > div', 'background-color' ),
 
 	// Text-color
 	array( '.a8c-posts-list-item__featured span,
@@ -312,7 +315,11 @@ add_color_rule( 'fg1', '#9B6A36', array(
 			button:hover,
 			input.has-focus[type="submit"],
 			input:focus[type="submit"],
-			input:hover[type="submit"]', 'background-color' ),
+			input:hover[type="submit"],
+			.main-navigation .button:focus,
+			.main-navigation .button:hover,
+			.main-navigation #toggle:focus + #toggle-menu,
+			.has-secondary-background-color', 'background-color' ),
 
 	// Border-color
 	array( 'input[type="color"]:focus,

barnsbury/inc/wpcom-colors.php

@@ -24,7 +24,10 @@ add_color_rule( 'bg', '#FFFDF6', array(
 			.main-navigation > div > ul > li.focus li.current-menu-item > a,
 			.main-navigation > div > ul > li.current-menu-item li:hover > a,
 			.main-navigation > div > ul > li.current-menu-item li.focus > a,
-			.main-navigation > div > ul > li.current-menu-item li.current-menu-item > a', 'background-color' ),
+			.main-navigation > div > ul > li.current-menu-item li.current-menu-item > a,
+			.mobile-nav-side .site-header #site-navigation.main-navigation .woocommerce-menu-container, 
+			.mobile-nav-side .site-header #site-navigation.main-navigation > div', 
+			'background-color' ),
 
 	// Text-color
 	array( '.a8c-posts-list-item__featured span,
@@ -294,7 +297,11 @@ add_color_rule( 'fg1', '#655441', array(
 	array( '.has-secondary-color', 'color' ),
 
 	// Background-color
-	array( '.has-secondary-background-color,
+	array( '	
+			.main-navigation .button:focus,
+			.main-navigation .button:hover,
+			.main-navigation #toggle:focus + #toggle-menu,
+			.has-secondary-background-color,
 			.has-secondary-background-color.has-background-dim', 'background-color' ),
 
 ), __( 'Secondary Color' ) );

dalston/inc/wpcom-colors.php

@@ -19,7 +19,11 @@ add_color_rule( 'bg', '#FFFFFF', array(
 			.site-header .main-navigation > div > ul > li.focus li:hover > a, .site-header .main-navigation > div > ul > li.focus li.focus > a, 
 			.site-header .main-navigation > div > ul > li.focus li.current-menu-item > a, .site-header .main-navigation > div > ul > li.current-menu-item li:hover > a, 
 			.site-header .main-navigation > div > ul > li.current-menu-item li.focus > a, 
-			.site-header .main-navigation > div > ul > li.current-menu-item li.current-menu-item > a', 'background-color' ),
+			.site-header .main-navigation > div > ul > li.current-menu-item li.current-menu-item > a,
+			.site-header .main-navigation > div > ul > li .sub-menu a,
+			.main-navigation > div > ul > li.current-menu-item li.current-menu-item > a,
+			.mobile-nav-side .site-header #site-navigation.main-navigation .woocommerce-menu-container, 
+			.mobile-nav-side .site-header #site-navigation.main-navigation > div', 'background-color' ),
 
 	// Text-color
 	array( '.a8c-posts-list-item__featured span,
@@ -400,7 +404,12 @@ add_color_rule( 'fg1', '#0d1b24', array(
 	array( '.has-secondary-color[class]', 'color' ),
 
 	// Background-color
-	array( '.has-secondary-background-color[class]', 'background-color' ),
+	array( '.has-secondary-background-color[class],
+			input:hover[type="submit"],
+			.main-navigation .button:focus,
+			.main-navigation .button:hover,
+			.main-navigation #toggle:focus + #toggle-menu,
+			.has-secondary-background-color', 'background-color' ),
 
 ), __( 'Secondary Color' ) );
 

mayland/inc/wpcom-colors.php

@@ -10,13 +10,18 @@ add_color_rule( 'bg', '#ffffff', array(
 			body,
 			body .widget_eu_cookie_law_widget #eu-cookie-law,
 			body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept,
-			.main-navigation > div > ul > li > .sub-menu', 'background-color' ),
+			.main-navigation > div > ul > li > .sub-menu,
+			.site-header .main-navigation > div > ul > li .sub-menu a,
+			.main-navigation > div > ul > li.current-menu-item li.current-menu-item > a,
+			.mobile-nav-side .site-header #site-navigation.main-navigation .woocommerce-menu-container, 
+			.mobile-nav-side .site-header #site-navigation.main-navigation > div', 'background-color' ),
 
 	// Text-color
 	array( '.a8c-posts-list-item__featured span,
 			.sticky-post,
 			.wp-block-pullquote.is-style-solid-color,
 			body .widget_eu_cookie_law_widget #eu-cookie-law.negative,
+			.main-navigation .button,
 			.wp-block-button:not(.is-style-outline) .wp-block-button__link:not(.has-text-color)', 'color' ),
 
 	// Background-color Lightened
@@ -363,7 +368,12 @@ add_color_rule( 'fg1', '#1a1a1a', array(
 
 	// Background-color
 	array( '.has-secondary-background-color[class],
-			.has-secondary-background-color.has-background-dim[class]', 'background-color' ),
+			.has-secondary-background-color.has-background-dim[class],
+			input:hover[type="submit"],
+			.main-navigation .button:focus,
+			.main-navigation .button:hover,
+			.main-navigation #toggle:focus + #toggle-menu,
+			.has-secondary-background-color', 'background-color' ),
 
 ), __( 'Secondary Color' ) );
 

rivington/inc/wpcom-colors.php

@@ -22,7 +22,11 @@ add_color_rule( 'bg', '#060f29', array(
 			.site-header .main-navigation > div > ul > li.focus li:hover > a,
 			.site-header .main-navigation > div > ul > li:hover li.current-menu-item > a,
 			.site-header .main-navigation > div > ul > li:hover li.focus > a,
-			.site-header .main-navigation > div > ul > li:hover li:hover > a', 'background-color' ),
+			.site-header .main-navigation > div > ul > li:hover li:hover > a,
+			.site-header .main-navigation > div > ul > li .sub-menu a,
+			.main-navigation > div > ul > li.current-menu-item li.current-menu-item > a,
+			.mobile-nav-side .site-header #site-navigation.main-navigation .woocommerce-menu-container, 
+			.mobile-nav-side .site-header #site-navigation.main-navigation > div', 'background-color' ),
 
 	// Text-color
 	array( '.a8c-posts-list-item__featured span,
@@ -385,7 +389,12 @@ add_color_rule( 'fg1', '#EE4266', array(
 	array( '.has-secondary-color[class]', 'color' ),
 
 	// Background-color
-	array( '.has-secondary-background-color[class]', 'background-color' ),
+	array( '.has-secondary-background-color[class],
+			input:hover[type="submit"],
+			.main-navigation .button:focus,
+			.main-navigation .button:hover,
+			.main-navigation #toggle:focus + #toggle-menu,
+			.has-secondary-background-color', 'background-color' ),
 
 ), __( 'Secondary Color' ) );