Skip to content

Commit 91138e1

Browse files
committed
Media: Fix Media grid toolbar height and 'button-link' styling when Bulk editing.
Updates Media Library grid toolbar styling to prevent content shifting and normalizes button appearance when switching modes (e.g., Bulk Select mode) by stabilizing toolbar height and removing unintended button sizing. Also, adjusts the buttons styling so that 'button-links' for destructive actions use the intended red color and prevents them from being styled as standard buttons. Developed in WordPress#12714 Props afercia, joedolson, shailu25, khokansardar, ozgursar. Fixes #65732. git-svn-id: https://develop.svn.wordpress.org/trunk@62959 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 084583d commit 91138e1

6 files changed

Lines changed: 16 additions & 8 deletions

File tree

‎src/js/media/views/attachments/browser.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ AttachmentsBrowser = View.extend(/** @lends wp.media.view.AttachmentsBrowser.pro
328328
text: l10n.deletePermanently,
329329
controller: this.controller,
330330
priority: -55,
331+
size: '',
331332
click: function() {
332333
var removed = [],
333334
destroy = [],

‎src/js/media/views/button/delete-selected.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ DeleteSelected = Button.extend(/** @lends wp.media.view.DeleteSelectedButton.pro
4040
},
4141

4242
render: function() {
43+
// Set size silently before calling base render to avoid nested renders.
44+
this.model.set( 'size', '', { silent: true } );
4345
Button.prototype.render.apply( this, arguments );
46+
4447
if ( this.controller.isModeActive( 'select' ) ) {
4548
this.$el.addClass( 'delete-selected-button' );
4649
} else {

‎src/js/media/views/button/select-mode-toggle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SelectModeToggle = Button.extend(/** @lends wp.media.view.SelectModeToggle.proto
4040

4141
render: function() {
4242
Button.prototype.render.apply( this, arguments );
43-
this.$el.addClass( 'select-mode-toggle-button button-compact' );
43+
this.$el.addClass( 'select-mode-toggle-button' );
4444
return this;
4545
},
4646

@@ -52,7 +52,7 @@ SelectModeToggle = Button.extend(/** @lends wp.media.view.SelectModeToggle.proto
5252
// @todo The Frame should be doing all of this.
5353
if ( this.controller.isModeActive( 'select' ) ) {
5454
this.model.set( {
55-
size: 'large',
55+
size: '',
5656
text: l10n.cancel
5757
} );
5858
children.not( '.spinner, .media-button' ).hide();

‎src/wp-admin/css/colors/_admin.scss‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ span.wp-media-buttons-icon:before {
6565
.media-modal .delete-attachment,
6666
.media-modal .trash-attachment,
6767
.media-modal .untrash-attachment,
68-
.wp-core-ui .button-link-delete {
68+
/* Needs higher specificity to override the default button-link. */
69+
.wp-core-ui .button-link.button-link-delete {
6970
color: tokens.$alert-red;
7071
}
7172

@@ -75,9 +76,10 @@ span.wp-media-buttons-icon:before {
7576
.media-modal .delete-attachment:focus,
7677
.media-modal .trash-attachment:focus,
7778
.media-modal .untrash-attachment:focus,
78-
.wp-core-ui .button-link-delete:hover,
79-
.wp-core-ui .button-link-delete:focus {
80-
color: color.adjust(tokens.$alert-red, $lightness: 10%);
79+
/* Needs higher specificity to override the default button-link. */
80+
.wp-core-ui .button-link.button-link-delete:hover,
81+
.wp-core-ui .button-link.button-link-delete:focus {
82+
color: color.adjust(tokens.$alert-red, $lightness: -10%);
8183
}
8284

8385
/* Forms */
@@ -156,9 +158,9 @@ input[type="radio"]:focus {
156158
/* Core UI */
157159

158160
.wp-core-ui {
159-
160161
/* Default button - theme color border and text (matches secondary) */
161-
.button {
162+
/* Exclude .button-link without increasing specificity. */
163+
.button:where(:not(.button-link)) {
162164
@include mixins.button-secondary();
163165
}
164166

‎src/wp-admin/css/media.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,7 @@ border color while dragging a file over the uploader drop area */
558558
.media-frame.mode-grid .media-toolbar {
559559
margin-bottom: 15px;
560560
height: auto;
561+
min-height: 80px;
561562
}
562563

563564
.media-frame.mode-grid .media-toolbar label:not(.media-search-input-label) {

‎src/wp-includes/css/buttons.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ TABLE OF CONTENTS:
223223

224224
.wp-core-ui .button[aria-disabled="true"],
225225
.wp-core-ui .button-secondary[aria-disabled="true"] {
226+
color: #8a8a8a !important;
226227
cursor: default;
227228
}
228229

0 commit comments

Comments
 (0)