updated plugin GP Premium
version 1.11.2
This commit is contained in:
@ -582,3 +582,20 @@ function generate_premium_wc_menu_item_active() {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks to see if we're using external CSS file.
|
||||
*
|
||||
* @since 1.11.0
|
||||
*/
|
||||
function generate_is_using_external_css_file_callback() {
|
||||
if ( ! function_exists( 'generate_get_option' ) ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( 'file' === generate_get_option( 'css_print_method' ) ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@ -15,9 +15,11 @@ if ( ! class_exists( 'GeneratePress_Action_Button_Control' ) ) {
|
||||
public $type = 'gp_action_button';
|
||||
public $data_type = '';
|
||||
public $description = '';
|
||||
public $nonce = '';
|
||||
|
||||
public function enqueue() {
|
||||
wp_enqueue_script( 'gp-button-actions', trailingslashit( plugin_dir_url( __FILE__ ) ) . 'js/button-actions.js', array( 'customize-controls' ), GP_PREMIUM_VERSION, true );
|
||||
wp_enqueue_script( 'gp-button-actions', trailingslashit( plugin_dir_url( __FILE__ ) ) . 'js/button-actions.js', array( 'customize-controls' ), GP_PREMIUM_VERSION, true );
|
||||
wp_enqueue_style( 'gp-button-actions', trailingslashit( plugin_dir_url( __FILE__ ) ) . 'css/button-actions.css', array(), GP_PREMIUM_VERSION );
|
||||
}
|
||||
|
||||
public function to_json() {
|
||||
@ -25,14 +27,17 @@ if ( ! class_exists( 'GeneratePress_Action_Button_Control' ) ) {
|
||||
|
||||
$this->json['data_type'] = $this->data_type;
|
||||
$this->json['description'] = $this->description;
|
||||
$this->json['nonce'] = $this->nonce;
|
||||
}
|
||||
|
||||
public function content_template() {
|
||||
?>
|
||||
<button class="button" data-type="{{{ data.data_type }}}">{{{ data.label }}}</button>
|
||||
<span class="description customize-control-description">
|
||||
<p>{{{ data.description }}}</p>
|
||||
</span>
|
||||
<button class="button" data-type="{{{ data.data_type }}}" data-nonce="{{{ data.nonce }}}">{{{ data.label }}}</button>
|
||||
<# if ( data.description ) { #>
|
||||
<span class="description customize-control-description">
|
||||
<p>{{{ data.description }}}</p>
|
||||
</span>
|
||||
<# } #>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
|
@ -34,8 +34,8 @@ class GeneratePress_Spacing_Control extends WP_Customize_Control {
|
||||
}
|
||||
|
||||
$this->json[ 'element' ] = $this->element;
|
||||
$this->json[ 'title' ] = __( 'Link values','generate-spacing' );
|
||||
$this->json[ 'unlink_title' ] = __( 'Un-link values','generate-spacing' );
|
||||
$this->json[ 'title' ] = __( 'Link values', 'gp-premium' );
|
||||
$this->json[ 'unlink_title' ] = __( 'Un-link values', 'gp-premium' );
|
||||
|
||||
$this->json['label_top'] = esc_html__( 'Top', 'gp-premium' );
|
||||
$this->json['label_right'] = esc_html__( 'Right', 'gp-premium' );
|
||||
|
@ -13,7 +13,6 @@
|
||||
}
|
||||
|
||||
.alpha-color-picker-wrap a.iris-square-value:focus {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,20 @@
|
||||
button[data-type="regenerate_external_css"]:before {
|
||||
font: normal 20px/.5 dashicons;
|
||||
speak: none;
|
||||
display: inline-block;
|
||||
padding: 0;
|
||||
top: 9px;
|
||||
left: -4px;
|
||||
position: relative;
|
||||
vertical-align: top;
|
||||
content: "\f463";
|
||||
}
|
||||
|
||||
button[data-type="regenerate_external_css"].loading:before {
|
||||
animation: rotation 1s infinite linear;
|
||||
}
|
||||
|
||||
button[data-type="regenerate_external_css"].success:before {
|
||||
content: "\f147";
|
||||
color: #46b450;
|
||||
}
|
@ -4,8 +4,6 @@
|
||||
height: 6px;
|
||||
background-color: rgba(0,0,0,.10);
|
||||
cursor: pointer;
|
||||
-webkit-transition: background .5s;
|
||||
-moz-transition: background .5s;
|
||||
transition: background .5s;
|
||||
}
|
||||
|
||||
@ -28,21 +26,14 @@
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
-webkit-transform: translateY(-50%) translateX(-4px);
|
||||
transform: translateY(-50%) translateX(-4px);
|
||||
border-radius: 50%;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.customize-control-generatepress-pro-range-slider .wrapper {
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
-webkit-box-pack: justify;
|
||||
-ms-flex-pack: justify;
|
||||
justify-content: space-between;
|
||||
-webkit-box-align: center;
|
||||
-ms-flex-align: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@ -51,8 +42,6 @@
|
||||
padding: 0;
|
||||
font-weight: 400;
|
||||
width: 50px;
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
@ -126,8 +115,6 @@
|
||||
}
|
||||
|
||||
.gp-range-title-area {
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,4 @@
|
||||
.gp-spacing-control-section-title-area {
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
@ -17,8 +15,6 @@
|
||||
}
|
||||
|
||||
.spacing-values-area {
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
|
@ -3,11 +3,7 @@
|
||||
}
|
||||
|
||||
.generatepress-weight-transform-wrapper {
|
||||
display: -webkit-box;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
-webkit-box-pack: justify;
|
||||
-ms-flex-pack: justify;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
|
@ -26,4 +26,19 @@ jQuery( document ).ready( function( $ ) {
|
||||
|
||||
}( wp.customize ) );
|
||||
} );
|
||||
|
||||
|
||||
$( '[data-type="regenerate_external_css"]' ).on( 'click', function( e ) {
|
||||
var $thisButton = $( this ); // eslint-disable-line no-var
|
||||
e.preventDefault();
|
||||
|
||||
$thisButton.removeClass( 'success' ).addClass( 'loading' );
|
||||
|
||||
$.post( ajaxurl, {
|
||||
action: 'generatepress_regenerate_css_file',
|
||||
_nonce: $thisButton.data( 'nonce' ),
|
||||
} ).done( function() {
|
||||
$thisButton.removeClass( 'loading' ).addClass( 'success' );
|
||||
} );
|
||||
} );
|
||||
} );
|
||||
|
@ -19,36 +19,48 @@
|
||||
headerTextColorSetting = api.instance( 'generate_settings[header_text_color]' ),
|
||||
headerTextColor = gpControls.headerTextColor;
|
||||
|
||||
if ( ! siteTitleFontSizeSetting._dirty && 25 !== siteTitleFontSizeSetting.get() ) {
|
||||
if ( siteTitleFontSizeSetting && ! siteTitleFontSizeSetting._dirty && 25 !== siteTitleFontSizeSetting.get() ) {
|
||||
siteTitleFontSize = siteTitleFontSizeSetting.get();
|
||||
}
|
||||
|
||||
if ( ! mobileSiteTitleFontSizeSetting._dirty && 20 !== mobileSiteTitleFontSizeSetting.get() ) {
|
||||
if ( mobileSiteTitleFontSizeSetting && ! mobileSiteTitleFontSizeSetting._dirty && 20 !== mobileSiteTitleFontSizeSetting.get() ) {
|
||||
mobileSiteTitleFontSize = mobileSiteTitleFontSizeSetting.get();
|
||||
}
|
||||
|
||||
if ( ! navTextColorSetting._dirty ) {
|
||||
if ( navTextColorSetting && ! navTextColorSetting._dirty ) {
|
||||
navTextColor = navTextColorSetting.get();
|
||||
}
|
||||
|
||||
if ( ! headerTextColorSetting._dirty ) {
|
||||
if ( headerTextColorSetting && ! headerTextColorSetting._dirty ) {
|
||||
headerTextColor = headerTextColorSetting.get();
|
||||
}
|
||||
|
||||
if ( newval ) {
|
||||
navAlignmentSetting.set( 'right' );
|
||||
siteTitleFontSizeSetting.set( 25 );
|
||||
api.instance( 'generate_settings[site_title_color]' ).set( navTextColor );
|
||||
|
||||
if ( 'enable' !== mobileHeader ) {
|
||||
if ( siteTitleFontSizeSetting ) {
|
||||
siteTitleFontSizeSetting.set( 25 );
|
||||
}
|
||||
|
||||
if ( api.instance( 'generate_settings[site_title_color]' ) ) {
|
||||
api.instance( 'generate_settings[site_title_color]' ).set( navTextColor );
|
||||
}
|
||||
|
||||
if ( mobileSiteTitleFontSizeSetting && 'enable' !== mobileHeader ) {
|
||||
mobileSiteTitleFontSizeSetting.set( 20 );
|
||||
}
|
||||
} else {
|
||||
navAlignmentSetting.set( navAlignment );
|
||||
siteTitleFontSizeSetting.set( siteTitleFontSize );
|
||||
api.instance( 'generate_settings[site_title_color]' ).set( headerTextColor );
|
||||
|
||||
if ( 'enable' !== mobileHeader ) {
|
||||
if ( siteTitleFontSizeSetting ) {
|
||||
siteTitleFontSizeSetting.set( siteTitleFontSize );
|
||||
}
|
||||
|
||||
if ( api.instance( 'generate_settings[site_title_color]' ) ) {
|
||||
api.instance( 'generate_settings[site_title_color]' ).set( headerTextColor );
|
||||
}
|
||||
|
||||
if ( mobileSiteTitleFontSizeSetting && 'enable' !== mobileHeader ) {
|
||||
mobileSiteTitleFontSizeSetting.set( mobileSiteTitleFontSize );
|
||||
}
|
||||
}
|
||||
@ -138,7 +150,7 @@
|
||||
*/
|
||||
api( 'generate_menu_plus_settings[mobile_header_branding]', function( value ) {
|
||||
value.bind( function( newval ) {
|
||||
if ( 'title' === newval ) {
|
||||
if ( api.instance( 'generate_settings[mobile_site_title_font_size]' ) && 'title' === newval ) {
|
||||
api.instance( 'generate_settings[mobile_site_title_font_size]' ).set( 20 );
|
||||
}
|
||||
} );
|
||||
@ -154,14 +166,16 @@
|
||||
var mobileSiteTitleFontSizeSetting = api.instance( 'generate_settings[mobile_site_title_font_size]' ),
|
||||
mobileSiteTitleFontSize = gpControls.mobileSiteTitleFontSize;
|
||||
|
||||
if ( ! mobileSiteTitleFontSizeSetting._dirty && 20 !== mobileSiteTitleFontSizeSetting.get() ) {
|
||||
if ( mobileSiteTitleFontSizeSetting && ! mobileSiteTitleFontSizeSetting._dirty && 20 !== mobileSiteTitleFontSizeSetting.get() ) {
|
||||
mobileSiteTitleFontSize = mobileSiteTitleFontSizeSetting.get();
|
||||
}
|
||||
|
||||
if ( 'enable' === newval ) {
|
||||
api.instance( 'generate_settings[mobile_site_title_font_size]' ).set( 20 );
|
||||
} else {
|
||||
api.instance( 'generate_settings[mobile_site_title_font_size]' ).set( mobileSiteTitleFontSize );
|
||||
if ( api.instance( 'generate_settings[mobile_site_title_font_size]' ) ) {
|
||||
if ( 'enable' === newval ) {
|
||||
api.instance( 'generate_settings[mobile_site_title_font_size]' ).set( 20 );
|
||||
} else {
|
||||
api.instance( 'generate_settings[mobile_site_title_font_size]' ).set( mobileSiteTitleFontSize );
|
||||
}
|
||||
}
|
||||
} );
|
||||
} );
|
||||
|
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user