Skip to content
This repository has been archived by the owner on Dec 27, 2022. It is now read-only.

Commit

Permalink
Merge pull request #109 from xwp/develop
Browse files Browse the repository at this point in the history
0.6.0 RC1
  • Loading branch information
westonruter authored Feb 6, 2017
2 parents 7d1e373 + 0374987 commit 7910d6b
Show file tree
Hide file tree
Showing 38 changed files with 7,009 additions and 3,326 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ node_js:

env:
- WP_VERSION=trunk WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=4.6.1 WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=1

install:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "xwp/wp-customize-snapshots",
"description": "Allow Customizer states to be drafted, and previewed with a private URL.",
"version": "0.5.2",
"version": "0.6.0",
"type": "wordpress-plugin",
"homepage": "https://github.com/xwp/wp-customize-snapshots",
"license": "GPL-2.0+",
Expand Down
12 changes: 12 additions & 0 deletions css/customize-snapshots-admin.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
details.snapshot-setting-removed summary {
text-decoration: line-through;
}
details:not(.snapshot-setting-removed) .snapshot-toggle-setting-removal {
color: #a00
}
details:not(.snapshot-setting-removed) .snapshot-toggle-setting-removal:hover {
color: #f00
}
details .snapshot-toggle-setting-removal {
float: right;
}
193 changes: 170 additions & 23 deletions css/customize-snapshots.css
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
#snapshot-preview-link,
#snapshot-schedule-button {
#snapshot-expand-button {
float: right;
margin-top: 13px;
margin-right: 4px;
color: #656a6f;
}

#snapshot-schedule-button {
#snapshot-expand-button {
display: block;
}
#snapshot-schedule-button:hover,
#snapshot-schedule-button:focus,
#snapshot-schedule-button:active {

#snapshot-expand-button:hover,
#snapshot-expand-button:focus,
#snapshot-expand-button:active {
color: #191e23;
}

Expand Down Expand Up @@ -64,36 +65,38 @@
}
}

#snapshot-schedule {
#customize-snapshot {
background: #fff !important;
border-bottom: 1px solid #ddd;
line-height: 1.5;
left: 0;
top: 46px;
position: absolute;
width: 100%;
box-shadow: 0 5px 0 0 rgba(0,0,0,0.05);
padding:10px;
box-shadow: 0 5px 0 0 rgba(0, 0, 0, 0.05);
padding: 10px;
box-sizing: border-box;
}

#snapshot-schedule .snapshot-schedule-title {
#customize-snapshot .snapshot-schedule-title {
color: #555;
}

#snapshot-schedule .snapshot-schedule-title h3 {
#customize-snapshot .snapshot-schedule-title h3 {
margin: .2em 2em .75em 0;
}

#snapshot-schedule .snapshot-schedule-description {
#customize-snapshot .snapshot-schedule-description {
margin-bottom: 0.5em;
margin-top: 0;
}
#snapshot-schedule .timezone-info {

#customize-snapshot .timezone-info {
margin-top: 0.5em;
font-size: smaller;
}

#snapshot-schedule a.snapshot-edit-link {
#customize-snapshot a.snapshot-edit-link {
position: absolute;
top: 4px;
right: 1px;
Expand All @@ -109,12 +112,12 @@
padding: 10px;
}

#snapshot-schedule a.snapshot-edit-link:focus,
#snapshot-schedule a.snapshot-edit-link:hover {
#customize-snapshot a.snapshot-edit-link:focus,
#customize-snapshot a.snapshot-edit-link:hover {
color: #0073aa;
}

#snapshot-schedule a.snapshot-edit-link:before {
#customize-snapshot a.snapshot-edit-link:before {
padding: 4px;
position: absolute;
top: 5px;
Expand All @@ -123,7 +126,7 @@
border-radius: 100%;
}

#snapshot-schedule a.snapshot-edit-link:focus:before {
#customize-snapshot a.snapshot-edit-link:focus:before {
-webkit-box-shadow:
0 0 0 1px #5b9dd9,
0 0 2px 1px rgba(30, 140, 190, .8);
Expand All @@ -132,11 +135,11 @@
0 0 2px 1px rgba(30, 140, 190, .8);
}

#snapshot-schedule .accordion-section-title {
#customize-snapshot .accordion-section-title {
padding: 10px;
}

#snapshot-schedule .reset-time {
#customize-snapshot .reset-time {
font-weight: normal;
font-size: 80%;
display: none;
Expand Down Expand Up @@ -168,13 +171,13 @@
min-width: 4em;
}

.snapshot-schedule-control input[type="number"]{
width:100%;
.snapshot-schedule-control input[type="number"] {
width: 100%;
}

.snapshot-schedule-control .time-special-char {
padding-left:2px;
padding-right:2px;
padding-left: 2px;
padding-right: 2px;
}

.snapshot-schedule-control select {
Expand All @@ -201,3 +204,147 @@
.select2-container {
z-index: 500100 !important;
}

.snapshot-control input[type="text"] {
width: 100%;
line-height: 18px;
margin: 0;
}

#customize-snapshot .snapshot-schedule-title h3 {
font-size: 16px;
}

#customize-snapshot .snapshot-controls {
list-style: none;
margin: 0;
}

