Changeset 40671

Timestamp:

05/15/2017 06:50:50 PM (8 years ago)

Author:

westonruter

Message:

Customize: Fix alignment of natural-width media buttons in site icon control.

Amends [40653].
Props afercia.
Fixes #40220.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (1 diff)
• wp-includes/customize/class-wp-customize-header-image-control.php (modified) (1 diff)
• wp-includes/customize/class-wp-customize-media-control.php (modified) (2 diffs)
• wp-includes/customize/class-wp-customize-site-icon-control.php (modified) (3 diffs)

trunk/src/wp-admin/css/customize-controls.css

@@ -711 +711 @@
 }
 
+/* Remove descender space. */
 .customize-control .thumbnail-image,
 .customize-control-header .current,
 .customize-control .wp-media-wrapper.wp-video {
     line-height: 0;
+}
+
+/* Remove descender space. */
+.customize-control-site_icon .favicon-preview .browser-preview {
+    vertical-align: top;
 }
 

trunk/src/wp-includes/customize/class-wp-customize-header-image-control.php

@@ -205 +205 @@
                 <?php if ( current_user_can( 'upload_files' ) ): ?>
                 <button type="button"<?php echo $visibility; ?> class="button remove" aria-label="<?php esc_attr_e( 'Hide header image' ); ?>"><?php _e( 'Hide image' ); ?></button>
-                <button type="button" class="button new" id="header_image-button"  aria-label="<?php esc_attr_e( 'Add new header image' ); ?>"><?php _e( 'Add new image' ); ?></button>
-                <div style="clear:both"></div>
+                <button type="button" class="button new" id="header_image-button" aria-label="<?php esc_attr_e( 'Add new header image' ); ?>"><?php _e( 'Add new image' ); ?></button>
                 <?php endif; ?>
             </div>

trunk/src/wp-includes/customize/class-wp-customize-media-control.php

@@ -193 +193 @@
                     <button type="button" class="button remove-button">{{ data.button_labels.remove }}</button>
                     <button type="button" class="button upload-button control-focus" id="{{ data.settings['default'] }}-button">{{ data.button_labels.change }}</button>
-                    <div style="clear:both"></div>
                     <# } #>
                 </div>
@@ -209 +208 @@
                     <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button">{{ data.button_labels.select }}</button>
                     <# } #>
-                    <div style="clear:both"></div>
                 </div>
             </div>

trunk/src/wp-includes/customize/class-wp-customize-site-icon-control.php

@@ -63 +63 @@
             <div class="attachment-media-view">
                 <# if ( data.attachment.sizes ) { #>
-                    <div class="site-icon-preview">
+                    <div class="site-icon-preview wp-clearfix">
                         <div class="favicon-preview">
                             <img src="<?php echo esc_url( admin_url( 'images/' . ( is_rtl() ? 'browser-rtl.png' : 'browser.png' ) ) ); ?>" class="browser-preview" width="182" alt="" />
@@ -79 +79 @@
                         <button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
                         <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button"><?php echo $this->button_labels['change']; ?></button>
-                        <div style="clear:both"></div>
                     <# } #>
                 </div>
@@ -95 +94 @@
                         <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button"><?php echo $this->button_labels['select']; ?></button>
                     <# } #>
-                    <div style="clear:both"></div>
                 </div>
             </div>