Merge pull request #4362 from Automattic/fix/ip-colors

Independent Publisher 2: Make color annotations button rule more specific

independent-publisher-2/inc/wpcom-colors.php

@@ -79,14 +79,15 @@ add_color_rule( 'link', '#0087be', array(
 __( 'Links' ) );
 
 add_color_rule( 'fg1', '#0087be', array(
-    array( 'button:not(.menu-toggle),
+    array( 'button,
             input[type="button"],
             input[type="reset"],
             input[type="submit"],
             .button,
             #content #infinite-handle span button,
             .more-link', 'background-color' ),
-    array( 'button:not(.menu-toggle):hover,
+    //:not(".components-button") avoids targeting button styles in the Gutenberg editor
+    array( 'button:not(".components-button"):hover,
             input[type="button"]:hover,
             input[type="reset"]:hover,
             input[type="submit"]:hover,
@@ -101,10 +102,10 @@ add_color_rule( 'extra', '#383838', array(
     array( '.widget_recent_comments a,
             .widget_recent_entries a,
             body,
-            button,
             input,
             select,
-            textarea', 'color', 'bg' ),
+            textarea,
+            .menu-toggle', 'color', 'bg' ),
 
     array( '#infinite-footer .blog-info a:hover,
             #infinite-footer .blog-credits a:hover', 'color', 'bg' ),
@@ -116,14 +117,13 @@ add_color_rule( 'extra', '#ffffff', array(
             .main-navigation > div > ul > li.current-menu-item > ul > li a,
             .main-navigation > div > ul > li.current_page_item > ul > li a', 'color', 'link' ),
 
-    array( 'button:not(.menu-toggle),
-            button:not(.menu-toggle):hover,
-            input[type="button"],
+    array( 'input[type="button"],
             input[type="button"]:hover,
             input[type="reset"],
             input[type="reset"]:hover,
             input[type="submit"],
             input[type="submit"]:hover,
+            button,
             .button,
             .button:hover,
             #content #infinite-handle span button,

independent-publisher-2/style.css

@@ -655,7 +655,7 @@ input:active {
 
 .button,
 .more-link,
-button:not(.menu-toggle),
+button,
 input[type="button"],
 input[type="reset"],
 input[type="submit"],
@@ -685,13 +685,13 @@ input[type="submit"],
 .button:active,
 .more-link:focus,
 .more-link:active,
-button:not(.menu-toggle):focus,
+button:focus,
 input[type="button"]:focus,
 input[type="reset"]:focus,
 input[type="submit"]:focus,
 .posts-navigation .nav-links a:focus,
 #content #infinite-handle span button:focus,
-button:not(.menu-toggle):active,
+button:active,
 input[type="button"]:active,
 input[type="reset"]:active,
 input[type="submit"]:active,
@@ -704,7 +704,7 @@ input[type="submit"]:active,
 
 .button:hover,
 .more-link:hover,
-button:not(.menu-toggle):hover,
+button:hover,
 input[type="button"]:hover,
 input[type="reset"]:hover,
 input[type="submit"]:hover,
@@ -728,13 +728,13 @@ input[type="submit"]:hover,
 	text-align: center;
 }
 
-input + button:not(.menu-toggle),
+input + button,
 input + input[type="button"],
 input + input[type="reset"],
 input + input[type="submit"],
 input + .posts-navigation .nav-links a,
 input + #content #infinite-handle span button,
-label + button:not(.menu-toggle),
+label + button,
 label + input[type="button"],
 label + input[type="reset"],
 label + input[type="submit"],