updated plugin GP Premium
version 2.1.1
This commit is contained in:
@ -977,6 +977,9 @@ if ( ! function_exists( 'generate_secondary_nav_css' ) ) {
|
||||
|
||||
$css = new GeneratePress_Secondary_Nav_CSS();
|
||||
|
||||
// Check if we're using our legacy typography system.
|
||||
$using_dynamic_typography = function_exists( 'generate_is_using_dynamic_typography' ) && generate_is_using_dynamic_typography();
|
||||
|
||||
$css->set_selector( '.secondary-navigation' );
|
||||
$css->add_property( 'background-color', esc_attr( $generate_settings['navigation_background_color'] ) );
|
||||
$css->add_property( 'background-image', ! empty( $generate_settings['nav_image'] ) ? 'url(' . esc_url( $generate_settings['nav_image'] ) . ')' : '' );
|
||||
@ -1016,10 +1019,14 @@ if ( ! function_exists( 'generate_secondary_nav_css' ) ) {
|
||||
// Navigation text.
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul li a,.secondary-navigation .menu-toggle,.secondary-menu-bar-items .menu-bar-item > a' );
|
||||
$css->add_property( 'color', esc_attr( $generate_settings['navigation_text_color'] ) );
|
||||
$css->add_property( 'font-family', ( 'inherit' !== $secondary_nav_family ) ? $secondary_nav_family : null );
|
||||
$css->add_property( 'font-weight', esc_attr( $generate_settings['secondary_navigation_font_weight'] ), $og_defaults['secondary_navigation_font_weight'] );
|
||||
$css->add_property( 'text-transform', esc_attr( $generate_settings['secondary_navigation_font_transform'] ), $og_defaults['secondary_navigation_font_transform'] );
|
||||
$css->add_property( 'font-size', absint( $generate_settings['secondary_navigation_font_size'] ), $og_defaults['secondary_navigation_font_size'], 'px' );
|
||||
|
||||
if ( ! $using_dynamic_typography ) {
|
||||
$css->add_property( 'font-family', ( 'inherit' !== $secondary_nav_family ) ? $secondary_nav_family : null );
|
||||
$css->add_property( 'font-weight', esc_attr( $generate_settings['secondary_navigation_font_weight'] ), $og_defaults['secondary_navigation_font_weight'] );
|
||||
$css->add_property( 'text-transform', esc_attr( $generate_settings['secondary_navigation_font_transform'] ), $og_defaults['secondary_navigation_font_transform'] );
|
||||
$css->add_property( 'font-size', absint( $generate_settings['secondary_navigation_font_size'] ), $og_defaults['secondary_navigation_font_size'], 'px' );
|
||||
}
|
||||
|
||||
$css->add_property( 'padding-left', absint( $generate_settings['secondary_menu_item'] ), $og_defaults['secondary_menu_item'], 'px' );
|
||||
$css->add_property( 'padding-right', absint( $generate_settings['secondary_menu_item'] ), $og_defaults['secondary_menu_item'], 'px' );
|
||||
$css->add_property( 'line-height', absint( $generate_settings['secondary_menu_item_height'] ), $og_defaults['secondary_menu_item_height'], 'px' );
|
||||
@ -1028,7 +1035,10 @@ if ( ! function_exists( 'generate_secondary_nav_css' ) ) {
|
||||
|
||||
$css->set_selector( '.secondary-navigation .secondary-menu-bar-items' );
|
||||
$css->add_property( 'color', $generate_settings['navigation_text_color'] );
|
||||
$css->add_property( 'font-size', absint( $generate_settings['secondary_navigation_font_size'] ), $og_defaults['secondary_navigation_font_size'], 'px' );
|
||||
|
||||
if ( ! $using_dynamic_typography ) {
|
||||
$css->add_property( 'font-size', absint( $generate_settings['secondary_navigation_font_size'] ), $og_defaults['secondary_navigation_font_size'], 'px' );
|
||||
}
|
||||
|
||||
// Mobile menu text on hover.
|
||||
$css->set_selector( 'button.secondary-menu-toggle:hover,button.secondary-menu-toggle:focus' );
|
||||
@ -1046,7 +1056,11 @@ if ( ! function_exists( 'generate_secondary_nav_css' ) ) {
|
||||
// Sub-navigation text.
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul ul li a' );
|
||||
$css->add_property( 'color', esc_attr( $generate_settings['subnavigation_text_color'] ) );
|
||||
$css->add_property( 'font-size', absint( $generate_settings['secondary_navigation_font_size'] - 1 ), absint( $og_defaults['secondary_navigation_font_size'] - 1 ), 'px' );
|
||||
|
||||
if ( ! $using_dynamic_typography ) {
|
||||
$css->add_property( 'font-size', absint( $generate_settings['secondary_navigation_font_size'] - 1 ), absint( $og_defaults['secondary_navigation_font_size'] - 1 ), 'px' );
|
||||
}
|
||||
|
||||
$css->add_property( 'padding-left', absint( $generate_settings['secondary_menu_item'] ), $og_defaults['secondary_menu_item'], 'px' );
|
||||
$css->add_property( 'padding-right', absint( $generate_settings['secondary_menu_item'] ), $og_defaults['secondary_menu_item'], 'px' );
|
||||
$css->add_property( 'padding-top', absint( $generate_settings['secondary_sub_menu_item_height'] ), $og_defaults['secondary_sub_menu_item_height'], 'px' );
|
||||
@ -1077,28 +1091,28 @@ if ( ! function_exists( 'generate_secondary_nav_css' ) ) {
|
||||
$css->add_property( 'margin-top', '-' . absint( $generate_settings['secondary_sub_menu_item_height'] ), '-' . absint( $og_defaults['secondary_sub_menu_item_height'] ), 'px' );
|
||||
|
||||
// Navigation background/text on hover.
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul li:hover > a,.secondary-navigation .main-nav ul li:focus > a,.secondary-navigation .main-nav ul li.sfHover > a,.secondary-menu-bar-items .menu-bar-item:hover > a' );
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul li:not([class*="current-menu-"]):hover > a, .secondary-navigation .main-nav ul li:not([class*="current-menu-"]):focus > a, .secondary-navigation .main-nav ul li.sfHover:not([class*="current-menu-"]) > a, .secondary-menu-bar-items .menu-bar-item:hover > a' );
|
||||
$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'] ) );
|
||||
$css->add_property( 'background-image', ! empty( $generate_settings['nav_item_hover_image'] ) ? 'url(' . esc_url( $generate_settings['nav_item_hover_image'] ) . ')' : '' );
|
||||
$css->add_property( 'background-repeat', esc_attr( $generate_settings['nav_item_hover_repeat'] ) );
|
||||
|
||||
// Sub-Navigation background/text on hover.
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul ul li:hover > a,.secondary-navigation .main-nav ul ul li:focus > a,.secondary-navigation .main-nav ul ul li.sfHover > a' );
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul ul li:not([class*="current-menu-"]):hover > a,.secondary-navigation .main-nav ul ul li:not([class*="current-menu-"]):focus > a,.secondary-navigation .main-nav ul ul li.sfHover:not([class*="current-menu-"]) > a' );
|
||||
$css->add_property( 'color', esc_attr( $generate_settings['subnavigation_text_hover_color'] ) );
|
||||
$css->add_property( 'background-color', esc_attr( $generate_settings['subnavigation_background_hover_color'] ) );
|
||||
$css->add_property( 'background-image', ! empty( $generate_settings['sub_nav_item_hover_image'] ) ? 'url(' . esc_url( $generate_settings['sub_nav_item_hover_image'] ) . ')' : '' );
|
||||
$css->add_property( 'background-repeat', esc_attr( $generate_settings['sub_nav_item_hover_repeat'] ) );
|
||||
|
||||
// Navigation background / text current + hover.
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul li[class*="current-menu-"] > a, .secondary-navigation .main-nav ul li[class*="current-menu-"] > a:hover,.secondary-navigation .main-nav ul li[class*="current-menu-"].sfHover > a' );
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul li[class*="current-menu-"] > a' );
|
||||
$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->add_property( 'background-image', ! empty( $generate_settings['nav_item_current_image'] ) ? 'url(' . esc_url( $generate_settings['nav_item_current_image'] ) . ')' : '' );
|
||||
$css->add_property( 'background-repeat', esc_attr( $generate_settings['nav_item_current_repeat'] ) );
|
||||
|
||||
// Sub-Navigation background / text current + hover.
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul ul li[class*="current-menu-"] > a,.secondary-navigation .main-nav ul ul li[class*="current-menu-"] > a:hover,.secondary-navigation .main-nav ul ul li[class*="current-menu-"].sfHover > a' );
|
||||
$css->set_selector( '.secondary-navigation .main-nav ul ul li[class*="current-menu-"] > a' );
|
||||
$css->add_property( 'color', esc_attr( $generate_settings['subnavigation_text_current_color'] ) );
|
||||
$css->add_property( 'background-color', esc_attr( $generate_settings['subnavigation_background_current_color'] ) );
|
||||
$css->add_property( 'background-image', ! empty( $generate_settings['sub_nav_item_current_image'] ) ? 'url(' . esc_url( $generate_settings['sub_nav_item_current_image'] ) . ')' : '' );
|
||||
@ -1140,6 +1154,10 @@ if ( ! function_exists( 'generate_secondary_color_scripts' ) ) {
|
||||
}
|
||||
|
||||
wp_add_inline_style( 'generate-secondary-nav', generate_secondary_nav_css() );
|
||||
|
||||
if ( class_exists( 'GeneratePress_Typography' ) ) {
|
||||
wp_add_inline_style( 'generate-secondary-nav', GeneratePress_Typography::get_css( 'secondary-nav' ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1290,3 +1308,43 @@ if ( ! function_exists( 'generate_secondary_nav_top_bar_widget' ) ) {
|
||||
function generate_secondary_nav_has_menu_bar_items() {
|
||||
return has_action( 'generate_secondary_menu_bar_items' );
|
||||
}
|
||||
|
||||
add_filter( 'generate_has_active_menu', 'generate_secondary_nav_set_active_menu' );
|
||||
/**
|
||||
* Tell GP about our active menus.
|
||||
*
|
||||
* @since 2.1.0
|
||||
* @param boolean $has_active_menu Whether we have an active menu.
|
||||
*/
|
||||
function generate_secondary_nav_set_active_menu( $has_active_menu ) {
|
||||
if ( has_nav_menu( 'secondary' ) ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $has_active_menu;
|
||||
}
|
||||
|
||||
add_filter( 'generate_typography_css_selector', 'generate_secondary_nav_typography_selectors' );
|
||||
/**
|
||||
* Add the Secondary Nav typography CSS selectors.
|
||||
*
|
||||
* @since 2.1.0
|
||||
* @param string $selector The selector we're targeting.
|
||||
*/
|
||||
function generate_secondary_nav_typography_selectors( $selector ) {
|
||||
switch ( $selector ) {
|
||||
case 'secondary-nav-menu-items':
|
||||
$selector = '.secondary-navigation .main-nav ul li a, .secondary-navigation .menu-toggle, .secondary-navigation .menu-bar-items';
|
||||
break;
|
||||
|
||||
case 'secondary-nav-sub-menu-items':
|
||||
$selector = '.secondary-navigation .main-nav ul ul li a';
|
||||
break;
|
||||
|
||||
case 'secondary-nav-menu-toggle':
|
||||
$selector = '.secondary-navigation .menu-toggle';
|
||||
break;
|
||||
}
|
||||
|
||||
return $selector;
|
||||
}
|
||||
|
Reference in New Issue
Block a user