Changeset 27181

Timestamp:

02/16/2014 12:35:12 AM (11 years ago)

Author:

nacin

Message:

Rename the old media.css file, used for the pre-3.5 media library. Clean up script-loader CSS registrations.

see #26669.

Location:

trunk/src

Files:

• wp-admin/css/deprecated-media.css (moved) (moved from trunk/src/wp-admin/css/media.css) (1 diff)
• wp-includes/script-loader.php (modified) (3 diffs)

trunk/src/wp-admin/css/deprecated-media.css

@@ -6 +6 @@
     font-weight: bold;
     position: relative;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
+    border-bottom: 1px solid #dfdfdf;
+    background: #f9f9f9;
 }
 

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

@@ -552 +552 @@
     $styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
 
-    $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' );
-
-    $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
-
-    $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
-    $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
-
     $open_sans_font_url = '';
 
@@ -586 +577 @@
     }
 
-    $styles->add( 'open-sans', $open_sans_font_url );
-
-    // Dashicons
-    $styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );
-
     // 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' ) );
 
@@ -598 +583 @@
     $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' ) );
-    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ), '20131201' );
+    $suffix = SCRIPT_DEBUG ? '' : '.min';
+
+    // Admin CSS
+    $styles->add( 'wp-admin',           "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
+    $styles->add( 'install',            "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );
+    $styles->add( 'wp-color-picker',    "/wp-admin/css/color-picker$suffix.css" );
+    $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie' ) );
+    $styles->add( 'ie',                 "/wp-admin/css/ie$suffix.css" );
+
+    $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
+
+    // Common dependencies
+    $styles->add( 'buttons',   "/wp-includes/css/buttons$suffix.css" );
+    $styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );
+    $styles->add( 'open-sans', $open_sans_font_url );
+
+    // Includes CSS
+    $styles->add( 'admin-bar',      "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) );
+    $styles->add( 'wp-auth-check',  "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
+    $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
+    $styles->add( 'media-views',    "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons' ) );
+    $styles->add( 'wp-pointer',     "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
+
+    // External libraries and friends
+    $styles->add( 'imgareaselect',       '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
+    $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
+    $styles->add( 'mediaelement',        "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.13.0' );
+    $styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
+    $styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ), '20131201' );
+
+    // Deprecated CSS
+    $styles->add( 'media',      "/wp-admin/css/deprecated-media$suffix.css" );
     $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
-    $styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" );
-    $styles->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
-    $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
-    $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) );
-    $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
-    $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
-    $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
-    $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie' ) );
-    $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons' ) );
-    $styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" );
-    $styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
-
-    $styles->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.13.0' );
-    $styles->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
+    $styles->add( 'jcrop',      "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
+
+    // RTL CSS
+    $rtl_styles = array(
+        // wp-admin
+        'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'ie',
+        // wp-includes
+        'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',
+        'wp-jquery-ui-dialog',
+        // deprecated
+        'media', 'farbtastic',
+    );
 
     foreach ( $rtl_styles as $rtl_style ) {