.snapshot-future-date-notification.notice {
margin-bottom: 5px;
border-top: 1px solid #eee;
padding: 5px;
}

/*Status Button*/
/** @todo Need to add snapshot specific class for all ui classes. **/

#snapshot-status-button-wrapper {
float: right;
position: relative;
margin-top: 9px;
height: 28px;
}

#snapshot-status-button-wrapper .button-primary {
margin-top: 0;
-webkit-touch-callout: none; /* iOS Safari */
-webkit-user-select: none; /* Chrome/Safari/Opera */
-moz-user-select: none; /* Firefox */
-ms-user-select: none; /* Internet Explorer/Edge */
user-select: none;
}

.snapshot-status-button-wrapper .button:active{
-webkit-transform: none;
-moz-transform: none;
-ms-transform: none;
-o-transform: none;
transform: none; /* 4.7 added translateY(1px) */
}

.ui-selectmenu-menu {
padding: 0;
margin: 0;
position: absolute;
top: 0;
left: 0;
display: none;
}

.ui-selectmenu-menu .ui-menu {
overflow: auto;
margin: 0;
margin-top: 2px;
overflow-x: hidden;
background: #FFFFFF;
border-top: 0;
border-radius: 0 0 5px 5px;
box-shadow: 0 1px 4px 0 rgba(33, 38, 34, .12), 0 2px 11px 0 rgba(30, 36, 37, .14)
}

.ui-selectmenu-menu .ui-menu li {
padding: 5px 10px 5px 5px;
margin: 0;
}

.ui-selectmenu-menu .ui-menu .ui-state-focus {
background: #0073aa;
color: #FFFFFF;
cursor: pointer;
}

.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup {
font-size: 1em;
font-weight: bold;
line-height: 1.5;
padding: 2px 0.4em;
margin: 0.5em 0 0 0;
height: auto;
border: 0;
}

.ui-selectmenu-open {
display: block;
}

#snapshot-status-button-wrapper .ui-selectmenu-button span.dashicons {
text-indent: 0;
float: right;
border-radius: 0 3px 3px 0;
padding-left: 0;
padding-right: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
font-size: 20px;
width: 20px;
}

#snapshot-status-button-wrapper .ui-selectmenu-button span.dashicons:before {
display: inline-block;
margin-left: -3px;
}

@media screen and ( max-width: 640px ) {
#snapshot-status-button-wrapper .ui-selectmenu-button span.dashicons {
font-size: 17px;
}
}

.ui-selectmenu-button span.ui-selectmenu-text {
border-radius: 3px 0 0 3px;
opacity: 0;
}

.ui-selectmenu-menu.ui-front {
z-index: 999999;
}

.snapshot-status-button-overlay.button {
width: calc( 100% - 20px );
height: 28px;
position: absolute;
top: 0;
left: 0;
z-index: 1;
border-radius: 3px 0 0 3px;
box-shadow: none;
}

#customize-header-actions .ui-selectmenu-button {
display: inline-block;
outline-width: 2px;
outline-offset: -2px;
}

2 changes: 1 addition & 1 deletion customize-snapshots.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Customize Snapshots
* Plugin URI: https://github.com/xwp/wp-customize-snapshots
* Description: Allow Customizer states to be drafted, and previewed with a private URL.
* Version: 0.5.2
* Version: 0.6.0-rc1
* Author: XWP
* Author URI: https://xwp.co/
* License: GPLv2+
Expand Down
2 changes: 1 addition & 1 deletion dev-lib
23 changes: 22 additions & 1 deletion instance.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ function get_plugin_instance() {
* @return bool Whether previewing settings.
*/
function is_previewing_settings() {
return get_plugin_instance()->customize_snapshot_manager->is_previewing_settings();
$manager = get_plugin_instance()->customize_snapshot_manager;
if ( get_plugin_instance()->compat ) {
return $manager->is_previewing_settings();
} else {
return ( isset( $manager->customize_manager ) && $manager->customize_manager->is_preview() ) || did_action( 'customize_preview_init' );
}
}

/**
Expand All @@ -51,3 +56,19 @@ function current_snapshot_uuid() {
return $customize_snapshot_uuid;
}
}

/**
* Returns whether it is back compat or not.
*
* @return bool is compat.
*/
function is_back_compat() {
$wp_version = get_bloginfo( 'version' );

// Fix in case version contains extra string for example 4.7-src in that case php version_compare fails.
$pos = strpos( $wp_version, '-' );
if ( false !== $pos ) {
$wp_version = substr( $wp_version, 0, $pos );
}
return version_compare( $wp_version, '4.7', '<' );
}
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ var CustomizeSnapshotsPreview = (function( api, $ ) {

// Now preventDefault as is done on the normal submit.preview handler in customize-preview.js.
event.preventDefault();
});
} );
};

return component;
Expand Down
Loading

0 comments on commit 7910d6b

Please sign in to comment.