set_selector( '.edit-post-visual-editor .editor-block-list__block[data-align=wide]' );
$css->add_property( 'max-width', absint( $content_width ), false, 'px' );
+ if ( apply_filters( 'generate_do_group_inner_container_style', true ) ) {
+ $css->set_selector( '.wp-block-group__inner-container' );
+ $css->add_property( 'max-width', absint( $content_width ), false, 'px' );
+ $css->add_property( 'margin-left', 'auto' );
+ $css->add_property( 'margin-right', 'auto' );
+ $css->add_property( 'padding', generate_padding_css( $spacing_settings['content_top'], $spacing_settings['content_right'], $spacing_settings['content_bottom'], $spacing_settings['content_left'] ) );
+ }
+
$css->set_selector( '.wp-block-button__link:not(.has-background)' );
$css->add_property( 'color', esc_attr( $color_settings['form_button_text_color'] ) );
$css->add_property( 'background-color', esc_attr( $color_settings['form_button_background_color'] ) );
@@ -230,6 +238,7 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'font-weight', esc_attr( $font_settings['heading_1_weight'] ) );
$css->add_property( 'text-transform', esc_attr( $font_settings['heading_1_transform'] ) );
$css->add_property( 'font-size', absint( $font_settings['heading_1_font_size'] ), false, 'px' );
+ $css->add_property( 'line-height', floatval( $font_settings['heading_1_line_height'] ), false, 'em' );
if ( $color_settings['h1_color'] ) {
$css->add_property( 'color', esc_attr( $color_settings['h1_color'] ) );
@@ -249,6 +258,7 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'font-weight', esc_attr( $font_settings['heading_2_weight'] ) );
$css->add_property( 'text-transform', esc_attr( $font_settings['heading_2_transform'] ) );
$css->add_property( 'font-size', absint( $font_settings['heading_2_font_size'] ), false, 'px' );
+ $css->add_property( 'line-height', floatval( $font_settings['heading_2_line_height'] ), false, 'em' );
if ( $color_settings['h2_color'] ) {
$css->add_property( 'color', esc_attr( $color_settings['h2_color'] ) );
@@ -263,6 +273,7 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'font-weight', esc_attr( $font_settings['heading_3_weight'] ) );
$css->add_property( 'text-transform', esc_attr( $font_settings['heading_3_transform'] ) );
$css->add_property( 'font-size', absint( $font_settings['heading_3_font_size'] ), false, 'px' );
+ $css->add_property( 'line-height', floatval( $font_settings['heading_3_line_height'] ), false, 'em' );
if ( $color_settings['h3_color'] ) {
$css->add_property( 'color', esc_attr( $color_settings['h3_color'] ) );
@@ -283,6 +294,10 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'font-size', 'inherit' );
}
+ if ( '' !== $font_settings['heading_4_line_height'] ) {
+ $css->add_property( 'line-height', floatval( $font_settings['heading_4_line_height'] ), false, 'em' );
+ }
+
if ( $color_settings['h4_color'] ) {
$css->add_property( 'color', esc_attr( $color_settings['h4_color'] ) );
} elseif ( $color_settings['content_text_color'] ) {
@@ -302,6 +317,10 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'font-size', 'inherit' );
}
+ if ( '' !== $font_settings['heading_5_line_height'] ) {
+ $css->add_property( 'line-height', floatval( $font_settings['heading_5_line_height'] ), false, 'em' );
+ }
+
if ( $color_settings['h5_color'] ) {
$css->add_property( 'color', esc_attr( $color_settings['h5_color'] ) );
} elseif ( $color_settings['content_text_color'] ) {
@@ -321,6 +340,10 @@ function generate_do_inline_block_editor_css() {
$css->add_property( 'font-size', 'inherit' );
}
+ if ( '' !== $font_settings['heading_6_line_height'] ) {
+ $css->add_property( 'line-height', floatval( $font_settings['heading_6_line_height'] ), false, 'em' );
+ }
+
if ( $color_settings['h6_color'] ) {
$css->add_property( 'color', esc_attr( $color_settings['h6_color'] ) );
} elseif ( $color_settings['content_text_color'] ) {
diff --git a/inc/css-output.php b/inc/css-output.php
index c52dd49e..2d808620 100644
--- a/inc/css-output.php
+++ b/inc/css-output.php
@@ -37,6 +37,13 @@ function generate_base_css() {
$css->set_selector( 'body .grid-container' )->add_property( 'max-width', absint( $generate_settings['container_width'] ), false, 'px' );
+ if ( apply_filters( 'generate_do_group_inner_container_style', true ) ) {
+ $css->set_selector( '.wp-block-group__inner-container' );
+ $css->add_property( 'max-width', absint( $generate_settings['container_width'] ), false, 'px' );
+ $css->add_property( 'margin-left', 'auto' );
+ $css->add_property( 'margin-right', 'auto' );
+ }
+
$nav_drop_point = generate_get_option( 'nav_drop_point' );
$nav_location = generate_get_navigation_location();
@@ -148,13 +155,24 @@ function generate_advanced_css() {
$css->add_property( 'color', esc_attr( $generate_settings['navigation_text_current_color'] ) );
$css->add_property( 'background-color', esc_attr( $generate_settings['navigation_background_current_color'] ) );
- $css->set_selector( '.navigation-search input[type="search"],.navigation-search input[type="search"]:active' );
- $css->add_property( 'color', esc_attr( $generate_settings['navigation_background_hover_color'] ) );
- $css->add_property( 'background-color', esc_attr( $generate_settings['navigation_background_hover_color'] ) );
+ $navigation_search_background = $generate_settings['navigation_background_hover_color'];
+ $navigation_search_text = $generate_settings['navigation_text_hover_color'];
- $css->set_selector( '.navigation-search input[type="search"]:focus' );
- $css->add_property( 'color', esc_attr( $generate_settings['navigation_text_hover_color'] ) );
- $css->add_property( 'background-color', esc_attr( $generate_settings['navigation_background_hover_color'] ) );
+ if ( '' !== $generate_settings['navigation_search_background_color'] ) {
+ $navigation_search_background = $generate_settings['navigation_search_background_color'];
+ }
+
+ if ( '' !== $generate_settings['navigation_search_text_color'] ) {
+ $navigation_search_text = $generate_settings['navigation_search_text_color'];
+ }
+
+ $css->set_selector( '.navigation-search input[type="search"],.navigation-search input[type="search"]:active, .navigation-search input[type="search"]:focus, .main-navigation .main-nav ul li.search-item.active > a' );
+ $css->add_property( 'color', esc_attr( $navigation_search_text ) );
+ $css->add_property( 'background-color', esc_attr( $navigation_search_background ) );
+
+ if ( '' !== $generate_settings['navigation_search_background_color'] ) {
+ $css->add_property( 'opacity', '1' );
+ }
$css->set_selector( '.main-navigation ul ul' );
$css->add_property( 'background-color', esc_attr( $generate_settings['subnavigation_background_color'] ) );
@@ -455,7 +473,7 @@ function generate_font_css() {
$css->add_property( 'text-transform', esc_attr( $generate_settings['footer_transform'] ), $og_defaults['footer_transform'] );
$css->add_property( 'font-size', absint( $generate_settings['footer_font_size'] ), $og_defaults['footer_font_size'], 'px' );
- $css->start_media_query( apply_filters( 'generate_mobile_media_query', '(max-width:768px)' ) );
+ $css->start_media_query( generate_get_media_query( 'mobile' ) );
$mobile_site_title = ( isset( $generate_settings['mobile_site_title_font_size'] ) ) ? $generate_settings['mobile_site_title_font_size'] : '30';
$css->set_selector( '.main-title' );
$css->add_property( 'font-size', absint( $mobile_site_title ), false, 'px' );
@@ -501,6 +519,11 @@ function generate_spacing_css() {
$css->set_selector( '.separate-containers .inside-article, .separate-containers .comments-area, .separate-containers .page-header, .separate-containers .paging-navigation, .one-container .site-content, .inside-page-header' );
$css->add_property( 'padding', generate_padding_css( $spacing_settings['content_top'], $spacing_settings['content_right'], $spacing_settings['content_bottom'], $spacing_settings['content_left'] ), generate_padding_css( $og_defaults['content_top'], $og_defaults['content_right'], $og_defaults['content_bottom'], $og_defaults['content_left'] ) );
+ if ( apply_filters( 'generate_do_group_inner_container_style', true ) ) {
+ $css->set_selector( '.wp-block-group__inner-container' );
+ $css->add_property( 'padding', generate_padding_css( $spacing_settings['content_top'], $spacing_settings['content_right'], $spacing_settings['content_bottom'], $spacing_settings['content_left'] ) );
+ }
+
$content_padding = absint( $spacing_settings['content_right'] ) + absint( $spacing_settings['content_left'] );
$css->set_selector( '.entry-content .alignwide, body:not(.no-sidebar) .entry-content .alignfull' );
$css->add_property( 'margin-left', '-' . absint( $spacing_settings['content_left'] ) . 'px' );
@@ -589,7 +612,7 @@ function generate_spacing_css() {
$css->set_selector( '.site-info' );
$css->add_property( 'padding', generate_padding_css( $spacing_settings['footer_top'], $spacing_settings['footer_right'], $spacing_settings['footer_bottom'], $spacing_settings['footer_left'] ), generate_padding_css( $og_defaults['footer_top'], $og_defaults['footer_right'], $og_defaults['footer_bottom'], $og_defaults['footer_left'] ) );
- $css->start_media_query( apply_filters( 'generate_mobile_media_query', '(max-width:768px)' ) );
+ $css->start_media_query( generate_get_media_query( 'mobile' ) );
$css->set_selector( '.separate-containers .inside-article, .separate-containers .comments-area, .separate-containers .page-header, .separate-containers .paging-navigation, .one-container .site-content, .inside-page-header' );
$css->add_property( 'padding', generate_padding_css( $spacing_settings['mobile_content_top'], $spacing_settings['mobile_content_right'], $spacing_settings['mobile_content_bottom'], $spacing_settings['mobile_content_left'] ) );
@@ -665,7 +688,7 @@ function generate_no_cache_dynamic_css() {
}
}
- $css->start_media_query( apply_filters( 'generate_mobile_menu_media_query', '(max-width: 768px)' ) );
+ $css->start_media_query( generate_get_media_query( 'mobile-menu' ) );
$css->set_selector( '.main-navigation .menu-toggle,.main-navigation .mobile-bar-items,.sidebar-nav-mobile:not(#sticky-placeholder)' );
$css->add_property( 'display', 'block' );
diff --git a/inc/customizer/controls/class-range-control.php b/inc/customizer/controls/class-range-control.php
index e6549a68..a03758fb 100644
--- a/inc/customizer/controls/class-range-control.php
+++ b/inc/customizer/controls/class-range-control.php
@@ -121,6 +121,8 @@ protected function content_template() {
<# if ( 'undefined' !== typeof ( data.desktop ) ) { #>
<# } #>
@@ -137,6 +138,8 @@ protected function content_template() {
<# if ( 'undefined' !== typeof ( data.tablet ) ) { #>
<# } #>
@@ -153,6 +155,8 @@ protected function content_template() {
<# if ( 'undefined' !== typeof ( data.mobile ) ) { #>
<# } #>
diff --git a/inc/customizer/controls/class-typography-control.php b/inc/customizer/controls/class-typography-control.php
index c3c42aa6..68f20a5e 100644
--- a/inc/customizer/controls/class-typography-control.php
+++ b/inc/customizer/controls/class-typography-control.php
@@ -29,10 +29,8 @@ public function enqueue() {
public function to_json() {
parent::to_json();
- $number_of_fonts = apply_filters( 'generate_number_of_fonts', 200 );
$this->json['default_fonts_title'] = __( 'System fonts', 'generatepress' );
$this->json['google_fonts_title'] = __( 'Google fonts', 'generatepress' );
- $this->json['google_fonts'] = apply_filters( 'generate_typography_customize_list', generate_get_all_google_fonts( $number_of_fonts ) );
$this->json['default_fonts'] = generate_typography_default_fonts();
$this->json['family_title'] = esc_html__( 'Font family', 'generatepress' );
$this->json['weight_title'] = esc_html__( 'Font weight', 'generatepress' );
@@ -74,8 +72,8 @@ public function content_template() {
<# } #>
@@ -89,7 +87,7 @@ public function content_template() {
<# if ( 'undefined' !== typeof ( data.variant ) ) { #>
<#
var id = data.family.value.split(' ').join('_').toLowerCase();
- var font_data = data.google_fonts[id];
+ var font_data = generatePressTypography.googleFonts[id];
var variants = '';
if ( typeof font_data !== 'undefined' ) {
variants = font_data.variants;
@@ -125,43 +123,45 @@ public function content_template() {
span:first-child:last-child {
display: none;
}
.customize-control-generatepress-range-slider .sub-description {
margin-top: 10px;
-}
\ No newline at end of file
+}
diff --git a/inc/customizer/controls/css/typography-customizer.css b/inc/customizer/controls/css/typography-customizer.css
index bffd1d40..c6ed6516 100644
--- a/inc/customizer/controls/css/typography-customizer.css
+++ b/inc/customizer/controls/css/typography-customizer.css
@@ -1,11 +1,19 @@
-.generatepress-font-weight,
-.generatepress-font-transform {
- float: left;
- width: 50%
+.generatepress-font-family {
+ margin-bottom: 12px;
+}
+
+.generatepress-weight-transform-wrapper {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-pack: justify;
+ -ms-flex-pack: justify;
+ justify-content: space-between;
}
-.generatepress-font-weight select {
- border-right: 0;
+.generatepress-font-weight,
+.generatepress-font-transform {
+ width: calc(50% - 5px);
}
span.select2-container.select2-container--default.select2-container--open li.select2-results__option {
diff --git a/inc/customizer/controls/js/customizer-live-preview.js b/inc/customizer/controls/js/customizer-live-preview.js
index 83354e88..0ab0783e 100644
--- a/inc/customizer/controls/js/customizer-live-preview.js
+++ b/inc/customizer/controls/js/customizer-live-preview.js
@@ -296,9 +296,9 @@ function generatepress_typography_live_update( id, selector, property, unit, med
wp.customize( 'generate_settings[container_width]', function( value ) {
value.bind( function( newval ) {
if ( jQuery( 'style#container_width' ).length ) {
- jQuery( 'style#container_width' ).html( 'body .grid-container{max-width:' + newval + 'px;}' );
+ jQuery( 'style#container_width' ).html( 'body .grid-container, .wp-block-group__inner-container{max-width:' + newval + 'px;}' );
} else {
- jQuery( 'head' ).append( '' );
+ jQuery( 'head' ).append( '' );
setTimeout(function() {
jQuery( 'style#container_width' ).not( ':last' ).remove();
}, 100);
diff --git a/inc/customizer/helpers.php b/inc/customizer/helpers.php
index 178dd3e4..ca5e65b8 100644
--- a/inc/customizer/helpers.php
+++ b/inc/customizer/helpers.php
@@ -262,6 +262,16 @@ function generate_do_control_inline_scripts() {
)
);
+ $number_of_fonts = apply_filters( 'generate_number_of_fonts', 200 );
+
+ wp_localize_script(
+ 'generatepress-typography-customizer',
+ 'generatePressTypography',
+ array(
+ 'googleFonts' => apply_filters( 'generate_typography_customize_list', generate_get_all_google_fonts( $number_of_fonts ) )
+ )
+ );
+
wp_localize_script( 'generatepress-typography-customizer', 'typography_defaults', generate_typography_default_fonts() );
wp_enqueue_script( 'generatepress-customizer-controls', trailingslashit( get_template_directory_uri() ) . 'inc/customizer/controls/js/customizer-controls.js', array( 'customize-controls', 'jquery' ), GENERATE_VERSION, true );
@@ -285,9 +295,9 @@ function generate_customizer_live_preview() {
wp_enqueue_script( 'generate-themecustomizer', trailingslashit( get_template_directory_uri() ) . 'inc/customizer/controls/js/customizer-live-preview.js', array( 'customize-preview' ), GENERATE_VERSION, true );
wp_localize_script( 'generate-themecustomizer', 'generatepress_live_preview', array(
- 'mobile' => apply_filters( 'generate_mobile_media_query', '(max-width:768px)' ),
- 'tablet' => apply_filters( 'generate_tablet_media_query', '(min-width: 769px) and (max-width: 1024px)' ),
- 'desktop' => apply_filters( 'generate_desktop_media_query', '(min-width:1025px)' ),
+ 'mobile' => generate_get_media_query( 'mobile' ),
+ 'tablet' => generate_get_media_query( 'tablet' ),
+ 'desktop' => generate_get_media_query( 'desktop' ),
'contentLeft' => absint( $spacing_settings['content_left'] ),
'contentRight' => absint( $spacing_settings['content_right'] ),
) );
diff --git a/inc/defaults.php b/inc/defaults.php
index 986b9bd6..3b4b102a 100644
--- a/inc/defaults.php
+++ b/inc/defaults.php
@@ -93,6 +93,8 @@ function generate_get_color_defaults() {
'subnavigation_text_hover_color' => '#ffffff',
'subnavigation_background_current_color' => '#4f4f4f',
'subnavigation_text_current_color' => '#ffffff',
+ 'navigation_search_background_color' => '',
+ 'navigation_search_text_color' => '',
'content_background_color' => '#ffffff',
'content_text_color' => '',
'content_link_color' => '',
diff --git a/inc/general.php b/inc/general.php
index aebdcb12..624ac3ba 100644
--- a/inc/general.php
+++ b/inc/general.php
@@ -53,6 +53,15 @@ function generate_scripts() {
if ( 'enable' === generate_get_option( 'nav_search' ) ) {
wp_enqueue_script( 'generate-navigation-search', $dir_uri . "/js/navigation-search{$suffix}.js", array( 'generate-menu' ), GENERATE_VERSION, true );
+
+ wp_localize_script(
+ 'generate-navigation-search',
+ 'generatepressNavSearch',
+ array(
+ 'open' => esc_attr__( 'Open Search Bar', 'generatepress' ),
+ 'close' => esc_attr__( 'Close Search Bar', 'generatepress' ),
+ )
+ );
}
if ( 'enable' === generate_get_option( 'back_to_top' ) ) {
diff --git a/inc/plugin-compat.php b/inc/plugin-compat.php
index ded04413..c315e7a4 100644
--- a/inc/plugin-compat.php
+++ b/inc/plugin-compat.php
@@ -114,7 +114,8 @@ function generate_woocommerce_css() {
return;
}
- $mobile = apply_filters( 'generate_mobile_media_query', '(max-width:768px)' );
+ $mobile = generate_get_media_query( 'mobile' );
+
$css = '.woocommerce .page-header-image-single {
display: none;
}
diff --git a/inc/structure/comments.php b/inc/structure/comments.php
index 5beae4e8..84df2d27 100644
--- a/inc/structure/comments.php
+++ b/inc/structure/comments.php
@@ -52,15 +52,6 @@ function generate_comment( $comment, $args, $depth ) {
| ', '' ); ?>
- 'div-comment',
- 'depth' => $depth,
- 'max_depth' => $args['max_depth'],
- 'before' => '