<!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>[32862] trunk/src: Media Library `Bulk Select` button size should be smaller.</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/32862">32862</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/32862","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-06-19 18:55:52 +0000 (Fri, 19 Jun 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'>Media Library `Bulk Select` button size should be smaller.
Props afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/32325">#32325</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssmediacss">trunk/src/wp-admin/css/media.css</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsbuttonselectmodetogglejs">trunk/src/wp-includes/js/media/views/button/select-mode-toggle.js</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssmediacss"></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/media.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/media.css 2015-06-19 18:48:06 UTC (rev 32861)
+++ trunk/src/wp-admin/css/media.css 2015-06-19 18:55:52 UTC (rev 32862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,8 +461,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0 16px;
</span><span class="cx" style="display: block; padding: 0 10px"> border-left: 4px solid #dd3d36;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
- background-color: #fff;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
+ background-color: #fff;
</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"> .upload-php .mode-grid .hide-sidebar .media-sidebar {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,9 +570,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 14px;
</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">-.media-frame.mode-grid .media-toolbar-secondary > .media-button {
- margin-top: 10px;
- margin-bottom: 10px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.media-frame.mode-grid.mode-edit .media-toolbar-secondary > .select-mode-toggle-button {
+ margin: 0 8px 0 0;
+ vertical-align: middle;
</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"> .media-frame.mode-grid .attachments-browser .bulk-select {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,7 +585,7 @@
</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"> .media-frame.mode-grid .spinner {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin-top: 15px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-top: 16px;
</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"> .attachments-browser .media-toolbar-secondary > .media-button {
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></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/css/media-views.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/media-views.css 2015-06-19 18:48:06 UTC (rev 32861)
+++ trunk/src/wp-includes/css/media-views.css 2015-06-19 18:55:52 UTC (rev 32862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1833,6 +1833,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .mejs-container:focus {
</span><span class="cx" style="display: block; padding: 0 10px"> outline: 1px solid #5b9dd9;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-shadow: 0 0 2px 1px rgba(30, 140, 190, .8);
</ins><span class="cx" style="display: block; padding: 0 10px"> box-shadow: 0 0 2px 1px rgba(30, 140, 190, .8);
</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="trunksrcwpincludesjsmediaviewsbuttonselectmodetogglejs"></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/js/media/views/button/select-mode-toggle.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/button/select-mode-toggle.js 2015-06-19 18:48:06 UTC (rev 32861)
+++ trunk/src/wp-includes/js/media/views/button/select-mode-toggle.js 2015-06-19 18:55:52 UTC (rev 32862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> SelectModeToggle = Button.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.defaults( this.options, {
+ size : ''
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> Button.prototype.initialize.apply( this, arguments );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.controller, 'selection:action:done', this.back );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,12 +50,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: the Frame should be doing all of this.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.controller.isModeActive( 'select' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.model.set( 'text', l10n.cancelSelection );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.model.set( {
+ size: 'large',
+ text: l10n.cancelSelection
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> children.not( '.spinner, .media-button' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.show();
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.model.set( 'text', l10n.bulkSelect );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.model.set( {
+ size: '',
+ text: l10n.bulkSelect
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.controller.content.get().$el.removeClass( 'fixed' );
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.$el.css( 'width', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></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/js/media-grid.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media-grid.js 2015-06-19 18:48:06 UTC (rev 32861)
+++ trunk/src/wp-includes/js/media-grid.js 2015-06-19 18:55:52 UTC (rev 32862)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,6 +279,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> SelectModeToggle = Button.extend({
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.defaults( this.options, {
+ size : ''
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> Button.prototype.initialize.apply( this, arguments );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.controller, 'selection:action:done', this.back );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,12 +314,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: the Frame should be doing all of this.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.controller.isModeActive( 'select' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.model.set( 'text', l10n.cancelSelection );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.model.set( {
+ size: 'large',
+ text: l10n.cancelSelection
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> children.not( '.spinner, .media-button' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.show();
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.model.set( 'text', l10n.bulkSelect );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.model.set( {
+ size: '',
+ text: l10n.bulkSelect
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.controller.content.get().$el.removeClass( 'fixed' );
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.$el.css( 'width', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
</span></span></pre>
</div>
</div>
</body>
</html>