Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 14:53:08 +02:00
Code Issues Projects Releases Wiki Activity

Media Library Bulk Select button size should be smaller.

Browse Source 
Props afercia.
Fixes #32325.

Built from https://develop.svn.wordpress.org/trunk@32862


git-svn-id: http://core.svn.wordpress.org/trunk@32833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-06-19 18:56:27 +00:00
parent c5e088bf0f
commit b212ee67e7
11 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/css/media-rtl.css
View File

@ -461,8 +461,8 @@ border color while dragging a file over the uploader drop area */
padding: 0 16px;
border-right: 4px solid #dd3d36;
-webkit-box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
background-color: #fff;
box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
background-color: #fff;
}
.upload-php .mode-grid .hide-sidebar .media-sidebar {
@ -570,9 +570,9 @@ border color while dragging a file over the uploader drop area */
font-size: 14px;
}
.media-frame.mode-grid .media-toolbar-secondary > .media-button {
margin-top: 10px;
margin-bottom: 10px;
.media-frame.mode-grid.mode-edit .media-toolbar-secondary > .select-mode-toggle-button {
margin: 0 0 0 8px;
vertical-align: middle;
}
.media-frame.mode-grid .attachments-browser .bulk-select {
@ -585,7 +585,7 @@ border color while dragging a file over the uploader drop area */
}
.media-frame.mode-grid .spinner {
margin-top: 15px;
margin-top: 16px;
}
.attachments-browser .media-toolbar-secondary > .media-button {

12
wp-admin/css/media.css
View File

@ -461,8 +461,8 @@ border color while dragging a file over the uploader drop area */
padding: 0 16px;
border-left: 4px solid #dd3d36;
-webkit-box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
background-color: #fff;
box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
background-color: #fff;
}
.upload-php .mode-grid .hide-sidebar .media-sidebar {
@ -570,9 +570,9 @@ border color while dragging a file over the uploader drop area */
font-size: 14px;
}
.media-frame.mode-grid .media-toolbar-secondary > .media-button {
margin-top: 10px;
margin-bottom: 10px;
.media-frame.mode-grid.mode-edit .media-toolbar-secondary > .select-mode-toggle-button {
margin: 0 8px 0 0;
vertical-align: middle;
}
.media-frame.mode-grid .attachments-browser .bulk-select {
@ -585,7 +585,7 @@ border color while dragging a file over the uploader drop area */
}
.media-frame.mode-grid .spinner {
margin-top: 15px;
margin-top: 16px;
}
.attachments-browser .media-toolbar-secondary > .media-button {

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
wp-includes/css/media-views-rtl.css
View File

@ -1833,6 +1833,7 @@
.mejs-container:focus {
outline: 1px solid #5b9dd9;
-webkit-box-shadow: 0 0 2px 1px rgba(30, 140, 190, .8);
box-shadow: 0 0 2px 1px rgba(30, 140, 190, .8);
}

2
wp-includes/css/media-views-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
wp-includes/css/media-views.css
View File

@ -1833,6 +1833,7 @@
.mejs-container:focus {
outline: 1px solid #5b9dd9;
-webkit-box-shadow: 0 0 2px 1px rgba(30, 140, 190, .8);
box-shadow: 0 0 2px 1px rgba(30, 140, 190, .8);
}

2
wp-includes/css/media-views.min.css vendored
View File

File diff suppressed because one or more lines are too long

14
wp-includes/js/media-grid.js
View File

@ -279,6 +279,10 @@ var Button = wp.media.view.Button,
SelectModeToggle = Button.extend({
initialize: function() {
_.defaults( this.options, {
size : ''
} );
Button.prototype.initialize.apply( this, arguments );
this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
this.listenTo( this.controller, 'selection:action:done', this.back );
@ -310,12 +314,18 @@ SelectModeToggle = Button.extend({
// TODO: the Frame should be doing all of this.
if ( this.controller.isModeActive( 'select' ) ) {
this.model.set( 'text', l10n.cancelSelection );
this.model.set( {
size: 'large',
text: l10n.cancelSelection
} );
children.not( '.spinner, .media-button' ).hide();
this.$el.show();
toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
} else {
this.model.set( 'text', l10n.bulkSelect );
this.model.set( {
size: '',
text: l10n.bulkSelect
} );
this.controller.content.get().$el.removeClass( 'fixed' );
toolbar.$el.css( 'width', '' );
toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );

2
wp-includes/js/media-grid.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-32861';
$wp_version = '4.3-alpha-32862';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.