<!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>[20497] trunk/wp-includes: Theme Customizer: Improve color picker toggle styles and markup.</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/20497">20497</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-04-17 22:58:58 +0000 (Tue, 17 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Improve color picker toggle styles and markup. see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpcustomizecontrolphp">trunk/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunkwpincludescsscustomizecontrolsdevcss">trunk/wp-includes/css/customize-controls.dev.css</a></li>
<li><a href="#trunkwpincludesjscustomizecontrolsdevjs">trunk/wp-includes/js/customize-controls.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-control.php (20496 => 20497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-control.php 2012-04-17 21:43:47 UTC (rev 20496)
+++ trunk/wp-includes/class-wp-customize-control.php 2012-04-17 22:58:58 UTC (rev 20497)
</span><span class="lines">@@ -215,16 +215,16 @@
</span><span class="cx"> ?>
</span><span class="cx"> <label>
</span><span class="cx"> <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
</span><del>- <div class="color-picker">
- <input type="hidden" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); ?> />
- <a href="#"></a>
- <div class="color-picker-controls">
- <div class="farbtastic-placeholder"></div>
- <div class="color-picker-details">
- <div class="color-picker-hex">
- <span>#</span>
- <input type="text" <?php $this->link(); ?> />
- </div>
</del><ins>+ <a href="#" class="color-picker-toggle">
+ <div class="color-picker-spot"></div>
+ <div class="color-picker-dropdown"></div>
+ </a>
+ <div class="color-picker-controls">
+ <div class="farbtastic-placeholder"></div>
+ <div class="color-picker-details">
+ <div class="color-picker-hex">
+ <span>#</span>
+ <input type="text" <?php $this->link(); ?> />
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpincludescsscustomizecontrolsdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/customize-controls.dev.css (20496 => 20497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/customize-controls.dev.css 2012-04-17 21:43:47 UTC (rev 20496)
+++ trunk/wp-includes/css/customize-controls.dev.css 2012-04-17 22:58:58 UTC (rev 20497)
</span><span class="lines">@@ -197,22 +197,65 @@
</span><span class="cx"> /*
</span><span class="cx"> * Color Picker
</span><span class="cx"> */
</span><del>-.customize-section .color-picker a {
</del><ins>+.customize-section .color-picker-toggle {
+ float: left;
</ins><span class="cx"> display: block;
</span><del>- height: 20px;
- width: 40px;
- border: solid 3px rgba( 0, 0, 0, 0.1 );
- background-color: #fff;
</del><span class="cx">
</span><span class="cx"> -webkit-border-radius: 3px;
</span><span class="cx"> border-radius: 3px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .color-picker .color-picker-controls {
</del><ins>+.customize-section .color-picker-spot,
+.customize-section .color-picker-dropdown {
+ float: left;
+ height: 24px;
+ line-height: 24px;
+}
+
+.customize-section .color-picker-spot {
+ min-width: 30px;
+ padding: 0 5px;
+ background-color: #fff;
+ border: 1px solid rgba( 0, 0, 0, 0.15 );
+ -webkit-border-radius: 3px 0 0 3px;
+ border-radius: 3px 0 0 3px;
+}
+
+.customize-section .color-picker-dropdown {
+ position: relative;
+ width: 15px;
+
+ border-color: #ccc;
+ border-style: solid;
+ border-width: 1px 1px 1px 0;
+ -webkit-border-radius: 0 3px 3px 0;
+ border-radius: 0 3px 3px 0;
+}
+
+.customize-section .color-picker-dropdown:after {
+ content: '';
+ width: 0;
+ height: 0;
+ border-color: #ccc transparent transparent transparent;
+ border-style: solid;
+ border-width: 4px;
+ position: absolute;
+ top: 11px;
+ right: 4px;
+ z-index: 1;
+}
+.customize-section .color-picker-toggle.open .color-picker-dropdown:after {
+ border-color: transparent transparent #ccc transparent;
+ top: 6px;
+}
+
+.customize-section .color-picker-controls {
</ins><span class="cx"> display: none;
</span><ins>+ float: left;
+ margin-top: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .color-picker .farbtastic-placeholder {
</del><ins>+.customize-section .color-picker-controls .farbtastic-placeholder {
</ins><span class="cx"> height: 195px;
</span><span class="cx"> width: 195px;
</span><span class="cx"> border: 4px solid #fff;
</span></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20496 => 20497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-04-17 21:43:47 UTC (rev 20496)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-04-17 22:58:58 UTC (rev 20497)
</span><span class="lines">@@ -97,22 +97,24 @@
</span><span class="cx"> api.ColorControl = api.Control.extend({
</span><span class="cx"> ready: function() {
</span><span class="cx"> var control = this,
</span><del>- picker, ui, text, toggle, update;
</del><ins>+ toggle, spot, ui, text, update;
</ins><span class="cx">
</span><del>- picker = this.container.find( '.color-picker' );
- ui = picker.find( '.color-picker-controls' );
- toggle = picker.find( 'a' );
</del><ins>+ toggle = this.container.find( '.color-picker-toggle' );
+ spot = toggle.find('.color-picker-spot');
+ ui = this.container.find( '.color-picker-controls' );
</ins><span class="cx"> update = function( color ) {
</span><span class="cx"> color = '#' + color;
</span><del>- toggle.css( 'background', color );
</del><ins>+ spot.css( 'background', color );
</ins><span class="cx"> control.farbtastic.setColor( color );
</span><span class="cx"> };
</span><span class="cx">
</span><del>- picker.on( 'click', 'a', function() {
</del><ins>+ toggle.on( 'click', function( event ) {
</ins><span class="cx"> ui.toggle();
</span><ins>+ toggle.toggleClass( 'open' );
+ event.preventDefault();
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- this.farbtastic = $.farbtastic( picker.find('.farbtastic-placeholder'), function( color ) {
</del><ins>+ this.farbtastic = $.farbtastic( this.container.find('.farbtastic-placeholder'), function( color ) {
</ins><span class="cx"> control.setting.set( color.replace( '#', '' ) );
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>