Ticket #48598: 48598.2.diff

src/wp-admin/css/colors/_admin.scss

@@ -75 +75 @@
 
 .wp-core-ui {
 
-        .button,
-        .button-secondary {
-                color: $button-color;
-                border-color: $button-color;
+        .button {
+                border-color: #7e8993;
+                color: #32373c;
         }
 
         .button.hover,
         .button:hover,
-        .button-secondary:hover,
         .button.focus,
-        .button:focus,
-        .button-secondary:focus {
-                border-color: darken( $button-color, 5% );
-                color: darken( $button-color, 5% );
+        .button:focus {
+                border-color: darken( #7e8993, 5% );
+                color: darken( #32373c, 5% );
         }
 
         .button.focus,
-        .button:focus,
-        .button-secondary:focus {
-                border-color: $button-color;
-                color: darken( $button-color, 5% );
-                box-shadow: 0 0 0 1px $button-color;
+        .button:focus {
+                border-color: #7e8993;
+                color: darken( #32373c, 5% );
+                box-shadow: 0 0 0 1px #32373c;
         }
 
         .button:active {
-                background: darken( $button-color, 5% );
-                border-color: darken( $button-color, 5% );
+                border-color: #7e8993;
+                color: darken( #32373c, 5% );
+                box-shadow: none;
         }
 
         .button.active,
@@ -108 +105 @@
         .button.active:focus,
         .button.active:hover {
                 border-color: darken( $button-color, 5% );
-                color: darken( $button-color, 5% );
+                color: darken( $button-text-color, 5% );
                 box-shadow: inset 0 2px 5px -3px darken( $button-color, 5% );
         }
 

src/wp-admin/css/colors/_mixins.scss

@@ -2 +2 @@
  * Button mixin- creates a button effect with correct
  * highlights/shadows, based on a base color.
  */
-@mixin button( $button-color, $text-color: #fff ) {
+@mixin button( $button-color, $button-text-color: #fff ) {
         background: $button-color;
         border-color: $button-color;
-        color: $text-color;
+        color: $button-text-color;
 
         &:hover,
         &:focus {
                 background: lighten( $button-color, 3% );
                 border-color: darken( $button-color, 3% );
-                color: $text-color;
+                color: $button-text-color;
         }
 
         &:focus {
@@ -23 +23 @@
         &:active {
                 background: darken( $button-color, 5% );
                 border-color: darken( $button-color, 5% );
-                color: $text-color;
+                color: $button-text-color;
         }
 
         &.active,
@@ -30 +30 @@
         &.active:focus,
         &.active:hover {
                 background: $button-color;
-                color: $text-color;
+                color: $button-text-color;
                 border-color: darken( $button-color, 15% );
                 box-shadow: inset 0 2px 5px -3px darken( $button-color, 50% );
         }

src/wp-admin/css/colors/_variables.scss

@@ -18 +18 @@
 $link-focus: lighten( $link, 10% ) !default;
 
 $button-color: $highlight-color !default;
-$form-checked: $highlight-color !default;
+$button-text-color: $text-color !default;
 
+$form-checked: #7e8993 !default;
 
 // admin menu & admin-bar