From 2cb2a1b86e582a831ac986dc2c8109efb02dd81a Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 3 Dec 2013 18:15:52 +0000 Subject: [PATCH] Rename colors-fresh.css to colors.css. fixes #26137. git-svn-id: https://develop.svn.wordpress.org/trunk@26570 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/{colors-fresh.css => colors.css} | 0 src/wp-admin/css/{color-schemes => colors}/_admin.scss | 0 src/wp-admin/css/{color-schemes => colors}/_mixins.scss | 0 .../css/{color-schemes => colors}/_variables.scss | 0 .../css/{color-schemes => colors}/blue/colors.scss | 2 +- .../css/{color-schemes => colors}/light/colors.scss | 2 +- .../css/{color-schemes => colors}/midnight/colors.scss | 2 +- src/wp-includes/general-template.php | 8 ++++---- src/wp-includes/script-loader.php | 4 ++-- 9 files changed, 9 insertions(+), 9 deletions(-) rename src/wp-admin/css/{colors-fresh.css => colors.css} (100%) rename src/wp-admin/css/{color-schemes => colors}/_admin.scss (100%) rename src/wp-admin/css/{color-schemes => colors}/_mixins.scss (100%) rename src/wp-admin/css/{color-schemes => colors}/_variables.scss (100%) rename src/wp-admin/css/{color-schemes => colors}/blue/colors.scss (87%) rename src/wp-admin/css/{color-schemes => colors}/light/colors.scss (96%) rename src/wp-admin/css/{color-schemes => colors}/midnight/colors.scss (75%) diff --git a/src/wp-admin/css/colors-fresh.css b/src/wp-admin/css/colors.css similarity index 100% rename from src/wp-admin/css/colors-fresh.css rename to src/wp-admin/css/colors.css diff --git a/src/wp-admin/css/color-schemes/_admin.scss b/src/wp-admin/css/colors/_admin.scss similarity index 100% rename from src/wp-admin/css/color-schemes/_admin.scss rename to src/wp-admin/css/colors/_admin.scss diff --git a/src/wp-admin/css/color-schemes/_mixins.scss b/src/wp-admin/css/colors/_mixins.scss similarity index 100% rename from src/wp-admin/css/color-schemes/_mixins.scss rename to src/wp-admin/css/colors/_mixins.scss diff --git a/src/wp-admin/css/color-schemes/_variables.scss b/src/wp-admin/css/colors/_variables.scss similarity index 100% rename from src/wp-admin/css/color-schemes/_variables.scss rename to src/wp-admin/css/colors/_variables.scss diff --git a/src/wp-admin/css/color-schemes/blue/colors.scss b/src/wp-admin/css/colors/blue/colors.scss similarity index 87% rename from src/wp-admin/css/color-schemes/blue/colors.scss rename to src/wp-admin/css/colors/blue/colors.scss index 6a243152ef..aefb7b9bec 100644 --- a/src/wp-admin/css/color-schemes/blue/colors.scss +++ b/src/wp-admin/css/colors/blue/colors.scss @@ -8,5 +8,5 @@ $menu-submenu-text: #e2ecf1; $menu-submenu-focus-text: #fff; $menu-submenu-background: #4796b3; -@import "../../colors-fresh.css"; +@import "../../colors.css"; @import "../_admin.scss"; diff --git a/src/wp-admin/css/color-schemes/light/colors.scss b/src/wp-admin/css/colors/light/colors.scss similarity index 96% rename from src/wp-admin/css/color-schemes/light/colors.scss rename to src/wp-admin/css/colors/light/colors.scss index 7785fa7533..fa653f2fd6 100644 --- a/src/wp-admin/css/color-schemes/light/colors.scss +++ b/src/wp-admin/css/colors/light/colors.scss @@ -17,7 +17,7 @@ $menu-submenu-background: #fff; $menu-collapse-text: #777; $menu-collapse-focus-icon: #555; -@import "../../colors-fresh.css"; +@import "../../colors.css"; @import "../_admin.scss"; /* temporary fix for admin-bar hover color */ diff --git a/src/wp-admin/css/color-schemes/midnight/colors.scss b/src/wp-admin/css/colors/midnight/colors.scss similarity index 75% rename from src/wp-admin/css/color-schemes/midnight/colors.scss rename to src/wp-admin/css/colors/midnight/colors.scss index e1b73eb1b9..49952fcb97 100644 --- a/src/wp-admin/css/color-schemes/midnight/colors.scss +++ b/src/wp-admin/css/colors/midnight/colors.scss @@ -2,5 +2,5 @@ $base-color: #363b3f; $highlight-color: #e14d43; $notification-color: #69a8bb; -@import "../../colors-fresh.css"; +@import "../../colors.css"; @import "../_admin.scss"; diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php index 28613f1cd9..dfb147af09 100644 --- a/src/wp-includes/general-template.php +++ b/src/wp-includes/general-template.php @@ -2116,7 +2116,7 @@ function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = arra */ 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' ) ); @@ -2125,19 +2125,19 @@ function register_admin_color_schemes() { return; 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' ) ); 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' ) ); 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' ) ); diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 9ea2337091..7d75a581f2 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -591,8 +591,8 @@ function wp_default_styles( &$styles ) { // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string. $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" ); $styles->add( 'install', "/wp-admin/css/install$suffix.css", array('buttons') );