Merge colors.css into wp-admin.css. Non-default color schemes became overloads rather than swaps in the 3.8 redesign. Benefits include:

* No more border-width, border-style, border-color insanity.
* Point releases are much less likely to require extra finagling to avoid rebuilding the color schemes.
* Yours truly has a better overall vision of ~14,000 lines of admin CSS and where we go from here.

1,065 net lines of red, y'all.
props helen, jorbin. fixes #18380.


git-svn-id: https://develop.svn.wordpress.org/trunk@27106 602fd350-edb4-49c9-b593-d223f7449a82

src/wp-admin/css/colors/_admin.scss

@@ -20,12 +20,10 @@ a {
 	}
 }
 
-#rightnow a:hover,
 #media-upload a.del-link:hover,
 div.dashboard-widget-submit input:hover,
 .subsubsub a:hover,
-.subsubsub a.current:hover,
-.ui-tabs-nav a:hover {
+.subsubsub a.current:hover {
 	color: $link-focus;
 }
 

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

@@ -8,5 +8,4 @@ $menu-submenu-text: #e2ecf1;
 $menu-submenu-focus-text: #fff;
 $menu-submenu-background: #4796b3;
 
-@import "../../colors.css";
 @import "../_admin.scss";

src/wp-admin/css/colors/coffee/colors.scss

@@ -4,5 +4,4 @@ $notification-color: #9ea476;
 
 $form-checked: $base-color;
 
-@import "../../colors.css";
 @import "../_admin.scss";

src/wp-admin/css/colors/ectoplasm/colors.scss

@@ -5,5 +5,4 @@ $notification-color: #d46f15;
 
 $form-checked: $base-color;
 
-@import "../../colors.css";
 @import "../_admin.scss";

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

@@ -17,7 +17,6 @@ $menu-submenu-background: #fff;
 $menu-collapse-text: #777;
 $menu-collapse-focus-icon: #555;
 
-@import "../../colors.css";
 @import "../_admin.scss";
 
 /* temporary fix for admin-bar hover color */

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

@@ -2,5 +2,4 @@ $base-color: #363b3f;
 $highlight-color: #e14d43;
 $notification-color: #69a8bb;
 
-@import "../../colors.css";
 @import "../_admin.scss";

src/wp-admin/css/colors/ocean/colors.scss

@@ -5,5 +5,4 @@ $notification-color: #aa9d88;
 
 $form-checked: $base-color;
 
-@import "../../colors.css";
 @import "../_admin.scss";

src/wp-admin/css/colors/sunrise/colors.scss

@@ -3,5 +3,4 @@ $highlight-color: #dd823b;
 $notification-color: #ccaf0b;
 $menu-submenu-focus-text: lighten( $highlight-color, 35% );
 
-@import "../../colors.css";
 @import "../_admin.scss";

src/wp-admin/includes/update-core.php

@@ -603,6 +603,9 @@ $_old_files = array(
 'wp-admin/images/stars-rtl.png',
 'wp-admin/images/wp-logo-vs-2x.png',
 'wp-admin/images/about-updates-2x.png',
+// 3.9
+'wp-admin/css/colors.css',
+'wp-admin/css/colors.min.css',
 );
 
 /**

src/wp-includes/css/editor.css

@@ -1087,6 +1087,34 @@ i.mce-i-wp_page:before {
 	color: #999;
 	padding-left: 12px;
 }
+
+/* from colors.css
+.clearlooks2 {
+	box-shadow: 0 5px 15px rgba(0,0,0,0.7);
+}
+
+.clearlooks2 .mceMiddle span,
+.clearlooks2 .mceMiddle .mceLeft,
+.clearlooks2 .mceMiddle .mceRight,
+.clearlooks2 .mceBottom,
+.clearlooks2 .mceBottom .mceLeft,
+.clearlooks2 .mceBottom .mceCenter,
+.clearlooks2 .mceBottom .mceRight {
+	background-color: #fcfcfc;
+}
+
+.clearlooks2 .mceTop span,
+.clearlooks2 .mceFocus .mceTop span {
+	color: #222;
+}
+
+.clearlooks2 .mceClose:before {
+	color: #999;
+}
+
+.clearlooks2 .mceClose:hover:before {
+	color: #2ea2cc;
+}
 */
 /* Distraction Free Writing mode
  * =Overlay Styles

src/wp-includes/css/media-views.css

@@ -457,6 +457,12 @@
 	user-select: none;
 }
 
+.media-router a {
+	-moz-transition:    none;
+	-webkit-transition: none;
+	transition:         none;
+}
+
 .media-router > a {
 	position: relative;
 	float: left;

src/wp-includes/css/wp-pointer.css

@@ -59,6 +59,8 @@
 }
 
 .wp-pointer-buttons a.close:before {
+	background: none;
+	color: #bbb;
 	content: '\f153';
 	display: block !important;
 	font: normal 13px/1 'dashicons';
@@ -73,6 +75,10 @@
 	top: 1px;
 }
 
+.wp-pointer-buttons a.close:hover:before {
+	color: #c00;
+}
+
 /* The arrow base class must take up no space, even with transparent borders. */
 .wp-pointer-arrow,
 .wp-pointer-arrow-inner {

src/wp-includes/script-loader.php

@@ -549,7 +549,7 @@ function wp_default_styles( &$styles ) {
 
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 
-	$rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker', 'wp-pointer', 'editor-buttons', 'farbtastic', 'wp-auth-check', 'wp-jquery-ui-dialog', 'media-views', 'buttons', 'install', 'colors-fresh' );
+	$rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker', 'wp-pointer', 'editor-buttons', 'farbtastic', 'wp-auth-check', 'wp-jquery-ui-dialog', 'media-views', 'buttons', 'install' );
 
 	$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
 
@@ -590,7 +590,7 @@ function wp_default_styles( &$styles ) {
 	$styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
 
 	// 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( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) );
 
 	$styles->add( 'media', "/wp-admin/css/media$suffix.css" );
 	$styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );