Ticket #18380: 18380.diff

src/wp-admin/css/colors.css

@@ -16 +16 @@
   1.0 - General
 ------------------------------------------------------------------------------*/
 
-html {
-        background: #f1f1f1;
-}
-
-/* Checkbooms */
-
-input[type=checkbox],
-input[type=radio] {
-        background: #fff;
-        border-color: #bbb;
-        color: #555;
-
-        -webkit-box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
-        box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
-}
-
-input[type=checkbox]:checked:before {
-        color: #1e8cbe;
-}
-
-input[type=radio]:checked:before {
-        background-color: #1e8cbe;
-}
-
-.wp-core-ui input[type="reset"]:hover,
-.wp-core-ui input[type="reset"]:active {
-        color: #2ea2cc;
-}
-
-
 /* Helper classes for plugins to leverage the active WordPress color scheme */
 
 .wp-ui-primary {

src/wp-admin/css/wp-admin.css

@@ -259 +259 @@
 
 input[type="checkbox"],
 input[type="radio"] {
+        background: #fff;
+        border-color: #bbb;
         border-width: 1px;
         border-style: solid;
+        color: #555;
         clear: none;
         cursor: pointer;
         display: inline-block;
@@ -276 +279 @@
         -webkit-appearance: none;
         -webkit-box-sizing: border-box;
         box-sizing: border-box;
+        -webkit-box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
+        box-shadow: inset 0px 1px 2px rgba(0,0,0,0.1);
 }
 
+input[type=checkbox]:checked:before {
+        color: #1e8cbe;
+}
+
+input[type=radio]:checked:before {
+        background-color: #1e8cbe;
+}
+
+.wp-core-ui input[type="reset"]:hover,
+.wp-core-ui input[type="reset"]:active {
+        color: #2ea2cc;
+}
+
 td > input[type="checkbox"],
 .wp-admin p input[type=checkbox],
 .wp-admin p input[type=radio] {
@@ -356 +374 @@
 }
 
 /* general */
+html {
+        background: #f1f1f1;
+}
+
 html,
 body {
         height: 100%;
@@ -363 +385 @@
         padding: 0;
 }
 
+
 body {
         font-family: "Open Sans", sans-serif;
         font-size: 13px;

src/wp-includes/script-loader.php

@@ -691 +691 @@
                 if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
                         $color = 'fresh';
 
+                // Check to see if we are using the default which is backed in
+                if ( $color === 'fresh' ){
+                        return false;
+                }
+                
                 $color = $_wp_admin_css_colors[$color];
                 $parsed = parse_url( $src );
                 $url = $color->url;