<!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>[30712] trunk/src: Customizer: Enhance Background Image/Upload controls.</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/30712">30712</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/30712","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>2014-12-02 21:54:42 +0000 (Tue, 02 Dec 2014)</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: Enhance Background Image/Upload controls.
* Adopt the Header Image layout to the Background Image/Upload control.
* Remove templates for interactive audio/video previews. They haven't worked yet.
* Don't show a "Remove" button when the default value is set.
* Avoid calculating of container/placeholder heights which are unrelated to custom headers.
see <a href="https://core.trac.wordpress.org/ticket/21483">#21483</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="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</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 2014-12-02 20:39:13 UTC (rev 30711)
+++ trunk/src/wp-admin/css/customize-controls.css 2014-12-02 21:54:42 UTC (rev 30712)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,34 +420,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .customize-control .attachment-thumb.type-icon {
</span><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin-right: 12px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 10px;
+ width: auto;
</ins><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"> .customize-control .attachment-title {
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: bold;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 0 0 12px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 0;
+ padding: 5px 10px;
</ins><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-control .remove-button {
- margin-left: 8px;
- vertical-align: middle;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control .thumbnail-image {
+ line-height: 0;
</ins><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-control .thumbnail-audio .attachment-title,
-.customize-control .thumbnail.thumbnail-audio,
-.customize-control .thumbnail.thumbnail-video,
-.customize-control .thumbnail.thumbnail-image {
- margin-bottom: 8px;
-}
-
-.customize-control .placeholder-text {
- font-size: 18px;
- font-weight: 300;
- text-align: center;
- color: #aaa;
- cursor: default;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .customize-control .thumbnail-image img {
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: pointer;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,129 +549,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: rgba(0, 0, 0, 0.25);
</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">-/*
- * Image Picker
- */
-.customize-control-image .library,
-.customize-control-image .actions {
- display: none;
- float: left;
- width: 100%;
-}
-
-.customize-control-image.open .library,
-.customize-control-image.open .actions {
- display: block;
-}
-
-.accordion-section .customize-control-image .dropdown-content {
- height: auto;
- min-height: 24px;
- min-width: 40px;
- padding: 0;
-}
-
-.accordion-section .customize-control-image .dropdown-status {
- padding: 4px 5px;
-}
-
-.accordion-section .customize-control-image .preview-thumbnail img {
- display: block;
- width: 100%;
- max-width: 122px;
- max-height: 98px;
- margin: 0 auto;
-}
-
-.accordion-section .customize-control-image .actions {
- text-align: right;
-}
-
-.accordion-section .customize-control-image .library ul {
- border-bottom: 1px solid #ddd;
- float: left;
- width: 100%;
- margin: 10px 0 0;
-}
-
-.accordion-section .customize-control-image .library li {
- color: #ccc;
- float: left;
- padding: 3px 15px;
- margin: 0;
- border: 1px solid transparent;
-}
-
-.accordion-section .customize-control-image .library li.library-selected {
- margin-bottom: -1px;
- padding-bottom: 4px;
- color: #666666;
- border-color: #ddd;
- border-bottom-color: #fff;
-}
-
-.accordion-section .customize-control-image .library .thumbnail {
- display: block;
- width: 100%;
-}
-
-.accordion-section .customize-control-image .library .thumbnail img {
- display: block;
- max-width: 90%;
- max-height: 80px;
- margin: 5px auto;
- padding: 2px;
- background: #666666;
-}
-
-.accordion-section .customize-control-image .library .thumbnail:hover img {
- background-color: #2ea2cc;
-}
-
-.accordion-section .customize-control-image .library-content {
- display: none;
- width: 100%;
- float: left;
- padding: 10px 0;
-}
-
-.accordion-section .customize-control-image .library-content.library-selected {
- display: block;
-}
-
-.accordion-section .customize-control-upload .upload-fallback,
-.accordion-section .customize-control-image .upload-fallback {
- display: none;
-}
-
-.accordion-section .customize-control-upload .upload-dropzone,
-.accordion-section .customize-control-image .upload-dropzone {
- display: none;
- padding: 15px 10px;
- border: 3px dashed #dfdfdf;
- margin: 5px auto;
- text-align: center;
- position: relative;
- cursor: default;
-}
-
-.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop,
-.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop {
- display: block;
- -webkit-transition: border-color 0.1s;
- transition: border-color 0.1s;
-}
-
-.accordion-section .customize-control-upload .library ul li,
-.accordion-section .customize-control-image .library ul li {
- cursor: pointer;
-}
-
-.accordion-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over,
-.accordion-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over {
- border-color: #83b4d8;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * iOS can't scroll iframes,
</span><span class="cx" style="display: block; padding: 0 10px"> * instead it expands the iframe size to match the size of the content
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -704,16 +567,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** Header control **/
</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-control-header_image .current {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .current,
+.customize-control-image .current,
+.customize-control-header .current {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 8px;
</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-control-header_image .uploaded {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .uploaded {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 18px;
</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-control-header_image .uploaded button:not(.random),
-#customize-control-header_image .default button:not(.random) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .uploaded button:not(.random),
+.customize-control-header .default button:not(.random) {
</ins><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -723,21 +588,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: pointer;
</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-control-header_image button img {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header button img {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: block;
</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-control-header_image button.new,
-#customize-control-header_image button.remove {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .remove-button,
+.customize-control-upload .upload-button,
+.customize-control-image .remove-button,
+.customize-control-image .upload-button,
+.customize-control-header button.new,
+.customize-control-header button.remove {
</ins><span class="cx" style="display: block; padding: 0 10px"> white-space: normal;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 48%;
</span><span class="cx" style="display: block; padding: 0 10px"> height: auto;
</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">-
-/* Header control: current image container */
-
-#customize-control-header_image .current .container {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .current .container,
+.customize-control-image .current .container,
+.customize-control-header .current .container {
</ins><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-border-radius: 2px;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #eee;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,14 +613,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 2px;
</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-control-header_image .placeholder {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .current .container,
+.customize-control-image .current .container {
+ min-height: 40px;
+}
+
+.customize-control-upload .placeholder,
+.customize-control-image .placeholder,
+.customize-control-header .placeholder {
</ins><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: default;
</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-control-header_image .inner {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .inner,
+.customize-control-image .inner,
+.customize-control-header .inner {
</ins><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,31 +639,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</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-control-header_image .inner,
-#customize-control-header_image .inner .dashicons {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .inner,
+.customize-control-image .inner {
+ display: block;
+ min-height: 40px;
+}
+
+.customize-control-upload .inner,
+.customize-control-image .inner,
+.customize-control-header .inner,
+.customize-control-header .inner .dashicons {
</ins><span class="cx" style="display: block; padding: 0 10px"> line-height: 20px;
</span><span class="cx" style="display: block; padding: 0 10px"> top: 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-control-header_image .list .inner,
-#customize-control-header_image .list .inner .dashicons {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+.customize-control-header .list .inner,
+.customize-control-header .list .inner .dashicons {
</ins><span class="cx" style="display: block; padding: 0 10px"> top: 9px;
</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-control-header_image .header-view {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .header-view {
</ins><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 5px;
</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-control-header_image .header-view:last-child {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .header-view:last-child {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 0px;
</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"> /* Convoluted, but 'outline' support isn't good enough yet */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-control-header_image .header-view:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .header-view:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> border: 0;
</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-control-header_image .header-view.selected:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .header-view.selected:after {
</ins><span class="cx" style="display: block; padding: 0 10px"> content: '';
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> height: auto;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,13 +681,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-border-radius: 2px;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 2px;
</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-control-header_image .header-view.button.selected {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .header-view.button.selected {
</ins><span class="cx" style="display: block; padding: 0 10px"> border: 0;
</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"> /* Header control: overlay "close" button */
</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-control-header_image .uploaded .header-view .close {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .uploaded .header-view .close {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 2em;
</span><span class="cx" style="display: block; padding: 0 10px"> color: grey;
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -814,7 +700,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> cursor: pointer;
</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-control-header_image .uploaded .header-view .close:hover {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .uploaded .header-view .close:hover {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: black;
</span><span class="cx" style="display: block; padding: 0 10px"> text-shadow:
</span><span class="cx" style="display: block; padding: 0 10px"> -1px -1px 0 #fff,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -823,32 +709,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 1px 1px 0 #fff;
</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-control-header_image .header-view:hover .close {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .header-view:hover .close {
</ins><span class="cx" style="display: block; padding: 0 10px"> visibility: visible;
</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"> /* Header control: randomiz(s)er */
</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-control-header_image .random.placeholder {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .random.placeholder {
</ins><span class="cx" style="display: block; padding: 0 10px"> cursor: pointer;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-border-radius: 2px;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 2px;
</span><span class="cx" style="display: block; padding: 0 10px"> height: 40px;
</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-control-header_image button.random {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header button.random {
</ins><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> height: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> min-height: 40px;
</span><span class="cx" style="display: block; padding: 0 10px"> white-space: normal;
</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-control-header_image button.random .dice {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header button.random .dice {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-top: 4px;
</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-control-header_image .placeholder:hover .dice,
-#customize-control-header_image .header-view:hover > button.random .dice {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .placeholder:hover .dice,
+.customize-control-header .header-view:hover > button.random .dice {
</ins><span class="cx" style="display: block; padding: 0 10px"> -webkit-animation: dice-color-change 3s infinite;
</span><span class="cx" style="display: block; padding: 0 10px"> -ms-animation: dice-color-change 3s infinite;
</span><span class="cx" style="display: block; padding: 0 10px"> animation: dice-color-change 3s infinite;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -875,34 +761,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 100% { color: #d4b146; }
</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">-/* Header control: actions and choices */
-
-#customize-control-header_image .actions {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .actions,
+.customize-control-image .actions,
+.customize-control-header .actions {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 32px;
</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-control-header_image .choice {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .choice {
</ins><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 9px;
</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-control-header_image .uploaded div:last-child > .choice {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-header .uploaded div:last-child > .choice {
</ins><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-control-header_image img {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload img,
+.customize-control-image img,
+.customize-control-header img {
</ins><span class="cx" style="display: block; padding: 0 10px"> width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-border-radius: 2px;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 2px;
</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-control-header_image .remove {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .remove-button
+.customize-control-image .remove-button
+.customize-control-header .remove {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> margin-right: 3px;
</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-control-header_image .new {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.customize-control-upload .upload-button,
+.customize-control-image .upload-button,
+.customize-control-header .new {
</ins><span class="cx" style="display: block; padding: 0 10px"> float: right;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2014-12-02 20:39:13 UTC (rev 30711)
+++ trunk/src/wp-admin/js/customize-controls.js 2014-12-02 21:54:42 UTC (rev 30712)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,7 +1008,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Reset the setting to the default value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> restoreDefault: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( event.type === 'keydown' && 13 !== event.which ) { // enter
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( event.type === 'keydown' && 13 !== event.which ) { // enter
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1023,7 +1023,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {object} event jQuery Event object
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> removeFile: function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( event.type === 'keydown' && 13 !== event.which ) { // enter
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( event.type === 'keydown' && 13 !== event.which ) { // enter
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1075,17 +1075,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> new api.HeaderTool.CurrentView({
</span><span class="cx" style="display: block; padding: 0 10px"> model: api.HeaderTool.currentHeader,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- el: '.current .container'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ el: '#customize-control-header_image .current .container'
</ins><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"> new api.HeaderTool.ChoiceListView({
</span><span class="cx" style="display: block; padding: 0 10px"> collection: api.HeaderTool.UploadsList = new api.HeaderTool.ChoiceList(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- el: '.choices .uploaded .list'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ el: '#customize-control-header_image .choices .uploaded .list'
</ins><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"> new api.HeaderTool.ChoiceListView({
</span><span class="cx" style="display: block; padding: 0 10px"> collection: api.HeaderTool.DefaultsList = new api.HeaderTool.DefaultsList(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- el: '.choices .default .list'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ el: '#customize-control-header_image .choices .default .list'
</ins><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"> api.HeaderTool.combinedList = api.HeaderTool.CombinedList = new api.HeaderTool.CombinedList([
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2098,11 +2098,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</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">- $('.upload-dropzone a.upload').keydown( function( event ) {
- if ( 13 === event.which ) // enter
- this.click();
- });
-
</del><span class="cx" style="display: block; padding: 0 10px"> $('.collapse-sidebar').on( 'click keydown', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isKeydownButNotEnterEvent( event ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2115,7 +2110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Bind site title display to the corresponding field.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( title.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#customize-control-blogname input' ).on( 'input', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- title.text( this.value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ title.text( this.value );
</ins><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></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php 2014-12-02 20:39:13 UTC (rev 30711)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2014-12-02 21:54:42 UTC (rev 30712)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,58 +747,50 @@
</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"> if ( data.attachment && data.attachment.id ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="attachment-media-view {{ data.attachment.orientation }}">
- <div class="thumbnail thumbnail-{{ data.attachment.type }}">
- <# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
- <img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" />
- <# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
- <img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" />
- <# } else if ( -1 === jQuery.inArray( data.attachment.type, [ 'audio', 'video' ] ) ) { #>
- <img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" />
- <p class="attachment-title">{{ data.attachment.title }}</p>
- <# } #>
-
- <# if ( 'audio' === data.attachment.type ) { #>
- <div class="wp-media-wrapper">
- <p class="attachment-title">{{ data.attachment.title }}</p>
- <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
- <source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
- </audio>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="current">
+ <div class="container">
+ <div class="attachment-media-view {{ data.attachment.orientation }}">
+ <div class="thumbnail thumbnail-{{ data.attachment.type }}">
+ <# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
+ <img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" />
+ <# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
+ <img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" />
+ <# } else { #>
+ <img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" />
+ <p class="attachment-title">{{ data.attachment.title }}</p>
+ <# } #>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# } else if ( 'video' === data.attachment.type ) {
- var w_rule = h_rule = '';
- if ( data.attachment.width ) {
- w_rule = 'width: ' + data.attachment.width + 'px;';
- } else if ( wp.media.view.settings.contentWidth ) {
- w_rule = 'width: ' + wp.media.view.settings.contentWidth + 'px;';
- }
- if ( data.attachment.height ) {
- h_rule = 'height: ' + data.attachment.height + 'px;';
- }
- #>
- <div style="{{ w_rule }}{{ h_rule }}" class="wp-media-wrapper wp-video">
- <video controls="controls" class="wp-video-shortcode" preload="metadata"
- <# if ( data.attachment.width ) { #>width="{{ data.attachment.width }}"<# } #>
- <# if ( data.attachment.height ) { #>height="{{ data.attachment.height }}"<# } #>
- <# if ( data.attachment.image && data.attachment.image.src !== data.attachment.icon ) { #>poster="{{ data.attachment.image.src }}"<# } #>>
- <source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
- </video>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
+ </div>
+ <div class="actions">
+ <# if ( data.defaultAttachment && data.defaultAttachment.id !== data.attachment.id ) { #>
+ <button type="button" class="button default-button remove-button"><?php echo $this->button_labels['default']; ?></button>
+ <# } else if ( ! data.defaultAttachment ) { #>
+ <button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
+ <# } #>
+ <button type="button" class="button upload-button" id="{{ data.settings.default }}-button"><?php echo $this->button_labels['change']; ?></button>
+ <div style="clear:both"></div>
+ </div>
+ <# } else { #>
+ <div class="current">
+ <div class="container">
+ <div class="placeholder">
+ <div class="inner">
+ <span>
+ <?php echo $this->button_labels['placeholder']; ?>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# } #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="button upload-button" id="{{ data.settings.default }}-button" href="#"><?php echo $this->button_labels['change']; ?></a>
- <# if ( data.defaultAttachment && data.defaultAttachment.id !== data.attachment.id ) { #>
- <a class="default-button remove-button" href="#"><?php echo $this->button_labels['default']; ?></a>
- <# } else { #>
- <a class="remove-button" href="#"><?php echo $this->button_labels['remove']; ?></a>
- <# } #>
- <# } else { #>
- <p class="placeholder-text"><?php echo $this->button_labels['placeholder']; ?></p>
- <a class="button upload-button" id="{{ data.settings.default }}-button" href="#"><?php echo $this->button_labels['select']; ?></a>
- <# if ( data.defaultAttachment ) { #>
- <a class="default-button remove-button" href="#"><?php echo $this->button_labels['default']; ?></a>
- <# } #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="actions">
+ <# if ( data.defaultAttachment ) { #>
+ <button type="button" class="button default-button remove-button"><?php echo $this->button_labels['default']; ?></button>
+ <# } #>
+ <button type="button" class="button upload-button" id="{{ data.settings.default }}-button"><?php echo $this->button_labels['select']; ?></button>
+ <div style="clear:both"></div>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>