<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20791] trunk: Theme Customizer: Prevent sidebar scrollbar from overlapping sidebar header or footer.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20791">20791</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-05-15 01:03:31 +0000 (Tue, 15 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Prevent sidebar scrollbar from overlapping sidebar header or footer. fixes <a href="http://core.trac.wordpress.org/ticket/20649">#20649</a>, <a href="http://core.trac.wordpress.org/ticket/20650">#20650</a>, see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadminincludesclasswpthemeinstalllisttablephp">trunk/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunkwpincludescsscustomizecontrolsdevcss">trunk/wp-includes/css/customize-controls.dev.css</a></li>
<li><a href="#trunkwpincludescustomizecontrolsphp">trunk/wp-includes/customize-controls.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (20790 => 20791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2012-05-14 19:58:19 UTC (rev 20790)
+++ trunk/wp-admin/css/wp-admin.dev.css 2012-05-15 01:03:31 UTC (rev 20791)
</span><span class="lines">@@ -5285,8 +5285,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wp-full-overlay.collapsed,
</span><del>-.wp-full-overlay.collapsed div.wp-full-overlay-header,
-.wp-full-overlay.collapsed div.wp-full-overlay-footer {
</del><ins>+.wp-full-overlay.collapsed .wp-full-overlay-sidebar > div {
</ins><span class="cx"> left: -302px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5299,7 +5298,6 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> overflow: auto;
</span><span class="cx"> background: #f5f5f5;
</span><del>- box-shadow: inset -11px 0 8px -8px rgba( 0, 0, 0, 0.1 );
</del><span class="cx"> border-right: 1px solid rgba( 0, 0, 0, 0.2 );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5307,6 +5305,18 @@
</span><span class="cx"> overflow: visible;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.wp-full-overlay-sidebar:after {
+ content: '';
+ display: block;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ width: 8px;
+ box-shadow: inset -11px 0 8px -8px rgba( 0, 0, 0, 0.1 );
+ z-index: 1000;
+}
+
</ins><span class="cx"> .wp-full-overlay-main {
</span><span class="cx"> position: fixed;
</span><span class="cx"> left: 300px;
</span><span class="lines">@@ -5319,36 +5329,40 @@
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-full-overlay-sidebar div.wp-full-overlay-header,
-.wp-full-overlay-sidebar div.wp-full-overlay-footer {
</del><ins>+.wp-full-overlay-sidebar .wp-full-overlay-header,
+.wp-full-overlay-sidebar .wp-full-overlay-footer {
</ins><span class="cx"> position: fixed;
</span><span class="cx"> left: 0;
</span><span class="cx"> width: 260px;
</span><del>- padding: 15px 20px;
- min-height: 16px;
</del><ins>+ height: 45px;
+ padding: 0 20px;
+ line-height: 45px;
+ z-index: 10;
</ins><span class="cx"> margin: 0;
</span><del>- z-index: 10;
- background: #f5f5f5;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-full-overlay-sidebar div.wp-full-overlay-header {
</del><ins>+.wp-full-overlay-sidebar .wp-full-overlay-header {
</ins><span class="cx"> top: 0;
</span><span class="cx"> border-top: 0;
</span><span class="cx"> border-bottom: 1px solid #fff;
</span><del>- box-shadow:
- inset -11px 0 8px -8px rgba( 0, 0, 0, 0.1 ),
- inset 0 -1px 0 0px #dfdfdf;
</del><ins>+ box-shadow: inset 0 -1px 0 0px #dfdfdf;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-full-overlay-sidebar div.wp-full-overlay-footer {
</del><ins>+.wp-full-overlay-sidebar .wp-full-overlay-footer {
</ins><span class="cx"> bottom: 0;
</span><span class="cx"> border-bottom: 0;
</span><span class="cx"> border-top: 1px solid #dfdfdf;
</span><del>- box-shadow:
- inset -11px 0 8px -8px rgba( 0, 0, 0, 0.1 ),
- inset 0 1px 0 0px #fff;
</del><ins>+ box-shadow: inset 0 1px 0 0px #fff;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.wp-full-overlay-sidebar .wp-full-overlay-sidebar-content {
+ position: fixed;
+ top: 45px;
+ bottom: 45px;
+ width: 300px;
+ overflow: auto;
+}
+
</ins><span class="cx"> /* Return and close buttons. */
</span><span class="cx"> .wp-full-overlay .collapse-sidebar,
</span><span class="cx"> .wp-full-overlay .close-full-overlay {
</span><span class="lines">@@ -5365,7 +5379,7 @@
</span><span class="cx"> /* Collapse Button */
</span><span class="cx"> .wp-full-overlay .collapse-sidebar {
</span><span class="cx"> position: absolute;
</span><del>- bottom: 13px;
</del><ins>+ bottom: 12px;
</ins><span class="cx"> left: 265px;
</span><span class="cx"> z-index: 50;
</span><span class="cx"> display: block;
</span><span class="lines">@@ -5413,8 +5427,7 @@
</span><span class="cx"> /* Animations */
</span><span class="cx"> .wp-full-overlay,
</span><span class="cx"> .wp-full-overlay .collapse-sidebar,
</span><del>-.wp-full-overlay-sidebar div.wp-full-overlay-header,
-.wp-full-overlay-sidebar div.wp-full-overlay-footer,
</del><ins>+.wp-full-overlay-sidebar > div,
</ins><span class="cx"> .wp-full-overlay-main {
</span><span class="cx"> -moz-transition-property: left, right, top, bottom;
</span><span class="cx"> -webkit-transition-property: left, right, top, bottom;
</span><span class="lines">@@ -5480,7 +5493,7 @@
</span><span class="cx">
</span><span class="cx"> .install-theme-info {
</span><span class="cx"> display: none;
</span><del>- padding: 45px 20px 15px;
</del><ins>+ padding: 10px 20px 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .single-theme .install-theme-info {
</span><span class="lines">@@ -5508,6 +5521,10 @@
</span><span class="cx"> border: 1px solid #ccc;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.install-theme-info .theme-details {
+ overflow: hidden;
+}
+
</ins><span class="cx"> .theme-details .theme-version {
</span><span class="cx"> margin: 15px 0;
</span><span class="cx"> float: left;
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-theme-install-list-table.php (20790 => 20791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-05-14 19:58:19 UTC (rev 20790)
+++ trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-05-15 01:03:31 UTC (rev 20791)
</span><span class="lines">@@ -258,7 +258,9 @@
</span><span class="cx"> </a>
</span><span class="cx"> <div class="wp-full-overlay-sidebar">
</span><span class="cx"> <div class="wp-full-overlay-header"></div>
</span><del>- <div class="install-theme-info"></div>
</del><ins>+ <div class="wp-full-overlay-sidebar-content">
+ <div class="install-theme-info"></div>
+ </div>
</ins><span class="cx"> <div class="wp-full-overlay-footer"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="wp-full-overlay-main"></div>
</span></span></pre></div>
<a id="trunkwpincludescsscustomizecontrolsdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/customize-controls.dev.css (20790 => 20791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/customize-controls.dev.css 2012-05-14 19:58:19 UTC (rev 20790)
+++ trunk/wp-includes/css/customize-controls.dev.css 2012-05-15 01:03:31 UTC (rev 20791)
</span><span class="lines">@@ -99,10 +99,6 @@
</span><span class="cx"> top: 15px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#customize-info {
- margin-top: 45px;
-}
-
</del><span class="cx"> #customize-info .preview-notice {
</span><span class="cx"> font-size: 13px;
</span><span class="cx"> line-height: 24px;
</span><span class="lines">@@ -132,10 +128,6 @@
</span><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#customize-theme-controls {
- padding-bottom: 60px;
-}
-
</del><span class="cx"> #customize-theme-controls > ul,
</span><span class="cx"> #customize-theme-controls .customize-section-content {
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -144,7 +136,7 @@
</span><span class="cx"> #customize-footer-actions img {
</span><span class="cx"> display: none;
</span><span class="cx"> position: absolute;
</span><del>- top: 18px;
</del><ins>+ top: 15px;
</ins><span class="cx"> margin-left: 4px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -152,6 +144,11 @@
</span><span class="cx"> display: inline;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#customize-footer-actions .button-primary {
+ display: inline-block;
+ margin-top: 12px;
+}
+
</ins><span class="cx"> .customize-control {
</span><span class="cx"> width: 100%;
</span><span class="cx"> float: left;
</span></span></pre></div>
<a id="trunkwpincludescustomizecontrolsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/customize-controls.php (20790 => 20791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/customize-controls.php 2012-05-14 19:58:19 UTC (rev 20790)
+++ trunk/wp-includes/customize-controls.php 2012-05-15 01:03:31 UTC (rev 20791)
</span><span class="lines">@@ -43,37 +43,39 @@
</span><span class="cx"> <body class="wp-full-overlay">
</span><span class="cx"> <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
</span><span class="cx"> <?php wp_nonce_field( 'customize_controls' ); ?>
</span><del>- <div id="customize-header-actions" class="customize-section wp-full-overlay-header">
</del><ins>+ <div id="customize-header-actions" class="wp-full-overlay-header">
</ins><span class="cx"> <a class="back" href="<?php echo esc_url( admin_url( 'themes.php' ) ); ?>">
</span><span class="cx"> <?php printf( __( '&larr; Return to %s' ), __('Manage Themes') ); ?>
</span><span class="cx"> </a>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="customize-info" class="customize-section">
- <div class="customize-section-title">
- <span class="preview-notice"><?php _e('You are previewing'); ?></span>
- <strong class="theme-name"><?php echo $this->theme->display('Name'); ?></strong>
</del><ins>+ <div class="wp-full-overlay-sidebar-content">
+ <div id="customize-info" class="customize-section">
+ <div class="customize-section-title">
+ <span class="preview-notice"><?php _e('You are previewing'); ?></span>
+ <strong class="theme-name"><?php echo $this->theme->display('Name'); ?></strong>
+ </div>
+ <div class="customize-section-content">
+ <?php if ( $screenshot = $this->theme->get_screenshot() ) : ?>
+ <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
+ <?php endif; ?>
+
+ <?php if ( $this->theme->get('Description') ): ?>
+ <div class="theme-description"><?php echo $this->theme->display('Description'); ?></div>
+ <?php endif; ?>
+ </div>
</ins><span class="cx"> </div>
</span><del>- <div class="customize-section-content">
- <?php if ( $screenshot = $this->theme->get_screenshot() ) : ?>
- <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
- <?php endif; ?>
</del><span class="cx">
</span><del>- <?php if ( $this->theme->get('Description') ): ?>
- <div class="theme-description"><?php echo $this->theme->display('Description'); ?></div>
- <?php endif; ?>
- </div>
</del><ins>+ <div id="customize-theme-controls"><ul>
+ <?php
+ foreach ( $this->sections as $section )
+ $section->maybe_render();
+ ?>
+ </ul></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="customize-theme-controls"><ul>
</del><ins>+ <div id="customize-footer-actions" class="wp-full-overlay-footer">
</ins><span class="cx"> <?php
</span><del>- foreach ( $this->sections as $section )
- $section->maybe_render();
- ?>
- </ul></div>
-
- <div id="customize-footer-actions" class="customize-section wp-full-overlay-footer">
- <?php
</del><span class="cx"> $save_text = $this->get_stylesheet() == $this->original_stylesheet ? __('Save') : __('Save and Activate');
</span><span class="cx"> submit_button( $save_text, 'primary', 'save', false );
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>