WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
05/15/2012 01:03:31 AM (14 years ago)
Author:
koopersmith
Message:

Theme Customizer: Prevent sidebar scrollbar from overlapping sidebar header or footer. fixes #20649, #20650, see #19910.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-includes/customize-controls.php

    r20737 r20791  
    4444    <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
    4545        <?php wp_nonce_field( 'customize_controls' ); ?>
    46         <div id="customize-header-actions" class="customize-section wp-full-overlay-header">
     46        <div id="customize-header-actions" class="wp-full-overlay-header">
    4747            <a class="back" href="<?php echo esc_url( admin_url( 'themes.php' ) ); ?>">
    4848                <?php printf( __( '&larr; Return to %s' ), __('Manage Themes') ); ?>
    … …  
    5050        </div>
    5151
    52         <div id="customize-info" class="customize-section">
    53             <div class="customize-section-title">
    54                 <span class="preview-notice"><?php _e('You are previewing'); ?></span>
    55                 <strong class="theme-name"><?php echo $this->theme->display('Name'); ?></strong>
     52        <div class="wp-full-overlay-sidebar-content">
     53            <div id="customize-info" class="customize-section">
     54                <div class="customize-section-title">
     55                    <span class="preview-notice"><?php _e('You are previewing'); ?></span>
     56                    <strong class="theme-name"><?php echo $this->theme->display('Name'); ?></strong>
     57                </div>
     58                <div class="customize-section-content">
     59                    <?php if ( $screenshot = $this->theme->get_screenshot() ) : ?>
     60                        <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
     61                    <?php endif; ?>
     62
     63                    <?php if ( $this->theme->get('Description') ): ?>
     64                        <div class="theme-description"><?php echo $this->theme->display('Description'); ?></div>
     65                    <?php endif; ?>
     66                </div>
    5667            </div>
    57             <div class="customize-section-content">
    58                 <?php if ( $screenshot = $this->theme->get_screenshot() ) : ?>
    59                     <img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
    60                 <?php endif; ?>
    6168
    62                 <?php if ( $this->theme->get('Description') ): ?>
    63                     <div class="theme-description"><?php echo $this->theme->display('Description'); ?></div>
    64                 <?php endif; ?>
    65             </div>
     69            <div id="customize-theme-controls"><ul>
     70                <?php
     71                foreach ( $this->sections as $section )
     72                    $section->maybe_render();
     73                ?>
     74            </ul></div>
    6675        </div>
    6776
    68         <div id="customize-theme-controls"><ul>
    69             <?php
    70             foreach ( $this->sections as $section )
    71                 $section->maybe_render();
    72             ?>
    73         </ul></div>
    74 
    75         <div id="customize-footer-actions" class="customize-section wp-full-overlay-footer">
     77        <div id="customize-footer-actions" class="wp-full-overlay-footer">
    7678            <?php
    7779            $save_text = $this->get_stylesheet() == $this->original_stylesheet ? __('Save') : __('Save and Activate');
Note: See TracChangeset for help on using the changeset viewer.