WordPress.org
Get WordPress

Make WordPress Core

Ticket #28844: 28844.diff

File 28844.diff, 7.2 KB (added by ericlewis, 10 years ago)

  • src/wp-includes/css/media-views.css 

    diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index be3179a..8e41acf 100644
    a b  
    118118        z-index: 160000;
    119119}
    120120
     121.upload-php .media-modal {
     122        top: 0;
     123        left: 0;
     124        right: 0;
     125        bottom: 0;
     126}
     127
    121128.wp-customizer .media-modal {
    122129        z-index: 560000;
    123130}
    … … video#inline-media-node { 
    15321539        margin-top: 14px;
    15331540}
    15341541
    1535 .media-sidebar .settings-save-status {
    1536         background: #f5f5f5;
     1542/**
     1543 * Attachment Details
     1544 */
     1545.attachment-details {
     1546        position: relative;
     1547        overflow: auto;
     1548}
     1549
     1550.attachment-details .settings-save-status {
    15371551        float: right;
    15381552        text-transform: none;
    15391553        z-index: 10;
    15401554}
    15411555
    1542 .media-sidebar .settings-save-status .spinner {
     1556.attachment-details .settings-save-status .spinner {
    15431557        margin: 0 5px 0;
    15441558}
    15451559
    1546 .media-sidebar .settings-save-status .saved {
     1560.attachment-details .settings-save-status .saved {
    15471561        float: right;
    15481562        display: none;
    15491563}
    15501564
    1551 .media-sidebar .save-waiting .settings-save-status .spinner,
    1552 .media-sidebar .save-complete .settings-save-status .saved {
     1565.attachment-details.save-waiting .settings-save-status .spinner,
     1566.attachment-details.save-complete .settings-save-status .saved {
    15531567        display: block;
    15541568}
    15551569
    1556 /**
    1557  * Attachment Details
    1558  */
    1559 .attachment-details {
    1560         position: relative;
    1561         overflow: auto;
    1562 }
    1563 
    15641570.attachment-info {
    15651571        overflow: hidden;
    15661572        min-height: 60px;
    … … video#inline-media-node { 
    26712677        float: left;
    26722678        text-align: center;
    26732679        border: 0;
     2680        border-bottom: 1px solid #ddd;
    26742681        border-right: 1px solid #ddd;
    26752682}
    26762683
    … … video#inline-media-node { 
    27352742        right: 0;
    27362743        left: 0;
    27372744}
    2738 
    2739 .edit-attachment-frame .attachment-info {
    2740         border-bottom: 0;
    2741         border-right: 1px solid #ddd;
    2742         bottom: 0;
     2745.edit-attachment-frame .attachment-media-view {
    27432746        position: absolute;
    27442747        top: 0;
     2748        bottom: 0;
    27452749        left: 0;
    2746         right: 50%;
    2747         margin-bottom: 0;
    2748         padding: 2% 4% 0;
    2749         height: 98%; /* 100% - padding percentage above */
     2750        right: 35%;
    27502751}
    27512752
    27522753.edit-attachment-frame .attachment-info .thumbnail {
    … … video#inline-media-node { 
    27652766                box-shadow: none;
    27662767}
    27672768
     2769.edit-attachment-frame .attachment-media-view .thumbnail {
     2770        text-align: center;
     2771}
     2772
     2773.edit-attachment-frame .attachment-media-view img {
     2774        max-width: 100%;
     2775}
     2776
    27682777.edit-attachment-frame .attachment-info .thumbnail img {
    27692778        max-width: 100%;
    27702779        max-height: 100%;
    … … video#inline-media-node { 
    27782787        margin-bottom: 12px;
    27792788}
    27802789
    2781 .edit-attachment-frame .attachment-fields {
    2782         bottom: 0;
    2783         padding: 2% 4%;
     2790.edit-attachment-frame .attachment-info {
     2791        border-bottom: 0;
     2792        border-left: 1px solid #ddd;
    27842793        position: absolute;
     2794        margin-bottom: 0;
     2795        height: 98%; /* 100% - padding percentage above */
     2796        padding: 2% 4% 0;
    27852797        top: 0;
    2786         left: 50%;
     2798        bottom: 0;
     2799        left: 65%;
    27872800        right: 0;
    27882801}
    27892802
    2790 .edit-attachment-frame .attachment-fields .setting {
     2803.edit-attachment-frame .attachment-info .setting {
    27912804        display: block;
    27922805        float: left;
    27932806        width: 100%;
    27942807        margin: 1px 0;
    27952808}
    27962809
    2797 .edit-attachment-frame .attachment-fields .setting label {
     2810.edit-attachment-frame .attachment-info .setting label {
    27982811        display: block;
    27992812}
    28002813
    2801 .edit-attachment-frame .attachment-fields .setting .link-to-custom {
     2814.edit-attachment-frame .attachment-info .setting .link-to-custom {
    28022815        margin: 3px 0;
    28032816}
    28042817
    2805 .edit-attachment-frame .attachment-fields .setting .name {
     2818.edit-attachment-frame .attachment-info .setting .name {
    28062819        min-width: 30%;
    28072820        margin-right: 4%;
    28082821        font-size: 12px;
    28092822        text-align: right;
    28102823}
    28112824
    2812 .edit-attachment-frame .attachment-fields .setting select {
     2825.edit-attachment-frame .attachment-info .setting select {
    28132826        max-width: 65%;
    28142827}
    28152828
    2816 .edit-attachment-frame .attachment-fields .setting input[type="checkbox"],
    2817 .edit-attachment-frame .attachment-fields .field input[type="checkbox"] {
     2829.edit-attachment-frame .attachment-info .setting input[type="checkbox"],
     2830.edit-attachment-frame .attachment-info .field input[type="checkbox"] {
    28182831        width: 16px;
    28192832        float: none;
    28202833        margin: 8px 3px 0;
    28212834        padding: 0;
    28222835}
    28232836
    2824 .edit-attachment-frame .attachment-fields .setting span {
     2837.edit-attachment-frame .attachment-info .setting span {
    28252838        float: left;
    28262839        min-height: 22px;
    28272840        padding-top: 8px;
    … … video#inline-media-node { 
    28302843        color: #666;
    28312844}
    28322845
    2833 .edit-attachment-frame .attachment-fields .setting input[type="text"],
    2834 .edit-attachment-frame .attachment-fields .setting input[type="password"],
    2835 .edit-attachment-frame .attachment-fields .setting input[type="number"],
    2836 .edit-attachment-frame .attachment-fields .setting input[type="search"],
    2837 .edit-attachment-frame .attachment-fields .setting input[type="email"],
    2838 .edit-attachment-frame .attachment-fields .setting input[type="url"],
    2839 .edit-attachment-frame .attachment-fields .setting textarea,
    2840 .edit-attachment-frame .attachment-fields .setting .value {
     2846.edit-attachment-frame .attachment-info .setting input[type="text"],
     2847.edit-attachment-frame .attachment-info .setting input[type="password"],
     2848.edit-attachment-frame .attachment-info .setting input[type="number"],
     2849.edit-attachment-frame .attachment-info .setting input[type="search"],
     2850.edit-attachment-frame .attachment-info .setting input[type="email"],
     2851.edit-attachment-frame .attachment-info .setting input[type="url"],
     2852.edit-attachment-frame .attachment-info .setting textarea,
     2853.edit-attachment-frame .attachment-info .setting .value {
    28412854        margin: 1px;
    28422855        width: 65%;
    28432856        float: right;
    … … video#inline-media-node { 
    28472860        box-sizing: border-box;
    28482861}
    28492862
    2850 .edit-attachment-frame .attachment-fields .setting textarea {
     2863.edit-attachment-frame .attachment-info .setting textarea {
    28512864        height: 62px;
    28522865        resize: vertical;
    28532866}
    28542867
    2855 .edit-attachment-frame .attachment-fields select {
     2868.edit-attachment-frame .attachment-info select {
    28562869        margin-top: 3px;
    28572870}
    28582871

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

    diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 4dda581..641a1e7 100644
    a b function wp_print_media_templates() { 
    265265        <script type="text/html" id="tmpl-attachment-details-two-column">
    266266                <h3>
    267267                        <?php _e('Attachment Details'); ?>
    268 
    269                         <span class="settings-save-status">
    270                                 <span class="spinner"></span>
    271                                 <span class="saved"><?php esc_html_e('Saved.'); ?></span>
    272                         </span>
    273268                </h3>
    274                 <div class="attachment-info">
     269                <div class="attachment-media-view">
    275270                        <div class="thumbnail thumbnail-{{ data.type }}">
    276271                                <# if ( data.uploading ) { #>
    277272                                        <div class="media-progress-bar"><div></div></div>
    … … function wp_print_media_templates() { 
    296291                                </video>
    297292                        </div>
    298293                        <# } #>
     294                </div>
     295                <div class="attachment-info">
     296                        <span class="settings-save-status">
     297                                <span class="spinner"></span>
     298                                <span class="saved"><?php esc_html_e('Saved.'); ?></span>
     299                        </span>
    299300                        <div class="details">
    300301                                <div class="filename"><strong><?php _e( 'File name:' ); ?></strong> {{ data.filename }}</div>
    301302                                <div class="filename"><strong><?php _e( 'File type:' ); ?></strong> {{ data.mime }}</div>
    … … function wp_print_media_templates() { 
    326327                                        <# } #>
    327328                                </div>
    328329                        </div>
    329                 </div>
    330                 <div class="attachment-fields">
    331330                        <label class="setting" data-setting="url">
    332331                                <span class="name"><?php _e('URL'); ?></span>
    333332                                <input type="text" value="{{ data.url }}" readonly />