Ticket #29381: 29381-01.patch

src/wp-includes/js/media-views.js

@@ -3911 +3911 @@
          */
         media.view.Toolbar = media.View.extend({
                 tagName:   'div',
-                className: 'media-toolbar wp-filter',
+                className: 'media-toolbar',
 
                 initialize: function() {
                         var state = this.controller.state(),
@@ -5750 +5750 @@
                 },
 
                 createToolbar: function() {
-                        var LibraryViewSwitcher, Filters;
+                        var LibraryViewSwitcher, Filters, toolbarOptions;
 
-                        /**
-                         * @member {wp.media.view.Toolbar}
-                         */
-                        this.toolbar = new media.view.Toolbar({
+                        toolbarOptions = {
                                 controller: this.controller
-                        });
+                        };
+
+                        if ( this.controller.isModeActive( 'grid' ) ) {
+                                toolbarOptions.className = 'media-toolbar wp-filter';
+                        }
+
+                        /**
+                        * @member {wp.media.view.Toolbar}
+                        */
+                        this.toolbar = new media.view.Toolbar( toolbarOptions );
 
                         this.views.add( this.toolbar );