WordPress.org
Get WordPress

Make WordPress Core

Ticket #46964: 46964.3.diff

File 46964.3.diff, 17.4 KB (added by joedolson, 5 years ago)

Preserves #poststuff and #postbox-container in CSS for backcompat

  • src/js/_enqueues/admin/postbox.js

     
    363363                        if ( side.length ) {
    364364                                if ( side.children('.postbox:visible').length )
    365365                                        side.removeClass('empty-container');
    366                                 else if ( $('#postbox-container-1').css('width') == '280px' )
     366                                else if ( $('.postbox-container-1').css('width') == '280px' )
    367367                                        side.addClass('empty-container');
    368368                        }
    369369                },

  • src/js/_enqueues/wp/editor/dfw.js

     
    3131                        $menuBar = $(),
    3232                        $statusBar = $(),
    3333                        $sideSortables = $( '#side-sortables' ),
    34                         $postboxContainer = $( '#postbox-container-1' ),
     34                        $postboxContainer = $( '.postbox-container-1' ),
    3535                        $postBody = $('#post-body'),
    3636                        fullscreen = window.wp.editor && window.wp.editor.fullscreen,
    3737                        mceEditor,

  • src/wp-admin/css/common.css

     
    20092009}
    20102010
    20112011.metabox-holder.columns-1 .postbox-container .empty-container,
    2012 .columns-2 #postbox-container-3 .empty-container,
    2013 .columns-2 #postbox-container-4 .empty-container,
    2014 .columns-3 #postbox-container-4 .empty-container {
     2012.columns-2 .postbox-container-3 .empty-container,
     2013.columns-2 .postbox-container-4 .empty-container,
     2014.columns-3 .postbox-container-4 .empty-container,
     2015.columns-2 #postbox-container-3 .empty-container, /* Back-compat for pre 5.4 */
     2016.columns-2 #postbox-container-4 .empty-container, /* Back-compat for pre 5.4 */
     2017.columns-3 #postbox-container-4 .empty-container { /* Back-compat for pre 5.4 */
    20152018        border: 0 none;
    20162019        height: 0;
    20172020        min-height: 0;
    … …  
    20232026        float: left;
    20242027}
    20252028
    2026 #post-body.columns-2 #postbox-container-1 {
     2029#post-body.columns-2 .postbox-container-1,
     2030#post-body.columns-2 #postbox-container-1  { /* Back-compat for pre 5.4 */
    20272031        float: right;
    20282032        margin-right: -300px;
    20292033        width: 280px;

  • src/wp-admin/css/dashboard.css

     
    77}
    88
    99#wpbody-content #dashboard-widgets.columns-2 .postbox-container-2,
    10 #wpbody-content #dashboard-widgets.columns-2 #postbox-container-3,
    11 #wpbody-content #dashboard-widgets.columns-2 #postbox-container-4 {
     10#wpbody-content #dashboard-widgets.columns-2 .postbox-container-3,
     11#wpbody-content #dashboard-widgets.columns-2 .postbox-container-4,
     12#wpbody-content #dashboard-widgets.columns-2 #postbox-container-2, /* Back-compat for pre 5.4 */
     13#wpbody-content #dashboard-widgets.columns-2 #postbox-container-3, /* Back-compat for pre 5.4 */
     14#wpbody-content #dashboard-widgets.columns-2 #postbox-container-4  { /* Back-compat for pre 5.4 */
    1215        float: right;
    1316        width: 50.5%;
    1417}
    … …  
    1720        width: 33.5%;
    1821}
    1922
    20 #wpbody-content #dashboard-widgets.columns-3 #postbox-container-1 {
     23#wpbody-content #dashboard-widgets.columns-3 .postbox-container-1,
     24#wpbody-content #dashboard-widgets.columns-3 #postbox-container-1 { /* Back-compat for pre 5.4 */
    2125        width: 33%;
    2226}
    2327
    24 #wpbody-content #dashboard-widgets.columns-3 #postbox-container-3,
    25 #wpbody-content #dashboard-widgets.columns-3 #postbox-container-4 {
     28#wpbody-content #dashboard-widgets.columns-3 .postbox-container-3,
     29#wpbody-content #dashboard-widgets.columns-3 .postbox-container-4,
     30#wpbody-content #dashboard-widgets.columns-3 #postbox-container-3, /* Back-compat for pre 5.4 */
     31#wpbody-content #dashboard-widgets.columns-3 #postbox-container-4 { /* Back-compat for pre 5.4 */
    2632        float: right;
    2733}
    2834
    … …  
    3440        width: 25%;
    3541}
    3642
    37 #dashboard-widgets-wrap .columns-3 #postbox-container-4 .empty-container {
     43#dashboard-widgets-wrap .columns-3 .postbox-container-4 .empty-container,
     44#dashboard-widgets-wrap .columns-3 #postbox-container-4 .empty-container { /* Back-compat for pre 5.4 */
    3845        border: none !important;
    3946}
    4047
    … …  
    4350}
    4451
    4552.ie8 #wpbody-content #dashboard-widgets .postbox-container-2,
    46 .ie8 #wpbody-content #dashboard-widgets #postbox-container-3,
    47 .ie8 #wpbody-content #dashboard-widgets #postbox-container-4 {
     53.ie8 #wpbody-content #dashboard-widgets .postbox-container-3,
     54.ie8 #wpbody-content #dashboard-widgets .postbox-container-4,
     55.ie8 #wpbody-content #dashboard-widgets #postbox-container-2, /* Back-compat for pre 5.4 */
     56.ie8 #wpbody-content #dashboard-widgets #postbox-container-3, /* Back-compat for pre 5.4 */
     57.ie8 #wpbody-content #dashboard-widgets #postbox-container-4  { /* Back-compat for pre 5.4 */
    4858        float: right;
    4959        width: 50.5%;
    5060}
    5161
    52 .ie8 #dashboard-widgets #postbox-container-3 .empty-container,
    53 .ie8 #dashboard-widgets #postbox-container-4 .empty-container {
     62.ie8 #dashboard-widgets .postbox-container-3 .empty-container,
     63.ie8 #dashboard-widgets .postbox-container-4 .empty-container,
     64.ie8 #dashboard-widgets #postbox-container-3 .empty-container, /* Back-compat for pre 5.4 */
     65.ie8 #dashboard-widgets #postbox-container-4 .empty-container  { /* Back-compat for pre 5.4 */
    5466        border: 0 none;
    5567        height: 0;
    5668        min-height: 0;
    … …  
    11131125        }
    11141126
    11151127        #wpbody-content #dashboard-widgets .postbox-container-2,
    1116         #wpbody-content #dashboard-widgets #postbox-container-3,
    1117         #wpbody-content #dashboard-widgets #postbox-container-4 {
     1128        #wpbody-content #dashboard-widgets .postbox-container-3,
     1129        #wpbody-content #dashboard-widgets .postbox-container-4,
     1130        #wpbody-content #dashboard-widgets #postbox-container-2, /* Back-compat for pre 5.4 */
     1131        #wpbody-content #dashboard-widgets #postbox-container-3, /* Back-compat for pre 5.4 */
     1132        #wpbody-content #dashboard-widgets #postbox-container-4  { /* Back-compat for pre 5.4 */
    11181133                float: right;
    11191134                width: 50.5%;
    11201135        }
    11211136
    1122         #dashboard-widgets #postbox-container-3 .empty-container,
    1123         #dashboard-widgets #postbox-container-4 .empty-container {
     1137        #dashboard-widgets .postbox-container-3 .empty-container,
     1138        #dashboard-widgets .postbox-container-4 .empty-container,
     1139        #dashboard-widgets #postbox-container-3 .empty-container, /* Back-compat for pre 5.4 */
     1140        #dashboard-widgets #postbox-container-4 .empty-container { /* Back-compat for pre 5.4 */
    11241141                border: 0 none;
    11251142                height: 0;
    11261143                min-height: 0;
    11271144        }
    11281145
    1129         #dashboard-widgets #postbox-container-3 .empty-container:after,
    1130         #dashboard-widgets #postbox-container-4 .empty-container:after {
     1146        #dashboard-widgets .postbox-container-3 .empty-container:after,
     1147        #dashboard-widgets .postbox-container-4 .empty-container:after,
     1148        #dashboard-widgets #postbox-container-3 .empty-container:after, /* Back-compat for pre 5.4 */
     1149        #dashboard-widgets #postbox-container-4 .empty-container:after { /* Back-compat for pre 5.4 */
    11311150                display: none;
    11321151        }
    11331152
    … …  
    11591178
    11601179/* three columns on the dash */
    11611180@media only screen and (min-width: 1500px) and (max-width: 1800px) {
    1162         #wpbody-content #dashboard-widgets .postbox-container {
     1181        #wpbody-content #dashboard-widgets .postbox-container  {
    11631182                width: 33.5%;
    11641183        }
    11651184
    1166         #wpbody-content #dashboard-widgets #postbox-container-1 {
     1185        #wpbody-content #dashboard-widgets .postbox-container-1,
     1186        #wpbody-content #dashboard-widgets #postbox-container-1 { /* Back-compat for pre 5.4 */
    11671187                width: 33%;
    11681188        }
    11691189
    1170         #wpbody-content #dashboard-widgets #postbox-container-3,
    1171         #wpbody-content #dashboard-widgets #postbox-container-4 {
     1190        #wpbody-content #dashboard-widgets .postbox-container-3,
     1191        #wpbody-content #dashboard-widgets .postbox-container-4,
     1192        #wpbody-content #dashboard-widgets #postbox-container-3, /* Back-compat for pre 5.4 */
     1193        #wpbody-content #dashboard-widgets #postbox-container-4 { /* Back-compat for pre 5.4 */
    11721194                float: right;
    11731195        }
    11741196
    1175         #dashboard-widgets #postbox-container-4 .empty-container {
     1197        #dashboard-widgets .postbox-container-4 .empty-container,
     1198        #dashboard-widgets #postbox-container-4 .empty-container  { /* Back-compat for pre 5.4 */
    11761199                border: 0 none;
    11771200                height: 0;
    11781201                min-height: 0;
    11791202        }
    11801203
    1181         #dashboard-widgets #postbox-container-4 .empty-container:after {
     1204        #dashboard-widgets .postbox-container-4 .empty-container:after,
     1205        #dashboard-widgets #postbox-container-4 .empty-container:after { /* Back-compat for pre 5.4 */
    11821206                display: none;
    11831207        }
    11841208

  • src/wp-admin/css/edit.css

     
    1 .poststuff {
     1.poststuff,
     2#poststuff { /* Back-compat for pre 5.4 */
    23        padding-top: 10px;
    34        min-width: 763px;
    45}
    56
    6 .poststuff #post-body {
     7.poststuff #post-body,
     8#poststuff #post-body { /* Back-compat for pre 5.4 */
    79        padding: 0;
    810}
    911
    10 .poststuff .postbox-container {
     12.poststuff .postbox-container,
     13#poststuff .postbox-container { /* Back-compat for pre 5.4 */
    1114        width: 100%;
    1215}
    1316
    14 .poststuff #post-body.columns-2 {
     17.poststuff #post-body.columns-2,
     18#poststuff #post-body.columns-2 { /* Back-compat for pre 5.4 */
    1519        margin-right: 300px;
    1620}
    1721
    … …  
    5155        margin: 0;
    5256}
    5357
    54 .poststuff #titlewrap {
     58.poststuff #titlewrap,
     59#poststuff #titlewrap { /* Back-compat for pre 5.4 */
    5560        border: 0;
    5661        padding: 0;
    5762}
    … …  
    414419        padding-top: 20px;
    415420}
    416421
    417 .poststuff #post-body.columns-2 #side-sortables {
     422.poststuff #post-body.columns-2 #side-sortables,
     423#poststuff #post-body.columns-2 #side-sortables { /* Back-compat for pre 5.4 */
    418424        width: 280px;
    419425}
    420426
    … …  
    598604
    599605.poststuff h3.hndle, /* Back-compat for pre-4.4 */
    600606.poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
    601 .poststuff h2 {
     607.poststuff h2,
     608#poststuff h3.hndle, /* Back-compat for pre-5.4 */
     609#poststuff .stuffbox > h3, /* Back-compat for pre-5.4 */
     610#poststuff h2  {
    602611        font-size: 14px;
    603612        padding: 8px 12px;
    604613        margin: 0;
    605614        line-height: 1.4;
    606615}
    607616
    608 .poststuff .stuffbox h2 {
     617.poststuff .stuffbox h2,
     618#poststuff .stuffbox h2  { /* Back-compat for pre-5.4 */
    609619        padding: 8px 10px;
    610620}
    611621
    612 .poststuff .inside {
     622.poststuff .inside,
     623#poststuff .inside { /* Back-compat for pre-5.4 */
    613624        margin: 6px 0 0 0;
    614625}
    615626
    616 .poststuff .stuffbox .inside {
     627.poststuff .stuffbox .inside,
     628#poststuff .stuffbox .inside { /* Back-compat for pre-5.4 */
    617629        margin: 0;
    618630}
    619631
    620632.poststuff .inside #parent_id,
    621 .poststuff .inside #page_template {
     633.poststuff .inside #page_template,
     634#poststuff .inside #parent_id, /* Back-compat for pre-5.4 */
     635#poststuff .inside #page_template { /* Back-compat for pre-5.4 */
    622636        max-width: 100%;
    623637}
    624638
    625639.ie8 .poststuff .inside #parent_id,
    626 .ie8 .poststuff .inside #page_template {
     640.ie8 .poststuff .inside #page_template,
     641.ie8 #poststuff .inside #parent_id, /* Back-compat for pre-5.4 */
     642.ie8 #poststuff .inside #page_template { /* Back-compat for pre-5.4 */
    627643        width: 250px;
    628644}
    629645
    … …  
    642658}
    643659
    644660#linksubmitdiv .inside, /* Old Link Manager back-compat. */
    645 .poststuff #submitdiv .inside {
     661.poststuff #submitdiv .inside,
     662#poststuff #submitdiv .inside { /* Back-compat for pre-5.4 */
    646663        margin: 0;
    647664        padding: 0;
    648665}
    … …  
    10901107/*------------------------------------------------------------------------------
    10911108  13.0 - Tags
    10921109------------------------------------------------------------------------------*/
    1093 
     1110#poststuff .tagsdiv .ajaxtag, /* Back-compat for pre 5.4 */
    10941111.poststuff .tagsdiv .ajaxtag {
    10951112        margin-top: 1em;
    10961113}
    10971114
    1098 .poststuff .tagsdiv .howto {
     1115#poststuff .tagsdiv .howto, /* Back-compat for pre 5.4 */
     1116.poststuff .tagsdiv .howto  {
    10991117        margin: 1em 0 6px 0;
    11001118}
    11011119
    … …  
    11401158        margin: 2px 0 12px;
    11411159}
    11421160
     1161#poststuff .inside .the-tagcloud, /* Back-compat for pre 5.4 */
    11431162.poststuff .inside .the-tagcloud {
    11441163        margin: 5px 0 10px;
    11451164        padding: 8px;
    … …  
    14121431
    14131432/* one column on the post write/edit screen */
    14141433@media only screen and (max-width: 850px) {
     1434        #poststuff, /* Back-compat for pre 5.4 */
    14151435        .poststuff {
    14161436                min-width: 0;
    14171437        }
    14181438
     1439        #wpbody-content #poststuff #post-body, /* Back-compat for pre 5.4 */
    14191440        #wpbody-content .poststuff #post-body {
    14201441                margin: 0;
    14211442        }
    14221443
    1423         #wpbody-content #post-body.columns-2 #postbox-container-1 {
     1444        #wpbody-content #post-body.columns-2 #postbox-container-1, /* Back-compat for pre 5.4 */
     1445        #wpbody-content #post-body.columns-2 .postbox-container-1 {
    14241446                margin-right: 0;
    14251447                width: 100%;
    14261448        }
    14271449
    1428         .poststuff #postbox-container-1 .empty-container,
    1429         .poststuff #postbox-container-1 #side-sortables:empty {
     1450        .poststuff #postbox-container-1 .empty-container, /* Back-compat for pre 5.4 */
     1451        .poststuff #postbox-container-1 #side-sortables:empty, /* Back-compat for pre 5.4 */
     1452        .poststuff .postbox-container-1 .empty-container,
     1453        .poststuff .postbox-container-1 #side-sortables:empty {
    14301454                border: 0 none;
    14311455                height: 0;
    14321456                min-height: 0;
    14331457        }
    14341458
     1459        #poststuff #post-body.columns-2 #side-sortables, /* Back-compat for pre 5.4 */
    14351460        .poststuff #post-body.columns-2 #side-sortables {
    14361461                min-height: 0;
    14371462                width: auto;
    … …  
    14611486                padding: 0 2px 4px 0;
    14621487        }
    14631488
     1489        #poststuff h2, /* Back-compat for pre 5.4 */
    14641490        .poststuff h3.hndle, /* Back-compat for pre-4.4 */
    14651491        .poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
    14661492        .poststuff h2 {

  • src/wp-admin/css/ie.css

     
    1313        width: 49.5%;
    1414}
    1515
     16#wpbody-content #dashboard-widgets #postbox-container-2, /* Back-compat for pre 5.4 */
     17#wpbody-content #dashboard-widgets #postbox-container-3, /* Back-compat for pre 5.4 */
     18#wpbody-content #dashboard-widgets #postbox-container-4, /* Back-compat for pre 5.4 */
    1619#wpbody-content #dashboard-widgets .postbox-container-2,
    17 #wpbody-content #dashboard-widgets #postbox-container-3,
    18 #wpbody-content #dashboard-widgets #postbox-container-4 {
     20#wpbody-content #dashboard-widgets .postbox-container-3,
     21#wpbody-content #dashboard-widgets .postbox-container-4 {
    1922        float: right;
    2023        width: 50.5%;
    2124}
    2225
    23 #dashboard-widgets #postbox-container-3 .empty-container,
    24 #dashboard-widgets #postbox-container-4 .empty-container {
     26#dashboard-widgets #postbox-container-3 .empty-container, /* Back-compat for pre 5.4 */
     27#dashboard-widgets #postbox-container-4 .empty-container, /* Back-compat for pre 5.4 */
     28#dashboard-widgets .postbox-container-3 .empty-container,
     29#dashboard-widgets .postbox-container-4 .empty-container  {
    2530        border: 0 none;
    2631        height: 0;
    2732        min-height: 0;
    … …  
    3843        width: 97%;
    3944}
    4045
    41 #post-body.columns-2 #postbox-container-1 {
     46#post-body.columns-2 #postbox-container-1, /* Back-compat for pre 5.4 */
     47#post-body.columns-2 .postbox-container-1 {
    4248        padding-left: 19px;
    4349}
    4450

  • src/wp-admin/css/media.css

     
    10331033        display: block;
    10341034}
    10351035
     1036#poststuff .imgedit-group-top h2, /* Back-compat for pre 5.3 */
    10361037.poststuff .imgedit-group-top h2 {
    10371038        display: inline-block;
    10381039        margin: 0;
    … …  
    10411042        line-height: 1.4;
    10421043}
    10431044
     1045#poststuff .imgedit-group-top .button-link, /* Back-compat for pre 5.3 */
    10441046.poststuff .imgedit-group-top .button-link {
    10451047        text-decoration: none;
    10461048        color: #23282d;

  • src/wp-admin/edit-form-advanced.php

     
    639639?>
    640640</div><!-- /post-body-content -->
    641641
    642 <div id="postbox-container-1" class="postbox-container">
     642<div class="postbox-container-1 postbox-container">
    643643<?php
    644644
    645645if ( 'page' == $post_type ) {

  • src/wp-admin/edit-form-comment.php

     
    8585</div>
    8686</div><!-- /post-body-content -->
    8787
    88 <div id="postbox-container-1" class="postbox-container">
     88<div class="postbox-container-1 postbox-container">
    8989<div id="submitdiv" class="stuffbox" >
    9090<h2><?php _e( 'Status' ); ?></h2>
    9191<div class="inside">

  • src/wp-admin/edit-link-form.php

     
    135135</div>
    136136</div><!-- /post-body-content -->
    137137
    138 <div id="postbox-container-1" class="postbox-container">
     138<div class="postbox-container-1 postbox-container">
    139139<?php
    140140
    141141/** This action is documented in wp-admin/includes/meta-boxes.php */

  • src/wp-admin/includes/dashboard.php

     
    242242
    243243        ?>
    244244<div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
    245         <div id="postbox-container-1" class="postbox-container">
     245        <div class="postbox-container-1 postbox-container">
    246246        <?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
    247247        </div>
    248248        <div class="postbox-container-2 postbox-container">
    249249        <?php do_meta_boxes( $screen->id, 'side', '' ); ?>
    250250        </div>
    251         <div id="postbox-container-3" class="postbox-container">
     251        <div class="postbox-container-3 postbox-container">
    252252        <?php do_meta_boxes( $screen->id, 'column3', '' ); ?>
    253253        </div>
    254         <div id="postbox-container-4" class="postbox-container">
     254        <div class="postbox-container-4 postbox-container">
    255255        <?php do_meta_boxes( $screen->id, 'column4', '' ); ?>
    256256        </div>
    257257</div>