From e7986b035c3c489c9a0bb4c652892df3a175d258 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 14 Nov 2013 00:02:36 +0000 Subject: [PATCH] Remove SCRIPT_DEBUG reference from register_admin_color_schemes(). Instead, script-loader.php handles converting .min.css to .css when SCRIPT_DEBUG is on, and has since r21592. (This was done for compatibility with plugin color schemes that used .css and .dev.css.) see #25858. git-svn-id: https://develop.svn.wordpress.org/trunk@26147 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/general-template.php | 39 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php index fefaaecfbc..07bfc840b1 100644 --- a/src/wp-includes/general-template.php +++ b/src/wp-includes/general-template.php @@ -2107,33 +2107,32 @@ function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = arra * @since 3.0.0 */ function register_admin_color_schemes() { - $suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; - wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ), - admin_url( "css/colors-fresh$suffix.css" ), + admin_url( 'css/colors-fresh.min.css' ), array( '#222', '#333', '#0074a2', '#2ea2cc' ) ); // Other color schemes are not available when running out of src - if ( ! strpos( $GLOBALS['wp_version'], '-src' ) ) { - wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ), - admin_url( "css/color-schemes/light/colors$suffix.css" ), - array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ), - array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' ) - ); + if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) ) + return; - wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ), - admin_url( "css/color-schemes/blue/colors$suffix.css" ), - array( '#096484', '#4796b3', '#52accc', '#74B6CE' ), - array( 'base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff' ) - ); + wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ), + admin_url( 'css/color-schemes/light/colors.min.css' ), + array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ), + array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' ) + ); - wp_admin_css_color( 'midnight', _x( 'Midnight', 'admin color scheme' ), - admin_url( "css/color-schemes/midnight/colors$suffix.css" ), - array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ), - array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' ) - ); - } + wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ), + admin_url( 'css/color-schemes/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' ), + array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ), + array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' ) + ); } /**