From 6351b0b3a46491bebed44db90cf42002cbd367ae Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sun, 16 Feb 2014 00:35:12 +0000 Subject: [PATCH] Rename the old media.css file, used for the pre-3.5 media library. Clean up script-loader CSS registrations. see #26669. git-svn-id: https://develop.svn.wordpress.org/trunk@27181 602fd350-edb4-49c9-b593-d223f7449a82 --- .../css/{media.css => deprecated-media.css} | 4 +- src/wp-includes/script-loader.php | 76 +++++++++++-------- 2 files changed, 46 insertions(+), 34 deletions(-) rename src/wp-admin/css/{media.css => deprecated-media.css} (99%) diff --git a/src/wp-admin/css/media.css b/src/wp-admin/css/deprecated-media.css similarity index 99% rename from src/wp-admin/css/media.css rename to src/wp-admin/css/deprecated-media.css index c281762cb0..d8cba5fdd8 100644 --- a/src/wp-admin/css/media.css +++ b/src/wp-admin/css/deprecated-media.css @@ -5,8 +5,8 @@ div#media-upload-header { padding: 5px 5px 0; font-weight: bold; position: relative; - border-bottom-width: 1px; - border-bottom-style: solid; + border-bottom: 1px solid #dfdfdf; + background: #f9f9f9; } body#media-upload ul#sidemenu { diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 9fd2911406..34e95fd371 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -551,15 +551,6 @@ function wp_default_styles( &$styles ) { $styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr'; $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 = ''; /* translators: If there are characters in your language that are not supported @@ -585,36 +576,57 @@ function wp_default_styles( &$styles ) { $open_sans_font_url = "//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=$subsets"; } - $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' ) ); // do not refer to this directly, the right one is queued by the above "meta" colors handle $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' ); - $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' ) ); + $suffix = SCRIPT_DEBUG ? '' : '.min'; - $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' ) ); + // 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( '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 ) { $styles->add_data( $rtl_style, 'rtl', 'replace' );