mirror of
https://github.com/WordPress/WordPress.git
synced 2025-01-03 06:57:35 +01:00
Themes: Bring the device preview from [31195] to the theme install previewer.
Props celloexpressions. Fixes #36017. Built from https://develop.svn.wordpress.org/trunk@36858 git-svn-id: http://core.svn.wordpress.org/trunk@36825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling
parent
b5cc1c7dfa
commit
30f8c75047
@ -1308,129 +1308,6 @@ body.cheatin p {
|
||||
color: #00a0d2;
|
||||
}
|
||||
|
||||
/* Device/preview size toggles */
|
||||
|
||||
.wp-full-overlay {
|
||||
background: #191e23;
|
||||
}
|
||||
|
||||
#customize-preview.wp-full-overlay-main {
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
.expanded #customize-footer-actions {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
width: 300px;
|
||||
height: 45px;
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices {
|
||||
float: left;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button {
|
||||
cursor: pointer;
|
||||
background: transparent;
|
||||
border: none;
|
||||
height: 45px;
|
||||
padding: 0 3px;
|
||||
margin: 0 -4px 0 0;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
border-top: 1px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
-webkit-transition: background .1s ease-in-out;
|
||||
transition: background .1s ease-in-out;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button:focus {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button:before {
|
||||
display: inline-block;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
font: normal 20px/30px "dashicons";
|
||||
vertical-align: top;
|
||||
margin: 3px 0;
|
||||
padding: 4px 8px;
|
||||
color: #656a6f;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button.active {
|
||||
border-bottom-color: #191e23;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button:hover,
|
||||
#customize-footer-actions .devices button:focus {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button:focus {
|
||||
background-color: #fff;
|
||||
border-bottom-color: #0073aa;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button.active:before,
|
||||
#customize-footer-actions .devices button:hover:before,
|
||||
#customize-footer-actions .devices button:focus:before {
|
||||
color: #191e23;
|
||||
}
|
||||
|
||||
.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
|
||||
.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
|
||||
color: #191e23;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices .preview-desktop:before {
|
||||
content: "\f472";
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices .preview-tablet:before {
|
||||
content: "\f471";
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices .preview-mobile:before {
|
||||
content: "\f470";
|
||||
}
|
||||
|
||||
@media screen and (max-width:1024px) {
|
||||
#customize-footer-actions .devices {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.collapsed #customize-footer-actions .devices button:before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.collapsed #customize-footer-actions .devices .preview-full {
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.preview-mobile #customize-preview {
|
||||
margin: auto -160px auto 0;
|
||||
width: 320px;
|
||||
height: 480px;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
right: 50%;
|
||||
}
|
||||
|
||||
.preview-tablet #customize-preview {
|
||||
margin: auto -3in auto 0;
|
||||
width: 6in;
|
||||
height: 9in;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
right: 50%;
|
||||
}
|
||||
|
||||
.widget-reorder-nav span,
|
||||
.menu-item-reorder-nav button {
|
||||
position: relative;
|
||||
|
||||
2
wp-admin/css/customize-controls-rtl.min.css
vendored
2
wp-admin/css/customize-controls-rtl.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1308,129 +1308,6 @@ body.cheatin p {
|
||||
color: #00a0d2;
|
||||
}
|
||||
|
||||
/* Device/preview size toggles */
|
||||
|
||||
.wp-full-overlay {
|
||||
background: #191e23;
|
||||
}
|
||||
|
||||
#customize-preview.wp-full-overlay-main {
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
.expanded #customize-footer-actions {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 300px;
|
||||
height: 45px;
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices {
|
||||
float: right;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button {
|
||||
cursor: pointer;
|
||||
background: transparent;
|
||||
border: none;
|
||||
height: 45px;
|
||||
padding: 0 3px;
|
||||
margin: 0 0 0 -4px;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
border-top: 1px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
-webkit-transition: background .1s ease-in-out;
|
||||
transition: background .1s ease-in-out;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button:focus {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button:before {
|
||||
display: inline-block;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
font: normal 20px/30px "dashicons";
|
||||
vertical-align: top;
|
||||
margin: 3px 0;
|
||||
padding: 4px 8px;
|
||||
color: #656a6f;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button.active {
|
||||
border-bottom-color: #191e23;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button:hover,
|
||||
#customize-footer-actions .devices button:focus {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button:focus {
|
||||
background-color: #fff;
|
||||
border-bottom-color: #0073aa;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices button.active:before,
|
||||
#customize-footer-actions .devices button:hover:before,
|
||||
#customize-footer-actions .devices button:focus:before {
|
||||
color: #191e23;
|
||||
}
|
||||
|
||||
.wp-core-ui .wp-full-overlay .collapse-sidebar:hover,
|
||||
.wp-core-ui .wp-full-overlay .collapse-sidebar:focus {
|
||||
color: #191e23;
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices .preview-desktop:before {
|
||||
content: "\f472";
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices .preview-tablet:before {
|
||||
content: "\f471";
|
||||
}
|
||||
|
||||
#customize-footer-actions .devices .preview-mobile:before {
|
||||
content: "\f470";
|
||||
}
|
||||
|
||||
@media screen and (max-width:1024px) {
|
||||
#customize-footer-actions .devices {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.collapsed #customize-footer-actions .devices button:before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.collapsed #customize-footer-actions .devices .preview-full {
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.preview-mobile #customize-preview {
|
||||
margin: auto 0 auto -160px;
|
||||
width: 320px;
|
||||
height: 480px;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
left: 50%;
|
||||
}
|
||||
|
||||
.preview-tablet #customize-preview {
|
||||
margin: auto 0 auto -3in;
|
||||
width: 6in;
|
||||
height: 9in;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
left: 50%;
|
||||
}
|
||||
|
||||
.widget-reorder-nav span,
|
||||
.menu-item-reorder-nav button {
|
||||
position: relative;
|
||||
|
||||
2
wp-admin/css/customize-controls.min.css
vendored
2
wp-admin/css/customize-controls.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1480,6 +1480,121 @@ body.full-overlay-active {
|
||||
transition-duration: 0.2s;
|
||||
}
|
||||
|
||||
/* Device/preview size toggles */
|
||||
|
||||
.wp-full-overlay {
|
||||
background: #191e23;
|
||||
}
|
||||
|
||||
.wp-full-overlay-main {
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
.expanded .wp-full-overlay-footer {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
width: 300px;
|
||||
height: 45px;
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button {
|
||||
cursor: pointer;
|
||||
background: transparent;
|
||||
border: none;
|
||||
height: 45px;
|
||||
padding: 0 3px;
|
||||
margin: 0 -4px 0 0;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
border-top: 1px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
-webkit-transition: background .1s ease-in-out;
|
||||
transition: background .1s ease-in-out;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button:focus {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button:before {
|
||||
display: inline-block;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
font: normal 20px/30px "dashicons";
|
||||
vertical-align: top;
|
||||
margin: 3px 0;
|
||||
padding: 4px 8px;
|
||||
color: #656a6f;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button.active {
|
||||
border-bottom-color: #191e23;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button:hover,
|
||||
.wp-full-overlay-footer .devices button:focus {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button:focus {
|
||||
background-color: #fff;
|
||||
border-bottom-color: #0073aa;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button.active:before,
|
||||
.wp-full-overlay-footer .devices button:hover:before,
|
||||
.wp-full-overlay-footer .devices button:focus:before {
|
||||
color: #191e23;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices .preview-desktop:before {
|
||||
content: "\f472";
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices .preview-tablet:before {
|
||||
content: "\f471";
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices .preview-mobile:before {
|
||||
content: "\f470";
|
||||
}
|
||||
|
||||
@media screen and (max-width:1024px) {
|
||||
.wp-full-overlay-footer .devices {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.collapsed .wp-full-overlay-footer .devices button:before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.preview-mobile .wp-full-overlay-main {
|
||||
margin: auto -160px auto 0;
|
||||
width: 320px;
|
||||
height: 480px;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
right: 50%;
|
||||
}
|
||||
|
||||
.preview-tablet .wp-full-overlay-main {
|
||||
margin: auto -3in auto 0;
|
||||
width: 6in; /* Size is loosely based on a typical "tablet" device size. Intentionally ambiguous - this does not represent any particular device precisely. */
|
||||
height: 9in;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
right: 50%;
|
||||
}
|
||||
|
||||
|
||||
/*------------------------------------------------------------------------------
|
||||
24.0 - Customize Loader
|
||||
------------------------------------------------------------------------------*/
|
||||
@ -1600,7 +1715,7 @@ body.full-overlay-active {
|
||||
}
|
||||
|
||||
.theme-install-overlay .wp-full-overlay-main {
|
||||
position: relative;
|
||||
position: absolute;
|
||||
z-index: 0;
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
2
wp-admin/css/themes-rtl.min.css
vendored
2
wp-admin/css/themes-rtl.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1480,6 +1480,121 @@ body.full-overlay-active {
|
||||
transition-duration: 0.2s;
|
||||
}
|
||||
|
||||
/* Device/preview size toggles */
|
||||
|
||||
.wp-full-overlay {
|
||||
background: #191e23;
|
||||
}
|
||||
|
||||
.wp-full-overlay-main {
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
.expanded .wp-full-overlay-footer {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 300px;
|
||||
height: 45px;
|
||||
border-top: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button {
|
||||
cursor: pointer;
|
||||
background: transparent;
|
||||
border: none;
|
||||
height: 45px;
|
||||
padding: 0 3px;
|
||||
margin: 0 0 0 -4px;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
border-top: 1px solid transparent;
|
||||
border-bottom: 4px solid transparent;
|
||||
-webkit-transition: background .1s ease-in-out;
|
||||
transition: background .1s ease-in-out;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button:focus {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button:before {
|
||||
display: inline-block;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
font: normal 20px/30px "dashicons";
|
||||
vertical-align: top;
|
||||
margin: 3px 0;
|
||||
padding: 4px 8px;
|
||||
color: #656a6f;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button.active {
|
||||
border-bottom-color: #191e23;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button:hover,
|
||||
.wp-full-overlay-footer .devices button:focus {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button:focus {
|
||||
background-color: #fff;
|
||||
border-bottom-color: #0073aa;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices button.active:before,
|
||||
.wp-full-overlay-footer .devices button:hover:before,
|
||||
.wp-full-overlay-footer .devices button:focus:before {
|
||||
color: #191e23;
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices .preview-desktop:before {
|
||||
content: "\f472";
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices .preview-tablet:before {
|
||||
content: "\f471";
|
||||
}
|
||||
|
||||
.wp-full-overlay-footer .devices .preview-mobile:before {
|
||||
content: "\f470";
|
||||
}
|
||||
|
||||
@media screen and (max-width:1024px) {
|
||||
.wp-full-overlay-footer .devices {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.collapsed .wp-full-overlay-footer .devices button:before {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.preview-mobile .wp-full-overlay-main {
|
||||
margin: auto 0 auto -160px;
|
||||
width: 320px;
|
||||
height: 480px;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
left: 50%;
|
||||
}
|
||||
|
||||
.preview-tablet .wp-full-overlay-main {
|
||||
margin: auto 0 auto -3in;
|
||||
width: 6in; /* Size is loosely based on a typical "tablet" device size. Intentionally ambiguous - this does not represent any particular device precisely. */
|
||||
height: 9in;
|
||||
max-height: 100%;
|
||||
max-width: 100%;
|
||||
left: 50%;
|
||||
}
|
||||
|
||||
|
||||
/*------------------------------------------------------------------------------
|
||||
24.0 - Customize Loader
|
||||
------------------------------------------------------------------------------*/
|
||||
@ -1600,7 +1715,7 @@ body.full-overlay-active {
|
||||
}
|
||||
|
||||
.theme-install-overlay .wp-full-overlay-main {
|
||||
position: relative;
|
||||
position: absolute;
|
||||
z-index: 0;
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
2
wp-admin/css/themes.min.css
vendored
2
wp-admin/css/themes.min.css
vendored
File diff suppressed because one or more lines are too long
@ -756,6 +756,7 @@ themes.view.Preview = themes.view.Details.extend({
|
||||
events: {
|
||||
'click .close-full-overlay': 'close',
|
||||
'click .collapse-sidebar': 'collapse',
|
||||
'click .devices button': 'previewDevice',
|
||||
'click .previous-theme': 'previousTheme',
|
||||
'click .next-theme': 'nextTheme',
|
||||
'keyup': 'keyEvent'
|
||||
@ -765,11 +766,16 @@ themes.view.Preview = themes.view.Details.extend({
|
||||
html: themes.template( 'theme-preview' ),
|
||||
|
||||
render: function() {
|
||||
var self = this,
|
||||
var self = this, currentPreviewDevice,
|
||||
data = this.model.toJSON();
|
||||
|
||||
this.$el.removeClass( 'iframe-ready' ).html( this.html( data ) );
|
||||
|
||||
currentPreviewDevice = this.$el.data( 'current-preview-device' );
|
||||
if ( currentPreviewDevice ) {
|
||||
self.tooglePreviewDeviceButtons( currentPreviewDevice );
|
||||
}
|
||||
|
||||
themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ), { replace: true } );
|
||||
|
||||
this.$el.fadeIn( 200, function() {
|
||||
@ -815,6 +821,29 @@ themes.view.Preview = themes.view.Details.extend({
|
||||
return false;
|
||||
},
|
||||
|
||||
previewDevice: function( event ) {
|
||||
var device = $( event.currentTarget ).data( 'device' );
|
||||
|
||||
this.$el
|
||||
.removeClass( 'preview-desktop preview-tablet preview-mobile' )
|
||||
.addClass( 'preview-' + device )
|
||||
.data( 'current-preview-device', device );
|
||||
|
||||
this.tooglePreviewDeviceButtons( device );
|
||||
},
|
||||
|
||||
tooglePreviewDeviceButtons: function( newDevice ) {
|
||||
var $devices = $( '.wp-full-overlay-footer .devices' );
|
||||
|
||||
$devices.find( 'button' )
|
||||
.removeClass( 'active' )
|
||||
.attr( 'aria-pressed', false );
|
||||
|
||||
$devices.find( 'button.preview-' + newDevice )
|
||||
.addClass( 'active' )
|
||||
.attr( 'aria-pressed', true );
|
||||
},
|
||||
|
||||
keyEvent: function( event ) {
|
||||
// The escape key closes the preview
|
||||
if ( event.keyCode === 27 ) {
|
||||
|
||||
2
wp-admin/js/theme.min.js
vendored
2
wp-admin/js/theme.min.js
vendored
File diff suppressed because one or more lines are too long
@ -277,6 +277,11 @@ if ( $tab ) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="wp-full-overlay-footer">
|
||||
<div class="devices">
|
||||
<button type="button" class="preview-desktop active" aria-pressed="true" data-device="desktop"><span class="screen-reader-text"><?php _e( 'Enter desktop preview mode' ); ?></span></button>
|
||||
<button type="button" class="preview-tablet" aria-pressed="false" data-device="tablet"><span class="screen-reader-text"><?php _e( 'Enter tablet preview mode' ); ?></span></button>
|
||||
<button type="button" class="preview-mobile" aria-pressed="false" data-device="mobile"><span class="screen-reader-text"><?php _e( 'Enter mobile preview mode' ); ?></span></button>
|
||||
</div>
|
||||
<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
|
||||
<span class="collapse-sidebar-arrow"></span>
|
||||
<span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.5-beta2-36857';
|
||||
$wp_version = '4.5-beta2-36858';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user