golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't show dashed border on empty postbox containers under the editor, see #20015 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2012-03-28 02:10:19 +00:00
parent a280584422
commit 09360b1a92
2 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
wp-admin/css/wp-admin.dev.css
View File

@ -1835,7 +1835,6 @@ body.admin-bar {
} }
.postbox-container .meta-box-sortables { .postbox-container .meta-box-sortables {
min-height: 50px;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-ms-box-sizing: border-box; -ms-box-sizing: border-box;
@ -1847,7 +1846,8 @@ body.admin-bar {
height: 0; height: 0;
} }
.metabox-holder .postbox-container .empty-container { .metabox-holder .postbox-container .empty-container,
#post-body.columns-2 #side-sortables:empty {
border: 3px dashed #CCCCCC; border: 3px dashed #CCCCCC;
height: 250px; height: 250px;
} }
@ -1888,8 +1888,12 @@ body.admin-bar {
width: 280px; width: 280px;
} }
#post-body.columns-2 #side-sortables {
min-height: 250px;
}
/* one column on the dash */ /* one column on the dash */
@media only screen and (max-width: 768px) { @media only screen and (max-width: 799px) {
#wpbody-content #dashboard-widgets .postbox-container { #wpbody-content #dashboard-widgets .postbox-container {
width: 100%; width: 100%;
} }
@ -1902,26 +1906,26 @@ body.admin-bar {
} }
/* two columns on the dash, but keep the setting if one is selected */ /* two columns on the dash, but keep the setting if one is selected */
@media only screen and (min-width: 768px) and (max-width: 1200px) { @media only screen and (min-width: 800px) and (max-width: 1200px) {
#wpbody-content #dashboard-widgets .postbox-container { #wpbody-content #dashboard-widgets .postbox-container {
width: 49.5%; width: 49.5%;
} }
#wpbody-content #dashboard-widgets #postbox-container-2, #wpbody-content #dashboard-widgets #postbox-container-2,
#wpbody-content #dashboard-widgets #postbox-container-3, #wpbody-content #dashboard-widgets #postbox-container-3,
#wpbody-content #dashboard-widgets #postbox-container-4 { #wpbody-content #dashboard-widgets #postbox-container-4 {
float: right; float: right;
width: 50.5%; width: 50.5%;
} }
#wpbody-content .metabox-holder .postbox-container .empty-container, #dashboard-widgets.metabox-holder .postbox-container .empty-container,
#wpbody-content #postbox-container-3 .empty-container, #dashboard-widgets #postbox-container-3 .empty-container,
#wpbody-content #postbox-container-4 .empty-container { #dashboard-widgets #postbox-container-4 .empty-container {
border: 0 none; border: 0 none;
height: 0; height: 0;
min-height: 0; min-height: 0;
} }
#wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container { #wpbody #wpbody-content #dashboard-widgets.columns-1 .postbox-container {
width: 100%; width: 100%;
} }
@ -1945,16 +1949,27 @@ body.admin-bar {
} }
/* one column on the post write/edit screen */ /* one column on the post write/edit screen */
@media only screen and (max-width: 1024px) { @media only screen and (max-width: 1025px) {
#wpbody-content #poststuff #post-body { #wpbody-content #poststuff #post-body {
margin: 0; margin: 0;
} }
#wpbody-content #post-body.columns-2 #postbox-container-1 { #wpbody-content #post-body.columns-2 #postbox-container-1 {
margin-right: 0; margin-right: 0;
width: 100%; width: 100%;
} }
#poststuff #postbox-container-1 .empty-container,
#poststuff #postbox-container-1 #side-sortables:empty {
border: 0 none;
height: 0;
min-height: 0;
}
#poststuff #post-body.columns-2 #side-sortables {
min-height: 0;
}
/* hide the radio buttons for column prefs */ /* hide the radio buttons for column prefs */
.screen-layout, .screen-layout,
.columns-prefs { .columns-prefs {
@ -2120,16 +2135,16 @@ body.admin-bar {
} }
.welcome-panel .welcome-panel-close:before { .welcome-panel .welcome-panel-close:before {
background: url('../images/xit.gif') 0 17% no-repeat; background: url('../images/xit.gif') 0 17% no-repeat;
content: ' '; content: ' ';
height: 100%; height: 100%;
width: 10px; width: 10px;
left: -12px; left: -12px;
position: absolute; position: absolute;
} }
.welcome-panel .welcome-panel-close:hover:before { .welcome-panel .welcome-panel-close:hover:before {
background-position: 100% 17%; background-position: 100% 17%;
} }
.welcome-panel .wp-badge { .welcome-panel .wp-badge {
@ -3581,9 +3596,9 @@ abbr.required {
.media-item .progress { .media-item .progress {
float: right; float: right;
height: 22px; height: 22px;
margin: 6px 10px 0 0; margin: 6px 10px 0 0;
width: 200px; width: 200px;
line-height: 2em; line-height: 2em;
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
@ -4670,7 +4685,7 @@ input.button-highlighted,
} }
.about-wrap div.updated, .about-wrap div.updated,
.about-wrap div.error { .about-wrap div.error {
display: none !important; display: none !important;
} }
/* Typography */ /* Typography */

11
wp-admin/js/postbox.dev.js
View File

@ -129,9 +129,9 @@ var postboxes, is_iPad = navigator.userAgent.match(/iPad/);
}, },
_mark_area : function() { _mark_area : function() {
var visible = $('div.postbox:visible').length; var visible = $('div.postbox:visible').length, side = $('#post-body #side-sortables');
$('#post-body .meta-box-sortables:visible, #dashboard-widgets .meta-box-sortables:visible').not('#advanced-sortables').each(function(n, el){ $('#dashboard-widgets .meta-box-sortables:visible').each(function(n, el){
var t = $(this); var t = $(this);
if ( visible == 1 || t.children('.postbox:visible').length ) if ( visible == 1 || t.children('.postbox:visible').length )
@ -139,6 +139,13 @@ var postboxes, is_iPad = navigator.userAgent.match(/iPad/);
else else
t.addClass('empty-container'); t.addClass('empty-container');
}); });
if ( side.length ) {
if ( side.children('.postbox:visible').length )
side.removeClass('empty-container');
else if ( $('#postbox-container-1').css('width') == '280px' )
side.addClass('empty-container');
}
}, },
_pb_edit : function(n) { _pb_edit : function(n) {