<!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>[41860] trunk/src/wp-admin: Customize: Fix positioning of device-previewed window when publish settings are open.</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/41860">41860</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/41860","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-13 21:20:42 +0000 (Fri, 13 Oct 2017)</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'>Customize: Fix positioning of device-previewed window when publish settings are open.
* Update date control padding.
* Collapse publish settings section when opening panes for available widgets or nav menus.
* Remove save and cog buttons in mobile preview only mode.
* Move definition of `wp.customize.previewedDevice` to `wp.customize.state('previewedDevice')` for centralization, maintaining old alias.
* Remove unused CSS because the section is inside form now.
Props sayedwp, westonruter.
See <a href="https://core.trac.wordpress.org/ticket/39896">#39896</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/42027">#42027</a>, <a href="https://core.trac.wordpress.org/ticket/42199">#42199</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminjscustomizenavmenusjs">trunk/src/wp-admin/js/customize-nav-menus.js</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 2017-10-13 20:55:50 UTC (rev 41859)
+++ trunk/src/wp-admin/css/customize-controls.css 2017-10-13 21:20:42 UTC (rev 41860)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,11 +127,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.outer-section-open .wp-full-overlay.expanded #customize-preview {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.outer-section-open .wp-full-overlay.expanded .wp-full-overlay-main {
</ins><span class="cx" style="display: block; padding: 0 10px"> left: 300px;
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 0.4;
</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">+.outer-section-open .wp-full-overlay.expanded.preview-tablet .wp-full-overlay-main,
+.outer-section-open .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
+.adding-menu-items .wp-full-overlay.expanded.preview-tablet .wp-full-overlay-main,
+.adding-menu-items .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
+.adding-widget .wp-full-overlay.expanded.preview-tablet .wp-full-overlay-main,
+.adding-widget .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main {
+ left: 64%;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #customize-outer-theme-controls li.notice {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-top: 8px;
</span><span class="cx" style="display: block; padding: 0 10px"> padding-bottom: 8px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +388,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> box-sizing: content-box;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-left: -12px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 12px 12px 10px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 12px;
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #ffffff;
</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"> margin-bottom: 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,8 +515,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-controls .customize-info .customize-section-description,
-#customize-outer-theme-controls .customize-section-description {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-controls .customize-info .customize-section-description {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 15px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,9 +570,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-controls .control-section:hover > .accordion-section-title,
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-controls .control-section .accordion-section-title:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-controls .control-section.open .accordion-section-title,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-outer-theme-controls .control-section .accordion-section-title:hover,
-#customize-outer-theme-controls .control-section.open .accordion-section-title,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus,
</del><span class="cx" style="display: block; padding: 0 10px"> #customize-controls .control-section .accordion-section-title:focus {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #0073aa;
</span><span class="cx" style="display: block; padding: 0 10px"> background: #f3f3f5;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1724,8 +1729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .control-panel-themes .accordion-section-title span.customize-action,
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-controls .customize-section-title span.customize-action,
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-controls .control-section-themes .accordion-section-title span.customize-action,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-controls .customize-section-title span.customize-action,
-#customize-outer-theme-controls .customize-section-title span.customize-action {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-controls .customize-section-title span.customize-action {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 13px;
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 400;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2791,6 +2795,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">+@media screen and ( max-width: 1200px ) {
+ .outer-section-open .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
+ .adding-menu-items .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main,
+ .adding-widget .wp-full-overlay.expanded.preview-mobile .wp-full-overlay-main {
+ left: 67%;
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @media screen and ( max-width: 640px ) {
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-controls {
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2837,6 +2849,10 @@
</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">+ .preview-only #customize-save-button-wrapper {
+ margin-top: -46px;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .customize-controls-preview-toggle .preview:before,
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-controls-preview-toggle .controls:before {
</span><span class="cx" style="display: block; padding: 0 10px"> font: normal 20px/1 dashicons;
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></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-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2017-10-13 20:55:50 UTC (rev 41859)
+++ trunk/src/wp-admin/js/customize-controls.js 2017-10-13 21:20:42 UTC (rev 41860)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6788,7 +6788,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'remainingTimeToPublish',
</span><span class="cx" style="display: block; padding: 0 10px"> 'previewerAlive',
</span><span class="cx" style="display: block; padding: 0 10px"> 'editShortcutVisibility',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'changesetLocked'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'changesetLocked',
+ 'previewedDevice'
</ins><span class="cx" style="display: block; padding: 0 10px"> ], function( name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> api.state.create( name );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8317,8 +8318,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px"> }());
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Previewed device bindings.
- api.previewedDevice = new api.Value();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Previewed device bindings. (The api.previewedDevice property is how this Value was first introduced, but since it has moved to api.state.)
+ api.previewedDevice = api.state( 'previewedDevice' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the default device.
</span><span class="cx" style="display: block; padding: 0 10px"> api.bind( 'ready', function() {
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizenavmenusjs"></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-nav-menus.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-nav-menus.js 2017-10-13 20:55:50 UTC (rev 41859)
+++ trunk/src/wp-admin/js/customize-nav-menus.js 2017-10-13 21:20:42 UTC (rev 41860)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,6 +682,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.itemSectionHeight();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( api.section.has( 'publish_settings' ) ) {
+ api.section( 'publish_settings' ).collapse();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).addClass( 'adding-menu-items' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> close = function() {
</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 2017-10-13 20:55:50 UTC (rev 41859)
+++ trunk/src/wp-admin/js/customize-widgets.js 2017-10-13 21:20:42 UTC (rev 41860)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,6 +330,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">+ if ( api.section.has( 'publish_settings' ) ) {
+ api.section( 'publish_settings' ).collapse();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).addClass( 'adding-widget' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.find( '.selected' ).removeClass( 'selected' );
</span></span></pre>
</div>
</div>
</body>
</html>