Changeset 26570

Timestamp:

12/03/2013 06:15:52 PM (12 years ago)

Author:

nacin

Message:

Rename colors-fresh.css to colors.css. fixes #26137.

Location:

trunk/src

Files:

• wp-admin/css/colors (moved) (moved from trunk/src/wp-admin/css/color-schemes)
• wp-admin/css/colors.css (moved) (moved from trunk/src/wp-admin/css/colors-fresh.css)
• wp-admin/css/colors/blue/colors.scss (modified) (1 diff)
• wp-admin/css/colors/light/colors.scss (modified) (1 diff)
• wp-admin/css/colors/midnight/colors.scss (modified) (1 diff)
• wp-includes/general-template.php (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/css/colors/blue/colors.scss

@@ -9 +9 @@
 $menu-submenu-background: #4796b3;
 
-@import "../../colors-fresh.css";
+@import "../../colors.css";
 @import "../_admin.scss";

trunk/src/wp-admin/css/colors/light/colors.scss

@@ -18 +18 @@
 $menu-collapse-focus-icon: #555;
 
-@import "../../colors-fresh.css";
+@import "../../colors.css";
 @import "../_admin.scss";
 

trunk/src/wp-admin/css/colors/midnight/colors.scss

@@ -3 +3 @@
 $notification-color: #69a8bb;
 
-@import "../../colors-fresh.css";
+@import "../../colors.css";
 @import "../_admin.scss";

trunk/src/wp-includes/general-template.php

@@ -2117 +2117 @@
 function register_admin_color_schemes() {
     wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
-        admin_url( 'css/colors-fresh.min.css' ),
+        admin_url( 'css/colors.min.css' ),
         array( '#222', '#333', '#0074a2', '#2ea2cc' )
     );
@@ -2126 +2126 @@
 
     wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
-        admin_url( 'css/color-schemes/light/colors.min.css' ),
+        admin_url( 'css/colors/light/colors.min.css' ),
         array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
         array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' )
@@ -2132 +2132 @@
 
     wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ),
-        admin_url( 'css/color-schemes/blue/colors.min.css' ),
+        admin_url( 'css/colors/blue/colors.min.css' ),
         array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
         array( 'base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff' )
@@ -2138 +2138 @@
 
     wp_admin_css_color( 'midnight', _x( 'Midnight', 'admin color scheme' ),
-        admin_url( 'css/color-schemes/midnight/colors.min.css' ),
+        admin_url( 'css/colors/midnight/colors.min.css' ),
         array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
         array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )

trunk/src/wp-includes/script-loader.php

@@ -592 +592 @@
     $styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
 
-    // do not refer to these directly, the right one is queued by the above "meta" colors handle
-    $styles->add( 'colors-fresh', "/wp-admin/css/colors-fresh$suffix.css", array( 'wp-admin', 'buttons' ) );
+    // do not refer to this directly, the right one is queued by the above "meta" colors handle
+    $styles->add( 'colors-fresh', "/wp-admin/css/colors$suffix.css", array( 'wp-admin', 'buttons' ) );
 
     $styles->add( 'media', "/wp-admin/css/media$suffix.css" );