From 08c3cb242a24ef226da70093d6178162c5b2a944 Mon Sep 17 00:00:00 2001 From: nacin Date: Thu, 7 Jun 2012 22:05:01 +0000 Subject: [PATCH] Prevent a scrollbar in the admin caused by padding given to the toolbar. props SergeyBiryukov, ocean90. fixes #19196. git-svn-id: http://core.svn.wordpress.org/trunk@21025 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/wp-admin.dev.css | 5 ++++- wp-admin/includes/template.php | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css index cb7f9f890d..f0d8706b83 100644 --- a/wp-admin/css/wp-admin.dev.css +++ b/wp-admin/css/wp-admin.dev.css @@ -1892,8 +1892,11 @@ strong .post-com-count { 8.0 - Layout Blocks ------------------------------------------------------------------------------*/ -body.admin-bar { +html.wp-toolbar { padding-top: 28px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .narrow { diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index b9a0f65ddb..6ad2eec96c 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -1672,13 +1672,14 @@ function get_submit_button( $text = null, $type = 'primary', $name = 'submit', $ } function _wp_admin_html_begin() { + $admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : ''; ?> - > + >