<!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>[20527] trunk/wp-includes: Theme Customizer: Begin improving image picker markup/styles.</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/20527">20527</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-04-19 06:29:54 +0000 (Thu, 19 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Begin improving image picker markup/styles. 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>
</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 (20526 => 20527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-control.php 2012-04-19 03:43:56 UTC (rev 20526)
+++ trunk/wp-includes/class-wp-customize-control.php 2012-04-19 06:29:54 UTC (rev 20527)
</span><span class="lines">@@ -300,35 +300,36 @@
</span><span class="cx"> $src = call_user_func( $this->get_url, $src );
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>- <label>
</del><ins>+ <label class="customize-image-picker">
</ins><span class="cx"> <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
</span><del>- <div class="customize-image-picker">
- <div class="thumbnail">
- <?php if ( empty( $src ) ): ?>
- <img style="display:none;" />
- <?php else: ?>
- <img src="<?php echo esc_url( $src ); ?>" />
- <?php endif; ?>
- </div>
- <div class="actions">
- <a href="#" class="upload"><?php _e( 'Upload New' ); ?></a>
- <a href="#" class="change"><?php _e( 'Change Image' ); ?></a>
- <a href="#" class="remove"><?php _e( 'Remove Image' ); ?></a>
- </div>
- <div class="library">
- <ul>
- <?php foreach ( $this->tabs as $tab ): ?>
- <li data-customize-tab='<?php echo esc_attr( $tab[0] ); ?>'>
- <?php echo esc_html( $tab[1] ); ?>
- </li>
- <?php endforeach; ?>
- </ul>
</del><ins>+
+ <div class="thumbnail">
+ <?php if ( empty( $src ) ): ?>
+ <img style="display:none;" />
+ <?php else: ?>
+ <img src="<?php echo esc_url( $src ); ?>" />
+ <?php endif; ?>
+ </div>
+
+ <div class="actions">
+ <a href="#" class="upload"><?php _e( 'Upload New' ); ?></a>
+ <a href="#" class="change"><?php _e( 'Change Image' ); ?></a>
+ <a href="#" class="remove"><?php _e( 'Remove Image' ); ?></a>
+ </div>
+
+ <div class="library">
+ <ul>
</ins><span class="cx"> <?php foreach ( $this->tabs as $tab ): ?>
</span><del>- <div class="library-content" data-customize-tab='<?php echo esc_attr( $tab[0] ); ?>'>
- <?php call_user_func( $tab[2] ); ?>
- </div>
</del><ins>+ <li data-customize-tab='<?php echo esc_attr( $tab[0] ); ?>'>
+ <?php echo esc_html( $tab[1] ); ?>
+ </li>
</ins><span class="cx"> <?php endforeach; ?>
</span><del>- </div>
</del><ins>+ </ul>
+ <?php foreach ( $this->tabs as $tab ): ?>
+ <div class="library-content" data-customize-tab='<?php echo esc_attr( $tab[0] ); ?>'>
+ <?php call_user_func( $tab[2] ); ?>
+ </div>
+ <?php endforeach; ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </label>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpincludescsscustomizecontrolsdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/customize-controls.dev.css (20526 => 20527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/customize-controls.dev.css 2012-04-19 03:43:56 UTC (rev 20526)
+++ trunk/wp-includes/css/customize-controls.dev.css 2012-04-19 06:29:54 UTC (rev 20527)
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .customize-control-text input {
</span><ins>+ float: right;
</ins><span class="cx"> width: 138px;
</span><span class="cx"> line-height: 18px;
</span><span class="cx"> margin: 1px;
</span><span class="lines">@@ -316,63 +317,57 @@
</span><span class="cx"> /*
</span><span class="cx"> * Image Picker
</span><span class="cx"> */
</span><del>-.customize-section .customize-image-picker {
- float: left;
-}
-
-.customize-section .customize-image-picker .thumbnail {
- float: left;
- clear: left;
- width: 100px;
- margin-right: 20px;
</del><ins>+.customize-section .customize-control-image .thumbnail {
+ float: right;
+ width: 140px;
</ins><span class="cx"> min-height: 1em;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .thumbnail img {
- max-width: 98px;
</del><ins>+.customize-section .customize-control-image .thumbnail img {
+ max-width: 138px;
</ins><span class="cx"> max-height: 98px;
</span><span class="cx"> border: 1px solid #ccc;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .actions {
</del><ins>+.customize-section .customize-control-image .actions {
</ins><span class="cx"> width: 140px;
</span><del>- float: left;
</del><ins>+ float: right;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .actions a {
</del><ins>+.customize-section .customize-control-image .actions a {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library {
</del><ins>+.customize-section .customize-control-image .library {
</ins><span class="cx"> display: none;
</span><span class="cx"> /* float: left;*/
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/*.customize-section .customize-image-picker .library label {
</del><ins>+/*.customize-section .customize-control-image .library label {
</ins><span class="cx"> display: block;
</span><span class="cx"> position: relative;
</span><span class="cx"> float: left;
</span><span class="cx"> padding: 0 0 5px 20px;
</span><span class="cx"> }
</span><del>-.customize-section .customize-image-picker .library input {
</del><ins>+.customize-section .customize-control-image .library input {
</ins><span class="cx"> display: block;
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 50%;
</span><span class="cx"> left: 0;
</span><span class="cx"> margin-top: -7px;
</span><span class="cx"> }*/
</span><del>-/*.customize-section .customize-image-picker .library .wp-tab-panel {
</del><ins>+/*.customize-section .customize-control-image .library .wp-tab-panel {
</ins><span class="cx"> padding: 10px 10px 5px 8px;
</span><span class="cx"> }*/
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library ul {
</del><ins>+.customize-section .customize-control-image .library ul {
</ins><span class="cx"> border-bottom: 1px solid #dfdfdf;
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100%;
</span><span class="cx"> margin: 5px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library li {
</del><ins>+.customize-section .customize-control-image .library li {
</ins><span class="cx"> color: #999;
</span><span class="cx"> float: left;
</span><span class="cx"> padding: 4px 6px;
</span><span class="lines">@@ -382,7 +377,7 @@
</span><span class="cx"> border-width: 1px 1px 0 1px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library li.library-selected {
</del><ins>+.customize-section .customize-control-image .library li.library-selected {
</ins><span class="cx"> color: #777;
</span><span class="cx"> border-color: #dfdfdf;
</span><span class="cx"> background: #f5f5f5;
</span><span class="lines">@@ -390,12 +385,12 @@
</span><span class="cx"> padding-bottom: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library div {
</del><ins>+.customize-section .customize-control-image .library div {
</ins><span class="cx"> width: 100%;
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library a {
</del><ins>+.customize-section .customize-control-image .library a {
</ins><span class="cx"> display: block;
</span><span class="cx"> max-width: 220px;
</span><span class="cx"> max-height: 80px;
</span><span class="lines">@@ -405,16 +400,16 @@
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library a:hover {
</del><ins>+.customize-section .customize-control-image .library a:hover {
</ins><span class="cx"> border-color: #21759b;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library img {
</del><ins>+.customize-section .customize-control-image .library img {
</ins><span class="cx"> display: block;
</span><span class="cx"> max-width: 220px;
</span><span class="cx"> max-height: 80px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.customize-section .customize-image-picker .library-content {
</del><ins>+.customize-section .customize-control-image .library-content {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>