From 4b2bc59df8387093e23edadc95f6196e6b329033 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 12 Mar 2008 00:12:34 +0000
Subject: [PATCH] Color scheme selector fixes from andy. see #6167

git-svn-id: http://svn.automattic.com/wordpress/trunk@7258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-header.php   | 2 --
 wp-admin/admin.php          | 3 +++
 wp-admin/includes/media.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 08ae99cf0d..3550dc995a 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -28,8 +28,6 @@ get_admin_page_title();
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title>
 <?php
-wp_admin_css_color('classic', __('Classic'), get_option( 'siteurl' ) . "/wp-admin/css/colors-classic.css", array('#07273E', '#14568A', '#D54E21', '#2683AE'));
-wp_admin_css_color('fresh', __('Fresh'), get_option( 'siteurl' ) . "/wp-admin/css/colors-fresh.css", array('#464646', '#CEE1EF', '#D54E21', '#2683AE'));
 wp_admin_css( 'css/global' );
 wp_admin_css();
 wp_admin_css( 'css/colors' );
diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index d500d293f4..1664820796 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -26,6 +26,9 @@ $time_format = get_option('time_format');
 
 wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback'));
 
+wp_admin_css_color('classic', __('Classic'), get_option( 'siteurl' ) . "/wp-admin/css/colors-classic.css", array('#07273E', '#14568A', '#D54E21', '#2683AE'));
+wp_admin_css_color('fresh', __('Fresh'), get_option( 'siteurl' ) . "/wp-admin/css/colors-fresh.css", array('#464646', '#CEE1EF', '#D54E21', '#2683AE'));
+
 wp_enqueue_script( 'common' );
 wp_enqueue_script( 'jquery-color' );
 
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 15b646d7d7..b538ee4583 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -128,7 +128,7 @@ function wp_iframe($content_func /* ... */) {
 <?php
 wp_admin_css( 'css/global' );
 wp_admin_css();
-wp_admin_css( 'css/colors-classic' );
+wp_admin_css( 'css/colors' );
 ?>
 <script type="text/javascript">
 //<![CDATA[