WordPress.org

Make WordPress Core

Changeset 22077


Ignore:
Timestamp:
09/28/12 00:33:40 (19 months ago)
Author:
azaozz
Message:

Fix "add media" icon in DFW for IE < 9, restore media-button.png, add media-button-2x.png and make them background images, see #21019

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/media.php

    r22072 r22077  
    385385    $context = apply_filters('media_buttons_context', __('Upload/Insert %s')); 
    386386 
    387     $img = '<img src="' . esc_url( admin_url( 'images/media-button.png?ver=20111005' ) ) . '" width="16" height="16" />'; 
    388  
    389     echo '<a href="#" class="button insert-media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . ' Beta Media</a>'; 
     387    $img = '<span class="wp-media-buttons-icon"></span>'; 
     388 
     389    echo '<a href="#" class="button insert-media add_media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . ' Beta Media</a>'; 
    390390 
    391391    echo '<a href="' . esc_url( get_upload_iframe_src() ) . '" class="thickbox add_media" id="' . esc_attr( $editor_id ) . '-add_media" title="' . esc_attr__( 'Add Media' ) . '" onclick="return false;">' . sprintf( $context, $img ) . '</a>'; 
  • trunk/wp-includes/css/editor.css

    r22036 r22077  
    391391.wp_themeSkin .mceSplitButton span.mce_bullist { 
    392392    background-image: url('../images/wpicons.png?ver=20120720'); 
    393 } 
    394  
    395 @media only screen and (-webkit-min-device-pixel-ratio: 1.5) { 
    396     .wp_themeSkin span.mce_undo, 
    397     .wp_themeSkin span.mce_redo, 
    398     .wp_themeSkin span.mce_bullist, 
    399     .wp_themeSkin span.mce_numlist, 
    400     .wp_themeSkin span.mce_blockquote, 
    401     .wp_themeSkin span.mce_charmap, 
    402     .wp_themeSkin span.mce_bold, 
    403     .wp_themeSkin span.mce_italic, 
    404     .wp_themeSkin span.mce_underline, 
    405     .wp_themeSkin span.mce_justifyleft, 
    406     .wp_themeSkin span.mce_justifyright, 
    407     .wp_themeSkin span.mce_justifycenter, 
    408     .wp_themeSkin span.mce_justifyfull, 
    409     .wp_themeSkin span.mce_indent, 
    410     .wp_themeSkin span.mce_outdent, 
    411     .wp_themeSkin span.mce_link, 
    412     .wp_themeSkin span.mce_unlink, 
    413     .wp_themeSkin span.mce_help, 
    414     .wp_themeSkin span.mce_removeformat, 
    415     .wp_themeSkin span.mce_fullscreen, 
    416     .wp_themeSkin span.mce_wp_fullscreen, 
    417     .wp_themeSkin span.mce_media, 
    418     .wp_themeSkin span.mce_pastetext, 
    419     .wp_themeSkin span.mce_pasteword, 
    420     .wp_themeSkin span.mce_wp_help, 
    421     .wp_themeSkin span.mce_wp_adv, 
    422     .wp_themeSkin span.mce_wp_more, 
    423     .wp_themeSkin span.mce_strikethrough, 
    424     .wp_themeSkin span.mce_spellchecker, 
    425     .wp_themeSkin span.mce_forecolor, 
    426     .wp_themeSkin .mce_forecolorpicker, 
    427     .wp_themeSkin .mceSplitButton .mce_spellchecker span.mce_spellchecker, 
    428     .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor, 
    429     .wp_themeSkin .mceSplitButton span.mce_numlist, 
    430     .wp_themeSkin .mceSplitButton span.mce_bullist { 
    431         background-image: url('../images/wpicons-2x.png?ver=20120720'); 
    432         background-size: 560px 40px; 
    433     } 
    434393} 
    435394 
     
    10991058} 
    11001059 
     1060.wp-media-buttons span.wp-media-buttons-icon { 
     1061    display: inline-block; 
     1062    width: 16px; 
     1063    height: 16px; 
     1064    vertical-align: text-top; 
     1065    margin: 0 2px; 
     1066} 
     1067 
     1068.wp-media-buttons .add_media span.wp-media-buttons-icon { 
     1069    background: url('../../wp-admin/images/media-button.png') no-repeat top left; 
     1070} 
     1071 
    11011072.quicktags-toolbar { 
    11021073    border-bottom-style: solid; 
     
    18691840} 
    18701841 
    1871 #wp-fullscreen-buttons .mce_image .mce_image { 
    1872     background-image: url('../../wp-admin/images/media-button.png?ver=20120201'); 
    1873     background-position: top left; 
    1874     background-size: 100%; 
     1842#wp-fullscreen-buttons #wp_fs_image span.mce_image { 
     1843    background-image: url('../../wp-admin/images/media-button.png'); 
     1844    background-position: 2px 2px; 
    18751845} 
    18761846 
     
    20502020/* No RTL for now, this space intentionally left blank */ 
    20512021 
     2022 
     2023/* HiDPI */ 
     2024@media only screen and (-webkit-min-device-pixel-ratio: 1.5) { 
     2025    .wp_themeSkin span.mce_undo, 
     2026    .wp_themeSkin span.mce_redo, 
     2027    .wp_themeSkin span.mce_bullist, 
     2028    .wp_themeSkin span.mce_numlist, 
     2029    .wp_themeSkin span.mce_blockquote, 
     2030    .wp_themeSkin span.mce_charmap, 
     2031    .wp_themeSkin span.mce_bold, 
     2032    .wp_themeSkin span.mce_italic, 
     2033    .wp_themeSkin span.mce_underline, 
     2034    .wp_themeSkin span.mce_justifyleft, 
     2035    .wp_themeSkin span.mce_justifyright, 
     2036    .wp_themeSkin span.mce_justifycenter, 
     2037    .wp_themeSkin span.mce_justifyfull, 
     2038    .wp_themeSkin span.mce_indent, 
     2039    .wp_themeSkin span.mce_outdent, 
     2040    .wp_themeSkin span.mce_link, 
     2041    .wp_themeSkin span.mce_unlink, 
     2042    .wp_themeSkin span.mce_help, 
     2043    .wp_themeSkin span.mce_removeformat, 
     2044    .wp_themeSkin span.mce_fullscreen, 
     2045    .wp_themeSkin span.mce_wp_fullscreen, 
     2046    .wp_themeSkin span.mce_media, 
     2047    .wp_themeSkin span.mce_pastetext, 
     2048    .wp_themeSkin span.mce_pasteword, 
     2049    .wp_themeSkin span.mce_wp_help, 
     2050    .wp_themeSkin span.mce_wp_adv, 
     2051    .wp_themeSkin span.mce_wp_more, 
     2052    .wp_themeSkin span.mce_strikethrough, 
     2053    .wp_themeSkin span.mce_spellchecker, 
     2054    .wp_themeSkin span.mce_forecolor, 
     2055    .wp_themeSkin .mce_forecolorpicker, 
     2056    .wp_themeSkin .mceSplitButton .mce_spellchecker span.mce_spellchecker, 
     2057    .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor, 
     2058    .wp_themeSkin .mceSplitButton span.mce_numlist, 
     2059    .wp_themeSkin .mceSplitButton span.mce_bullist { 
     2060        background-image: url('../images/wpicons-2x.png?ver=20120720'); 
     2061        background-size: 560px 40px; 
     2062    } 
     2063 
     2064    .wp-media-buttons .add_media span.wp-media-buttons-icon, 
     2065    #wp-fullscreen-buttons #wp_fs_image span.mce_image { 
     2066        background-image: url('../../wp-admin/images/media-button-2x.png'); 
     2067        background-size: 16px 16px; 
     2068    } 
     2069} 
     2070 
Note: See TracChangeset for help on using the changeset viewer.