WordPress.org

Make WordPress Core

Changeset 27181


Ignore:
Timestamp:
02/16/2014 12:35:12 AM (8 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:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/css/deprecated-media.css

    r27174 r27181  
    66    font-weight: bold;
    77    position: relative;
    8     border-bottom-width: 1px;
    9     border-bottom-style: solid;
     8    border-bottom: 1px solid #dfdfdf;
     9    background: #f9f9f9;
    1010}
    1111
  • trunk/src/wp-includes/script-loader.php

    r27170 r27181  
    552552    $styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
    553553
    554     $suffix = SCRIPT_DEBUG ? '' : '.min';
    555 
    556     $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' );
    557 
    558     $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
    559 
    560     $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
    561     $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
    562 
    563554    $open_sans_font_url = '';
    564555
     
    586577    }
    587578
    588     $styles->add( 'open-sans', $open_sans_font_url );
    589 
    590     // Dashicons
    591     $styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );
    592 
    593579    // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
    594 
    595580    $styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
    596581
     
    598583    $styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) );
    599584
    600     $styles->add( 'media', "/wp-admin/css/media$suffix.css" );
    601     $styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );
    602     $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ), '20131201' );
     585    $suffix = SCRIPT_DEBUG ? '' : '.min';
     586
     587    // Admin CSS
     588    $styles->add( 'wp-admin',           "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
     589    $styles->add( 'install',            "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );
     590    $styles->add( 'wp-color-picker',    "/wp-admin/css/color-picker$suffix.css" );
     591    $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie' ) );
     592    $styles->add( 'ie',                 "/wp-admin/css/ie$suffix.css" );
     593
     594    $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
     595
     596    // Common dependencies
     597    $styles->add( 'buttons',   "/wp-includes/css/buttons$suffix.css" );
     598    $styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );
     599    $styles->add( 'open-sans', $open_sans_font_url );
     600
     601    // Includes CSS
     602    $styles->add( 'admin-bar',      "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) );
     603    $styles->add( 'wp-auth-check',  "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
     604    $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
     605    $styles->add( 'media-views',    "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons' ) );
     606    $styles->add( 'wp-pointer',     "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
     607
     608    // External libraries and friends
     609    $styles->add( 'imgareaselect',       '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
     610    $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
     611    $styles->add( 'mediaelement',        "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.13.0' );
     612    $styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
     613    $styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ), '20131201' );
     614
     615    // Deprecated CSS
     616    $styles->add( 'media',      "/wp-admin/css/deprecated-media$suffix.css" );
    603617    $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
    604     $styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" );
    605     $styles->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
    606     $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
    607     $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) );
    608     $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
    609     $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
    610     $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
    611     $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie' ) );
    612     $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons' ) );
    613     $styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" );
    614     $styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
    615 
    616     $styles->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelementplayer.min.css", array(), '2.13.0' );
    617     $styles->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
     618    $styles->add( 'jcrop',      "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
     619
     620    // RTL CSS
     621    $rtl_styles = array(
     622        // wp-admin
     623        'wp-admin', 'install', 'wp-color-picker', 'customize-controls', 'ie',
     624        // wp-includes
     625        'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',
     626        'wp-jquery-ui-dialog',
     627        // deprecated
     628        'media', 'farbtastic',
     629    );
    618630
    619631    foreach ( $rtl_styles as $rtl_style ) {
Note: See TracChangeset for help on using the changeset viewer.