WordPress.org
Get WordPress

Make WordPress Core

Changeset 27628


Ignore:
Timestamp:
03/20/2014 12:47:21 AM (10 years ago)
Author:
helen
Message:

Further unify and refine media and view control styling. see #27320.

Location:
trunk/src/wp-includes
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

    r27579 r27628  
    349349        rectangle = dom.getRect( node );
    350350
    351         toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div> ' +
     351        toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div>' +
    352352            '<div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div>';
    353353

  • trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

    r27615 r27628  
    116116}
    117117
    118 /* Gallery, audio, vudeo placeholders */
     118/* Gallery, audio, video placeholders */
    119119.mce-content-body img.wp-media {
    120120    border: 1px solid #aaa;
    … …  
    148148.mce-content-body img.wp-media.wp-video-playlist {
    149149    background-image: url("images/playlist-video.png");
    150 }
    151 
    152 #wp-image-toolbar {
    153     position: absolute;
    154     background-color: #333;
    155 }
    156 
    157 #wp-image-toolbar .dashicons {
    158     color: white;
    159     cursor: pointer;
    160150}
    161151
    … …  
    217207 * Media previews
    218208 */
    219 .wpview-type-gallery,
    220 .wpview-type-audio,
    221 .wpview-type-video {
     209.wpview-wrap {
    222210    position: relative;
    223211    margin-bottom: 16px;
    224     cursor: pointer;
    225212    border: 1px solid transparent;
    226213}
    … …  
    253240}
    254241
     242.wpview-wrap .toolbar {
     243    position: absolute;
     244    top: 0;
     245    right: 0;
     246    display: none;
     247    z-index: 100;
     248}
     249
     250#wp-image-toolbar {
     251    position: absolute;
     252}
     253
     254.wpview-wrap .toolbar div,
     255#wp-image-toolbar div {
     256    margin-top: 7px;
     257    margin-right: 7px;
     258    padding: 2px;
     259    width: 30px;
     260    height: 30px;
     261    box-shadow: 0 1px 3px rgba(0,0,0,0.5);
     262    background-color: #000;
     263    background-color: rgba(0,0,0,0.9);
     264    cursor: pointer;
     265    color: white;
     266    font-size: 30px;
     267}
     268
     269.wpview-wrap .toolbar div:hover,
     270#wp-image-toolbar div:hover {
     271    box-shadow: 0 1px 3px rgba(0,0,0,0.8);
     272    background-color: #000;
     273    color: #2ea2cc;
     274}
     275
     276/* temporary overrides; still pending styling */
     277.wpview-type-audio .toolbar div,
     278.wont-play .toolbar div {
     279    margin: 0;
     280    padding: 3px;
     281    width: 20px;
     282    height: 20px;
     283    box-shadow: none;
     284    font-size: 20px;
     285}
     286
     287.wpview-wrap.selected .toolbar,
     288.wpview-type-audio .toolbar,
     289.wpview-type-video .toolbar {
     290    display: block;
     291}
     292
    255293.wpview-type-gallery.selected,
    256294.wpview-type-audio,
    257295.wpview-type-video {
    258     background-color: #f2f8ff;
     296    background-color: #f2f8ff; /* fallback to old blue */
     297    background-color: rgba(0,0,0,0.1);
    259298    border-color: #777;
    260 }
    261 
    262 .wpview-type-gallery .toolbar,
    263 .wpview-type-audio .toolbar,
    264 .wpview-type-video .toolbar {
    265     position: absolute;
    266     top: 0;
    267     right: 0;
    268     background-color: #333;
    269     color: white;
    270     display: none;
    271     z-index: 100;
    272 }
    273 
    274 .wpview-type-video .toolbar div,
    275 .wpview-type-gallery .toolbar div,
    276 #wp-image-toolbar div {
    277     margin: 5px;
    278 }
    279 
    280 .wpview-type-audio .toolbar div {
    281     margin: 2px 5px;
    282 }
    283 
    284 .wpview-type-audio .toolbar,
    285 .wpview-type-video .toolbar,
    286 .wpview-type-gallery.selected .toolbar {
    287     display: block;
    288 }
    289 
    290 .wpview-type-audio .toolbar span,
    291 .wpview-type-video .toolbar span,
    292 .wpview-type-gallery .toolbar span {
    293     cursor: pointer;
     299    border-color: rgba(0,0,0,0.3);
    294300}
    295301

  • trunk/src/wp-includes/media-template.php

    r27625 r27628  
    942942    <script type="text/html" id="tmpl-editor-gallery">
    943943        <div class="toolbar">
    944             <div class="dashicons dashicons-edit edit"></div>
    945             <div class="dashicons dashicons-no-alt remove"></div>
     944            <div class="dashicons dashicons-edit edit"></div><div class="dashicons dashicons-no-alt remove"></div>
    946945        </div>
    947946        <div class="gallery gallery-columns-{{{ data.columns }}}">
    … …  
    965964    <script type="text/html" id="tmpl-editor-audio">
    966965        <div class="toolbar">
    967             <div class="dashicons dashicons-format-audio edit"></div>
     966            <div class="dashicons dashicons-edit edit"></div>
    968967            <div class="dashicons dashicons-no-alt remove"></div>
    969968        </div>
    … …  
    973972    <script type="text/html" id="tmpl-editor-video">
    974973        <div class="toolbar">
    975             <div class="dashicons dashicons-format-video edit"></div>
     974            <div class="dashicons dashicons-edit edit"></div>
    976975            <div class="dashicons dashicons-no-alt remove"></div>
    977976        </div>

  • trunk/src/wp-includes/version.php

    r27616 r27628  
    55 * @global string $wp_version
    66 */
    7 $wp_version = '3.9-beta1-27615-src';
     7$wp_version = '3.9-beta1-27628-src';
    88
    99/**
    … …  
    1919 * @global string $tinymce_version
    2020 */
    21 $tinymce_version = '4020-20140319';
     21$tinymce_version = '4020-20140319a';
    2222
    2323/**
Note: See TracChangeset for help on using the changeset viewer.