WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Customizer: Remove obsolete `.control-panel-back` and `.customize-overlay-close` buttons. 

props afercia, ocean90.
see #31336.
fixes #33229.
Built from https://develop.svn.wordpress.org/trunk@33599


git-svn-id: http://core.svn.wordpress.org/trunk@33566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-08-09 19:00:24 +00:00
parent bd342572f1
commit 45b8634605
10 changed files with 18 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
wp-admin/css/customize-controls-rtl.css
View File

@ -41,10 +41,6 @@ body {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
#customize-header-actions .secondary-actions {
display: none;
}
#customize-controls .wp-full-overlay-sidebar-content { #customize-controls .wp-full-overlay-sidebar-content {
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
@ -273,10 +269,6 @@ h3.customize-section-title {
right: -100%; right: -100%;
} }
.section-open .control-panel-back {
display: none;
}
.accordion-sub-container.control-panel-content { .accordion-sub-container.control-panel-content {
display: none; display: none;
position: absolute; position: absolute;
@ -300,7 +292,6 @@ h3.customize-section-title {
width: 100%; width: 100%;
} }
.customize-overlay-close,
.customize-controls-close { .customize-controls-close {
display: block; display: block;
position: absolute; position: absolute;
@ -322,29 +313,6 @@ h3.customize-section-title {
box-sizing: content-box; box-sizing: content-box;
} }
.customize-overlay-close {
right: auto;
left: 0;
border-left: 0;
border-right: 1px solid #ddd;
}
.control-panel-back {
display: block;
position: fixed;
top: 0;
z-index: 99;
right: -48px;
width: 45px;
height: 45px;
padding-left: 2px;
background: #eee;
border-left: 1px solid #ddd;
cursor: pointer;
-webkit-transition: right .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
transition: right .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
}
.customize-panel-back, .customize-panel-back,
.customize-section-back { .customize-section-back {
display: block; display: block;
@ -367,14 +335,12 @@ h3.customize-section-title {
height: 70px; height: 70px;
} }
.ios .control-panel-back,
.ios .customize-panel-back, .ios .customize-panel-back,
.ios .customize-section-back { .ios .customize-section-back {
-webkit-transition: right 0s; -webkit-transition: right 0s;
transition: right 0s; transition: right 0s;
} }
.collapsed .control-panel-back,
.ios .customize-panel-back { .ios .customize-panel-back {
display: none; display: none;
} }
@ -392,12 +358,8 @@ h3.customize-section-title {
color: #555; color: #555;
} }
.customize-overlay-close:focus,
.customize-overlay-close:hover,
.customize-controls-close:focus, .customize-controls-close:focus,
.customize-controls-close:hover, .customize-controls-close:hover,
.control-panel-back:focus,
.control-panel-back:hover,
.customize-controls-preview-toggle:focus, .customize-controls-preview-toggle:focus,
.customize-controls-preview-toggle:hover { .customize-controls-preview-toggle:hover {
background: #ddd; background: #ddd;
@ -419,7 +381,6 @@ h3.customize-section-title {
box-shadow: none; box-shadow: none;
} }
.customize-overlay-close:before,
.customize-controls-close:before { .customize-controls-close:before {
font: normal 22px/45px dashicons; font: normal 22px/45px dashicons;
content: "\f335"; content: "\f335";
@ -436,14 +397,6 @@ h3.customize-section-title {
right: 13px; right: 13px;
} }
.control-panel-back:before {
font: normal 20px/45px dashicons;
content: "\f345";
position: relative;
top: 1px;
right: 13px;
}
.wp-full-overlay-sidebar .wp-full-overlay-header { .wp-full-overlay-sidebar .wp-full-overlay-header {
-webkit-transition: padding ease-in-out .18s; -webkit-transition: padding ease-in-out .18s;
transition: padding ease-in-out .18s; transition: padding ease-in-out .18s;

2
wp-admin/css/customize-controls-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

47
wp-admin/css/customize-controls.css
View File

@ -41,10 +41,6 @@ body {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
#customize-header-actions .secondary-actions {
display: none;
}
#customize-controls .wp-full-overlay-sidebar-content { #customize-controls .wp-full-overlay-sidebar-content {
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
@ -273,10 +269,6 @@ h3.customize-section-title {
left: -100%; left: -100%;
} }
.section-open .control-panel-back {
display: none;
}
.accordion-sub-container.control-panel-content { .accordion-sub-container.control-panel-content {
display: none; display: none;
position: absolute; position: absolute;
@ -300,7 +292,6 @@ h3.customize-section-title {
width: 100%; width: 100%;
} }
.customize-overlay-close,
.customize-controls-close { .customize-controls-close {
display: block; display: block;
position: absolute; position: absolute;
@ -322,29 +313,6 @@ h3.customize-section-title {
box-sizing: content-box; box-sizing: content-box;
} }
.customize-overlay-close {
left: auto;
right: 0;
border-right: 0;
border-left: 1px solid #ddd;
}
.control-panel-back {
display: block;
position: fixed;
top: 0;
z-index: 99;
left: -48px;
width: 45px;
height: 45px;
padding-right: 2px;
background: #eee;
border-right: 1px solid #ddd;
cursor: pointer;
-webkit-transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
transition: left .18s ease-in-out, color .1s ease-in-out, background .1s ease-in-out;
}
.customize-panel-back, .customize-panel-back,
.customize-section-back { .customize-section-back {
display: block; display: block;
@ -367,14 +335,12 @@ h3.customize-section-title {
height: 70px; height: 70px;
} }
.ios .control-panel-back,
.ios .customize-panel-back, .ios .customize-panel-back,
.ios .customize-section-back { .ios .customize-section-back {
-webkit-transition: left 0s; -webkit-transition: left 0s;
transition: left 0s; transition: left 0s;
} }
.collapsed .control-panel-back,
.ios .customize-panel-back { .ios .customize-panel-back {
display: none; display: none;
} }
@ -392,12 +358,8 @@ h3.customize-section-title {
color: #555; color: #555;
} }
.customize-overlay-close:focus,
.customize-overlay-close:hover,
.customize-controls-close:focus, .customize-controls-close:focus,
.customize-controls-close:hover, .customize-controls-close:hover,
.control-panel-back:focus,
.control-panel-back:hover,
.customize-controls-preview-toggle:focus, .customize-controls-preview-toggle:focus,
.customize-controls-preview-toggle:hover { .customize-controls-preview-toggle:hover {
background: #ddd; background: #ddd;
@ -419,7 +381,6 @@ h3.customize-section-title {
box-shadow: none; box-shadow: none;
} }
.customize-overlay-close:before,
.customize-controls-close:before { .customize-controls-close:before {
font: normal 22px/45px dashicons; font: normal 22px/45px dashicons;
content: "\f335"; content: "\f335";
@ -436,14 +397,6 @@ h3.customize-section-title {
left: 13px; left: 13px;
} }
.control-panel-back:before {
font: normal 20px/45px dashicons;
content: "\f341";
position: relative;
top: 1px;
left: 13px;
}
.wp-full-overlay-sidebar .wp-full-overlay-header { .wp-full-overlay-sidebar .wp-full-overlay-header {
-webkit-transition: padding ease-in-out .18s; -webkit-transition: padding ease-in-out .18s;
transition: padding ease-in-out .18s; transition: padding ease-in-out .18s;

2
wp-admin/css/customize-controls.min.css vendored
View File

File diff suppressed because one or more lines are too long

32
wp-admin/customize.php
View File

@ -123,26 +123,18 @@ do_action( 'customize_controls_print_scripts' );
<div class="wp-full-overlay expanded"> <div class="wp-full-overlay expanded">
<form id="customize-controls" class="wrap wp-full-overlay-sidebar"> <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
<div id="customize-header-actions" class="wp-full-overlay-header"> <div id="customize-header-actions" class="wp-full-overlay-header">
<div class="primary-actions"> <?php
<?php $save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
$save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' ); submit_button( $save_text, 'primary save', 'save', false );
submit_button( $save_text, 'primary save', 'save', false ); ?>
?> <span class="spinner"></span>
<span class="spinner"></span> <a class="customize-controls-preview-toggle" href="#">
<a class="customize-controls-preview-toggle" href="#"> <span class="controls"><?php _e( 'Customize' ); ?></span>
<span class="controls"><?php _e( 'Customize' ); ?></span> <span class="preview"><?php _e( 'Preview' ); ?></span>
<span class="preview"><?php _e( 'Preview' ); ?></span> </a>
</a> <a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
<a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>"> <span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
<span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span> </a>
</a>
<span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
</div>
<div class="secondary-actions">
<button type="button" class="customize-overlay-close">
<span class="screen-reader-text"><?php _e( 'Close overlay' ); ?></span>
</button>
</div>
</div> </div>
<div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat --> <div id="widgets-right"><!-- For Widget Customizer, many widgets try to look for instances under div#widgets-right, so we have to add that ID to a container div in the Customizer for compat -->

12
wp-admin/js/customize-controls.js
View File

@ -3388,18 +3388,6 @@
event.preventDefault(); event.preventDefault();
}); });
// Go back to the top-level Customizer accordion.
$( '#customize-header-actions' ).on( 'click keydown', '.control-panel-back', function( event ) {
if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
return;
}
event.preventDefault(); // Keep this AFTER the key filter above
api.panel.each( function ( panel ) {
panel.collapse();
});
});
closeBtn.keydown( function( event ) { closeBtn.keydown( function( event ) {
if ( 9 === event.which ) // tab if ( 9 === event.which ) // tab
return; return;

2
wp-admin/js/customize-controls.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/js/customize-widgets.js
View File

@ -177,7 +177,7 @@
// If the available widgets panel is open and the customize controls are // If the available widgets panel is open and the customize controls are
// interacted with (i.e. available widgets panel is blurred) then close the // interacted with (i.e. available widgets panel is blurred) then close the
// available widgets panel. Also close on back button click. // available widgets panel. Also close on back button click.
$( '#customize-controls, .customize-overlay-close, #available-widgets .customize-section-title' ).on( 'click keydown', function( e ) { $( '#customize-controls, #available-widgets .customize-section-title' ).on( 'click keydown', function( e ) {
var isAddNewBtn = $( e.target ).is( '.add-new-widget, .add-new-widget *' ); var isAddNewBtn = $( e.target ).is( '.add-new-widget, .add-new-widget *' );
if ( $( 'body' ).hasClass( 'adding-widget' ) && ! isAddNewBtn ) { if ( $( 'body' ).hasClass( 'adding-widget' ) && ! isAddNewBtn ) {
self.close(); self.close();

2
wp-admin/js/customize-widgets.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-RC2-33598'; $wp_version = '4.3-RC2-33599';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.