<!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>[31974] trunk/src/wp-admin: Customizer: Make the available widgets overlay closable on narrow screens.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31974">31974</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31974","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-01 22:24:21 +0000 (Wed, 01 Apr 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customizer: Make the available widgets overlay closable on narrow screens.
see <a href="https://core.trac.wordpress.org/ticket/28784">#28784</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadminjscustomizewidgetsjs">trunk/src/wp-admin/js/customize-widgets.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css 2015-04-01 22:05:17 UTC (rev 31973)
+++ trunk/src/wp-admin/css/customize-controls.css 2015-04-01 22:24:21 UTC (rev 31974)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,6 +41,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 1px solid #ddd;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-header-actions .secondary-actions {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #customize-controls .wp-full-overlay-sidebar-content {
</span><span class="cx" style="display: block; padding: 0 10px"> overflow-y: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> overflow-x: hidden;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,6 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-close-overlay,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-controls-close {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,6 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> height: 45px;
</span><span class="cx" style="display: block; padding: 0 10px"> padding-right: 2px;
</span><span class="cx" style="display: block; padding: 0 10px"> background: #eee;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ border: none;
</ins><span class="cx" style="display: block; padding: 0 10px"> border-right: 1px solid #ddd;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #444;
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: pointer;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,6 +215,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-close-overlay {
+ left: auto;
+ right: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .control-panel-back {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> position: fixed;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,6 +240,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-close-overlay:focus,
+.customize-close-overlay:hover,
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-controls-close:focus,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-controls-close:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .control-panel-back:focus,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,6 +264,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> left: 13px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-close-overlay:before {
+ font: normal 22px/1 dashicons;
+ content: "\f335";
+ position: relative;
+ top: 3px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .control-panel-back:before {
</span><span class="cx" style="display: block; padding: 0 10px"> font: normal 20px/1 dashicons;
</span><span class="cx" style="display: block; padding: 0 10px"> content: "\f341";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1127,6 +1147,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 4px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .adding-widget #customize-header-actions .primary-actions {
+ display: none;
+ }
+
+ .adding-widget #customize-header-actions .secondary-actions {
+ display: block;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #customize-header-actions .button-primary {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 6px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmincustomizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/customize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/customize.php 2015-04-01 22:05:17 UTC (rev 31973)
+++ trunk/src/wp-admin/customize.php 2015-04-01 22:24:21 UTC (rev 31974)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,19 +119,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wp-full-overlay expanded">
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="customize-header-actions" class="wp-full-overlay-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $save_text = $wp_customize->is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' );
- submit_button( $save_text, 'primary save', 'save', false );
- ?>
- <span class="spinner"></span>
- <a class="customize-controls-preview-toggle" href="#">
- <span class="controls"><?php _e( 'Customize' ); ?></span>
- <span class="preview"><?php _e( 'Preview' ); ?></span>
- </a>
- <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
- <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
- </a>
- <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="primary-actions">
+ <?php
+ $save_text = $wp_customize->is_theme_active() ? __( 'Save & Publish' ) : __( 'Save & Activate' );
+ submit_button( $save_text, 'primary save', 'save', false );
+ ?>
+ <span class="spinner"></span>
+ <a class="customize-controls-preview-toggle" href="#">
+ <span class="controls"><?php _e( 'Customize' ); ?></span>
+ <span class="preview"><?php _e( 'Preview' ); ?></span>
+ </a>
+ <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
+ <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
+ </a>
+ <span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
+ </div>
+ <div class="secondary-actions">
+ <button type="button" class="dashicons dashicons-no customize-close-overlay">
+ <span class="screen-reader-text"><?php _e( 'Close' ); ?></span>
+ </button>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizewidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-widgets.js 2015-04-01 22:05:17 UTC (rev 31973)
+++ trunk/src/wp-admin/js/customize-widgets.js 2015-04-01 22:24:21 UTC (rev 31974)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the available widgets panel is open and the customize controls are
</span><span class="cx" style="display: block; padding: 0 10px"> // interacted with (i.e. available widgets panel is blurred) then close the
</span><span class="cx" style="display: block; padding: 0 10px"> // available widgets panel.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#customize-controls' ).on( 'click keydown', function( e ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#customize-controls, .customize-close-overlay' ).on( 'click keydown', function( e ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var isAddNewBtn = $( e.target ).is( '.add-new-widget, .add-new-widget *' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $( 'body' ).hasClass( 'adding-widget' ) && ! isAddNewBtn ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self.close();
</span></span></pre>
</div>
</div>
</body>
</html>