WordPress.org

Make WordPress Core

Ticket #28478: 28478.2.diff

File 28478.2.diff, 4.2 KB (added by MikeHansenMe, 6 years ago)

Refreshed

  • src/wp-includes/class-wp-admin-bar.php

     
    5959                add_action('wp_head', $header_callback);
    6060
    6161                wp_enqueue_script( 'admin-bar' );
     62                wp_enqueue_style( 'open-sans' );
    6263                wp_enqueue_style( 'admin-bar' );
    6364
    6465                /**
  • src/wp-includes/script-loader.php

     
    609609        }
    610610
    611611        // Register a stylesheet for the selected admin color scheme.
    612         $styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'open-sans', 'dashicons' ) );
     612        $styles->add( 'colors', true, array( 'wp-admin', 'buttons', 'dashicons' ) );
    613613
    614614        $suffix = SCRIPT_DEBUG ? '' : '.min';
    615615
    616616        // Admin CSS
    617         $styles->add( 'wp-admin',           "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
    618         $styles->add( 'login',              "/wp-admin/css/login$suffix.css", array( 'buttons', 'open-sans', 'dashicons' ) );
    619         $styles->add( 'install',            "/wp-admin/css/install$suffix.css", array( 'buttons', 'open-sans' ) );
     617        $styles->add( 'wp-admin',           "/wp-admin/css/wp-admin$suffix.css", array( 'dashicons' ) );
     618        $styles->add( 'login',              "/wp-admin/css/login$suffix.css", array( 'buttons', 'dashicons' ) );
     619        $styles->add( 'install',            "/wp-admin/css/install$suffix.css", array( 'buttons' ) );
    620620        $styles->add( 'wp-color-picker',    "/wp-admin/css/color-picker$suffix.css" );
    621621        $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
    622622        $styles->add( 'customize-widgets',  "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
     
    630630        $styles->add( 'open-sans', $open_sans_font_url );
    631631
    632632        // Includes CSS
    633         $styles->add( 'admin-bar',      "/wp-includes/css/admin-bar$suffix.css", array( 'open-sans', 'dashicons' ) );
     633        $styles->add( 'admin-bar',      "/wp-includes/css/admin-bar$suffix.css", array( 'dashicons' ) );
    634634        $styles->add( 'wp-auth-check',  "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
    635635        $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
    636636        $styles->add( 'media-views',    "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
  • src/wp-admin/admin-header.php

     
    5050<title><?php echo $admin_title; ?></title>
    5151<?php
    5252
     53wp_enqueue_style( 'open-sans' );
    5354wp_enqueue_style( 'colors' );
    5455wp_enqueue_style( 'ie' );
    5556wp_enqueue_script('utils');
  • src/wp-admin/includes/media.php

     
    439439<title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
    440440<?php
    441441
     442wp_enqueue_style( 'open-sans' );
    442443wp_enqueue_style( 'colors' );
    443444// Check callback name for 'media'
    444445if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
  • src/wp-admin/includes/template.php

     
    15421542?>
    15431543<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title>
    15441544<?php
     1545wp_enqueue_style( 'open-sans' );
    15451546wp_enqueue_style( 'colors' );
    15461547?>
    15471548<script type="text/javascript">
  • src/wp-admin/press-this.php

     
    287287}
    288288die;
    289289}
    290 
     290        wp_enqueue_style( 'open-sans' );
    291291        wp_enqueue_style( 'colors' );
    292292        wp_enqueue_script( 'post' );
    293293        add_thickbox();