Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/js/media/views/attachments/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ AttachmentsBrowser = View.extend(/** @lends wp.media.view.AttachmentsBrowser.pro
text: l10n.deletePermanently,
controller: this.controller,
priority: -55,
size: '',
click: function() {
var removed = [],
destroy = [],
Expand Down
3 changes: 3 additions & 0 deletions src/js/media/views/button/delete-selected.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ DeleteSelected = Button.extend(/** @lends wp.media.view.DeleteSelectedButton.pro

render: function() {
Button.prototype.render.apply( this, arguments );
this.model.set( {
size: ''
} );
Comment on lines 42 to +46
if ( this.controller.isModeActive( 'select' ) ) {
this.$el.addClass( 'delete-selected-button' );
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/js/media/views/button/select-mode-toggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ SelectModeToggle = Button.extend(/** @lends wp.media.view.SelectModeToggle.proto

render: function() {
Button.prototype.render.apply( this, arguments );
this.$el.addClass( 'select-mode-toggle-button button-compact' );
this.$el.addClass( 'select-mode-toggle-button' );
return this;
},

Expand All @@ -52,7 +52,7 @@ SelectModeToggle = Button.extend(/** @lends wp.media.view.SelectModeToggle.proto
// @todo The Frame should be doing all of this.
if ( this.controller.isModeActive( 'select' ) ) {
this.model.set( {
size: 'large',
size: '',
text: l10n.cancel
} );
children.not( '.spinner, .media-button' ).hide();
Expand Down
10 changes: 6 additions & 4 deletions src/wp-admin/css/colors/_admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ span.wp-media-buttons-icon:before {
.media-modal .delete-attachment,
.media-modal .trash-attachment,
.media-modal .untrash-attachment,
.wp-core-ui .button-link-delete {
/* Needs higher specificity to override the default button-link. */
.wp-core-ui .button-link-delete.button-link-delete {
color: tokens.$alert-red;
}
Comment on lines 65 to 71

Expand All @@ -75,8 +76,9 @@ span.wp-media-buttons-icon:before {
.media-modal .delete-attachment:focus,
.media-modal .trash-attachment:focus,
.media-modal .untrash-attachment:focus,
.wp-core-ui .button-link-delete:hover,
.wp-core-ui .button-link-delete:focus {
/* Need higher specificity to override the default button-link. */
.wp-core-ui .button-link-delete.button-link-delete:hover,
.wp-core-ui .button-link-delete.button-link-delete:focus {
color: color.adjust(tokens.$alert-red, $lightness: 10%);
}

Expand Down Expand Up @@ -158,7 +160,7 @@ input[type="radio"]:focus {
.wp-core-ui {

/* Default button - theme color border and text (matches secondary) */
.button {
.button:not(.button-link) {
@include mixins.button-secondary();
}

Expand Down
1 change: 1 addition & 0 deletions src/wp-admin/css/media.css
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ border color while dragging a file over the uploader drop area */
.media-frame.mode-grid .media-toolbar {
margin-bottom: 15px;
height: auto;
min-height: 80px;
}

.media-frame.mode-grid .media-toolbar label:not(.media-search-input-label) {
Expand Down
Loading