Changeset 40510 for trunk/src/wp-admin/customize.php

Timestamp:

04/21/2017 05:15:29 AM (9 years ago)

Author:

westonruter

Message:

Customize: Fix visibility of "Hide Controls" link in IE.

Amends [39214].
Props timmydcrawford.
See #32296, #38762.
Fixes #40507.

File:

• trunk/src/wp-admin/customize.php (modified) (1 diff)

trunk/src/wp-admin/customize.php

@@ -172 +172 @@
 
         <div id="customize-footer-actions" class="wp-full-overlay-footer">
-            <?php $previewable_devices = $wp_customize->get_previewable_devices(); ?>
-            <?php if ( ! empty( $previewable_devices ) ) : ?>
-            <div class="devices">
-                <?php foreach ( (array) $previewable_devices as $device => $settings ) : ?>
-                    <?php
-                    if ( empty( $settings['label'] ) ) {
-                        continue;
-                    }
-                    $active = ! empty( $settings['default'] );
-                    $class = 'preview-' . $device;
-                    if ( $active ) {
-                        $class .= ' active';
-                    }
-                    ?>
-                    <button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ) ?>" data-device="<?php echo esc_attr( $device ); ?>">
-                        <span class="screen-reader-text"><?php echo esc_html( $settings['label'] ); ?></span>
-                    </button>
-                <?php endforeach; ?>
-            </div>
-            <?php endif; ?>
             <button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php echo esc_attr( _x( 'Hide Controls', 'label for hide controls button without length constraints' ) ); ?>">
                 <span class="collapse-sidebar-arrow"></span>
                 <span class="collapse-sidebar-label"><?php _ex( 'Hide Controls', 'short (~12 characters) label for hide controls button' ); ?></span>
             </button>
+            <?php $previewable_devices = $wp_customize->get_previewable_devices(); ?>
+            <?php if ( ! empty( $previewable_devices ) ) : ?>
+            <div class="devices-wrapper">
+                <div class="devices">
+                    <?php foreach ( (array) $previewable_devices as $device => $settings ) : ?>
+                        <?php
+                        if ( empty( $settings['label'] ) ) {
+                            continue;
+                        }
+                        $active = ! empty( $settings['default'] );
+                        $class = 'preview-' . $device;
+                        if ( $active ) {
+                            $class .= ' active';
+                        }
+                        ?>
+                        <button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ) ?>" data-device="<?php echo esc_attr( $device ); ?>">
+                            <span class="screen-reader-text"><?php echo esc_html( $settings['label'] ); ?></span>
+                        </button>
+                    <?php endforeach; ?>
+                </div>
+            </div>
+            <?php endif; ?>
         </div>
     </form>