diff --git a/core/includes/customizer/assets/js/customize-preview-color-control.js b/core/includes/customizer/assets/js/customize-preview-color-control.js index 495677d8c..efbceb69e 100644 --- a/core/includes/customizer/assets/js/customize-preview-color-control.js +++ b/core/includes/customizer/assets/js/customize-preview-color-control.js @@ -1474,20 +1474,23 @@ //Header Top Row Background Color api( 'responsive_header_above_row_bg_color', function( value ) { value.bind( function( newval ) { - $('.responsive-site-above-header-wrap').css('background-color', newval ); + jQuery('style#responsive-header-above-row-bg-color').remove(); + jQuery('head').append( + '' + ); } ); } ); //Header Top Row Hover Background Color api( 'responsive_header_above_row_bg_hover_color', function( value ) { value.bind( function( newval ) { - $(".responsive-site-above-header-wrap").hover( - function() { - $(this).css("background-color", api('responsive_header_above_row_bg_hover_color').get()); - }, - function() { - $(this).css("background-color", api('responsive_header_above_row_bg_color').get()); - } + jQuery('style#responsive-header-above-row-bg-hover-color').remove(); + jQuery('head').append( + '' ); } ); } ); @@ -1519,20 +1522,23 @@ //Header Primary Row Background Color api( 'responsive_header_primary_row_bg_color', function( value ) { value.bind( function( newval ) { - $('.responsive-site-primary-header-wrap').css('background-color', newval ); + jQuery('style#responsive-header-primary-row-bg-color').remove(); + jQuery('head').append( + '' + ); } ); } ); //Header Primary Row Hover Background Color api( 'responsive_header_primary_row_bg_hover_color', function( value ) { value.bind( function( newval ) { - $(".responsive-site-primary-header-wrap").hover( - function() { - $(this).css("background-color", api('responsive_header_primary_row_bg_hover_color').get()); - }, - function() { - $(this).css("background-color", api('responsive_header_primary_row_bg_color').get()); - } + jQuery('style#responsive-header-primary-row-bg-hover-color').remove(); + jQuery('head').append( + '' ); } ); } ); @@ -1564,20 +1570,23 @@ //Header Below Row Background Color api( 'responsive_header_below_row_bg_color', function( value ) { value.bind( function( newval ) { - $('.responsive-site-below-header-wrap').css('background-color', newval ); + jQuery('style#responsive-header-below-row-bg-color').remove(); + jQuery('head').append( + '' + ); } ); } ); //Header Below Row Hover Background Color api( 'responsive_header_below_row_bg_hover_color', function( value ) { value.bind( function( newval ) { - $(".responsive-site-below-header-wrap").hover( - function() { - $(this).css("background-color", api('responsive_header_below_row_bg_hover_color').get()); - }, - function() { - $(this).css("background-color", api('responsive_header_below_row_bg_color').get()); - } + jQuery('style#responsive-header-below-row-bg-hover-color').remove(); + jQuery('head').append( + '' ); } ); } ); diff --git a/core/includes/customizer/assets/js/customize-preview-padding-control.js b/core/includes/customizer/assets/js/customize-preview-padding-control.js index 1ba61e1d0..c0d0e79d6 100644 --- a/core/includes/customizer/assets/js/customize-preview-padding-control.js +++ b/core/includes/customizer/assets/js/customize-preview-padding-control.js @@ -1851,9 +1851,9 @@ api( 'responsive_product_card_inside_container_mobile_bottom_padding', function( { type: 'below', selector: '.rspv-site-below-footer-wrap' }, ]; const hfbFooterRowsItems = [ - { type: 'above', selector: '.rspv-site-above-footer-wrap .footer-widget-area' }, - { type: 'primary', selector: '.rspv-site-primary-footer-wrap .footer-widget-area' }, - { type: 'below', selector: '.rspv-site-below-footer-wrap .footer-widget-area' }, + { type: 'above', selector: '.rspv-site-above-footer-wrap .footer-widget-area, .rspv-site-above-footer-wrap .footer-widget-wrapper' }, + { type: 'primary', selector: '.rspv-site-primary-footer-wrap .footer-widget-area, .rspv-site-primary-footer-wrap .footer-widget-wrapper' }, + { type: 'below', selector: '.rspv-site-below-footer-wrap .footer-widget-area, .rspv-site-below-footer-wrap .footer-widget-wrapper' }, ]; // Common suffixes for both margin and padding diff --git a/core/includes/customizer/controls/general.css b/core/includes/customizer/controls/general.css index 7f0786db9..fe5e61a95 100644 --- a/core/includes/customizer/controls/general.css +++ b/core/includes/customizer/controls/general.css @@ -1406,7 +1406,7 @@ body.rtl .customize-control .responsive-switchers li { } #customize-control-responsive_redirect_to_content_header a, -#customize-control-responsive_redirect_to_header_widgets a, +#customize-control-responsive_redirect_to_header_widgets_section a, #customize-control-responsive_redirect_to_sticky_header a, #customize-control-responsive_redirect_to_transparent_header a { padding-top: 18px; diff --git a/core/includes/customizer/custom-styles.php b/core/includes/customizer/custom-styles.php index f2d3d3cb9..f573072de 100644 --- a/core/includes/customizer/custom-styles.php +++ b/core/includes/customizer/custom-styles.php @@ -2924,18 +2924,18 @@ function responsive_customizer_styles() { // footer_bar Padding. $footer_bar_padding_right = esc_html( get_theme_mod( 'responsive_footer_bar_right_padding', 0 ) ); $footer_bar_padding_left = esc_html( get_theme_mod( 'responsive_footer_bar_left_padding', 0 ) ); - $footer_bar_padding_top = esc_html( get_theme_mod( 'responsive_footer_bar_top_padding', 20 ) ); - $footer_bar_padding_bottom = esc_html( get_theme_mod( 'responsive_footer_bar_bottom_padding', 20 ) ); + $footer_bar_padding_top = esc_html( get_theme_mod( 'responsive_footer_bar_top_padding', 0 ) ); + $footer_bar_padding_bottom = esc_html( get_theme_mod( 'responsive_footer_bar_bottom_padding', 0 ) ); $footer_bar_tablet_padding_right = esc_html( get_theme_mod( 'responsive_footer_bar_tablet_right_padding', 0 ) ); $footer_bar_tablet_padding_left = esc_html( get_theme_mod( 'responsive_footer_bar_tablet_left_padding', 0 ) ); - $footer_bar_tablet_padding_top = esc_html( get_theme_mod( 'responsive_footer_bar_tablet_top_padding', 20 ) ); - $footer_bar_tablet_padding_bottom = esc_html( get_theme_mod( 'responsive_footer_bar_tablet_bottom_padding', 20 ) ); + $footer_bar_tablet_padding_top = esc_html( get_theme_mod( 'responsive_footer_bar_tablet_top_padding', 0 ) ); + $footer_bar_tablet_padding_bottom = esc_html( get_theme_mod( 'responsive_footer_bar_tablet_bottom_padding', 0 ) ); $footer_bar_mobile_padding_right = esc_html( get_theme_mod( 'responsive_footer_bar_mobile_right_padding', 0 ) ); $footer_bar_mobile_padding_left = esc_html( get_theme_mod( 'responsive_footer_bar_mobile_left_padding', 0 ) ); - $footer_bar_mobile_padding_top = esc_html( get_theme_mod( 'responsive_footer_bar_mobile_top_padding', 20 ) ); - $footer_bar_mobile_padding_bottom = esc_html( get_theme_mod( 'responsive_footer_bar_mobile_bottom_padding', 20 ) ); + $footer_bar_mobile_padding_top = esc_html( get_theme_mod( 'responsive_footer_bar_mobile_top_padding', 0 ) ); + $footer_bar_mobile_padding_bottom = esc_html( get_theme_mod( 'responsive_footer_bar_mobile_bottom_padding', 0 ) ); $custom_css .= '.footer-bar { padding: ' . responsive_spacing_css( $footer_bar_padding_top, $footer_bar_padding_right, $footer_bar_padding_bottom, $footer_bar_padding_left ) . '; @@ -3186,6 +3186,16 @@ function responsive_customizer_styles() { background: transparent; } } + .sticky-header { + .responsive-site-above-header-wrap, + .responsive-site-primary-header-wrap, + .responsive-site-below-header-wrap, + .responsive-site-below-header-wrap:hover, + .responsive-site-primary-header-wrap:hover, + .responsive-site-above-header-wrap:hover { + background: transparent; + } + } .site-header-focus-item > .customize-partial-edit-shortcut button { left: 0; } @@ -3575,8 +3585,8 @@ function responsive_customizer_styles() { $primary_footer_height = get_theme_mod( 'responsive_footer_primary_height', 30 ); $primary_footer_vertical_alignment = get_theme_mod( 'responsive_footer_primary_vertical_alignment', 'center' ); $primary_footer_bg_color = get_theme_mod( 'responsive_footer_primary_row_bg_color', '#333' ); - $primary_footer_top_border_size = get_theme_mod( 'responsive_footer_primary_row_top_border_size', 0 ); - $primary_footer_top_border_color = get_theme_mod( 'responsive_footer_primary_row_border_color', '#FFF' ); + $primary_footer_top_border_size = get_theme_mod( 'responsive_footer_primary_row_top_border_size', 1 ); + $primary_footer_top_border_color = get_theme_mod( 'responsive_footer_primary_row_border_color', '#aaaaaa' ); $custom_css .= " .rspv-site-primary-footer-inner-wrap { grid-column-gap: {$primary_footer_inner_column_spacing}px; @@ -3726,7 +3736,7 @@ function build_responsive_padding_spacing_css( $padding ) { } "; // copyright padding - $copyright_padding_values = get_responsive_spacing_values('responsive_footer_copyright', 15, 15, 15, 15); + $copyright_padding_values = get_responsive_spacing_values('responsive_footer_copyright', 30, 30, 30, 30); $custom_css .= ".footer-layouts.copyright {"; $custom_css .= build_responsive_padding_spacing_css($copyright_padding_values['desktop']); @@ -3786,7 +3796,6 @@ function build_responsive_padding_spacing_css( $padding ) { $custom_css .= ".rspv-site-above-footer-wrap .footer-widget-area {"; $custom_css .= build_responsive_padding_spacing_css($above_footer_padding_values['mobile']); $custom_css .= "}}"; - // Fetch primary footer row items padding and margin values. $primary_footer_padding_values = get_responsive_spacing_values('responsive_footer_primary_row_item_padding'); diff --git a/core/includes/customizer/extend-controls/src/selectbtn/selectbtn-component.js b/core/includes/customizer/extend-controls/src/selectbtn/selectbtn-component.js index c5d6795fb..349aa14b6 100644 --- a/core/includes/customizer/extend-controls/src/selectbtn/selectbtn-component.js +++ b/core/includes/customizer/extend-controls/src/selectbtn/selectbtn-component.js @@ -6,14 +6,9 @@ const SelectButtonComponent = props => { const [props_value, setPropsValue] = useState(props.control.setting.get()); const onOptionClick = (value) => { - if (props_value === value) { - setPropsValue('none'); - props.control.setting.set('none'); - } else { - setPropsValue(value); - props.control.setting.set(value); - } - }; + setPropsValue(value); + props.control.setting.set(value); + }; const { label, diff --git a/core/includes/customizer/settings/class-responsive-footer-layout-customizer.php b/core/includes/customizer/settings/class-responsive-footer-layout-customizer.php index 74ed080cb..5271d45ae 100644 --- a/core/includes/customizer/settings/class-responsive-footer-layout-customizer.php +++ b/core/includes/customizer/settings/class-responsive-footer-layout-customizer.php @@ -247,7 +247,7 @@ public function customizer_options( $wp_customize ) { // responsive_select_control( $wp_customize, 'footer_bar_layout', $footer_bar_layout_label, 'responsive_footer_layout', 130, $footer_layout_choices, 'horizontal', null, 'postMessage' ); // Bar Padding. - responsive_padding_control( $wp_customize, 'footer_bar', 'responsive_footer_layout', 50, 20, 0, null ); + responsive_padding_control( $wp_customize, 'footer_bar', 'responsive_footer_layout', 50, 0, 0, null ); // Bottom Border. diff --git a/core/includes/customizer/settings/class-responsive-header-builder-section-customizer.php b/core/includes/customizer/settings/class-responsive-header-builder-section-customizer.php index 90f7925a8..0cdb1a77f 100644 --- a/core/includes/customizer/settings/class-responsive-header-builder-section-customizer.php +++ b/core/includes/customizer/settings/class-responsive-header-builder-section-customizer.php @@ -79,7 +79,7 @@ public function customizer_options( $wp_customize ) { responsive_redirect_control( $wp_customize, 'redirect_to_content_header', $configure_footer_menu_redirect_label, 'responsive_header_builder_section', 10, 'section', 'responsive_content_header_layout'); $configure_footer_menu_redirect_label = __( 'Header Widgets', 'responsive' ); - responsive_redirect_control( $wp_customize, 'redirect_to_header_widgets', $configure_footer_menu_redirect_label, 'responsive_header_builder_section', 10, 'section', 'responsive_header_widget'); + responsive_redirect_control( $wp_customize, 'redirect_to_header_widgets_section', $configure_footer_menu_redirect_label, 'responsive_header_builder_section', 10, 'section', 'responsive_header_widget'); $configure_footer_menu_redirect_label = __( 'Sticky Header', 'responsive' ); responsive_redirect_control( $wp_customize, 'redirect_to_sticky_header', $configure_footer_menu_redirect_label, 'responsive_header_builder_section', 10, 'section', 'responsive_header_sticky_menu_layout'); diff --git a/core/includes/customizer/settings/class-responsive-typography-customizer.php b/core/includes/customizer/settings/class-responsive-typography-customizer.php index 213942f25..336da2c6c 100644 --- a/core/includes/customizer/settings/class-responsive-typography-customizer.php +++ b/core/includes/customizer/settings/class-responsive-typography-customizer.php @@ -630,7 +630,7 @@ public function customizer_options( $wp_customize ) { 'priority' => $priority, 'active_callback' => $active_callback, 'choices' => array( - 'none' => esc_html__( 'None', 'responsive' ), + 'default' => esc_html__( 'Default', 'responsive' ), 'capitalize' => esc_html__( 'Aa', 'responsive' ), 'lowercase' => esc_html__( 'aa', 'responsive' ), 'uppercase' => esc_html__( 'AA', 'responsive' ), diff --git a/core/includes/customizer/settings/hfb-builder/footer/class-responsive-hfb-footer-primary-row.php b/core/includes/customizer/settings/hfb-builder/footer/class-responsive-hfb-footer-primary-row.php index 8f1d99aab..8617a0a81 100644 --- a/core/includes/customizer/settings/hfb-builder/footer/class-responsive-hfb-footer-primary-row.php +++ b/core/includes/customizer/settings/hfb-builder/footer/class-responsive-hfb-footer-primary-row.php @@ -72,7 +72,7 @@ public function customizer_options( $wp_customize ) { // Layout. $layout_separator_label = __( 'Layout', 'responsive' ); - responsive_builder_row_layout_control( $wp_customize, 'footer_primary_layout',$layout_separator_label, 'responsive_footer_primary_row', 30, 'equal', array( 'footer' => 'primary', 'rspv_event' => 'footer_items' ), null ); + responsive_builder_row_layout_control( $wp_customize, 'footer_primary_layout',$layout_separator_label, 'responsive_footer_primary_row', 30, 'left-heavy', array( 'footer' => 'primary', 'rspv_event' => 'footer_items' ), null ); responsive_horizontal_separator_control($wp_customize, 'footer_primary_separator_5', 1, 'responsive_footer_primary_row', 35, 1, ); @@ -116,7 +116,7 @@ public function customizer_options( $wp_customize ) { // Top Border Size. $footer_primary_row_top_border_size_label = __( 'Top Border Size (px)', 'responsive' ); - responsive_drag_number_control( $wp_customize, 'footer_primary_row_top_border_size', $footer_primary_row_top_border_size_label, 'responsive_footer_primary_row', 100, 0, null, 300, 0, 'postMessage', 1 ); + responsive_drag_number_control( $wp_customize, 'footer_primary_row_top_border_size', $footer_primary_row_top_border_size_label, 'responsive_footer_primary_row', 100, 1, null, 300, 0, 'postMessage', 1 ); // Border Color. $footer_primary_row_border_color_label = __( 'Border Color', 'responsive' ); diff --git a/core/includes/functions-sidebar.php b/core/includes/functions-sidebar.php index b76ece6eb..a79934323 100644 --- a/core/includes/functions-sidebar.php +++ b/core/includes/functions-sidebar.php @@ -114,7 +114,7 @@ function responsive_widgets_init() { 'id' => 'footer-widget-1', 'before_title' => '

', 'after_title' => '

', - 'before_widget' => '
', + 'before_widget' => '
', 'after_widget' => '
', ) ); @@ -125,7 +125,7 @@ function responsive_widgets_init() { 'id' => 'footer-widget-2', 'before_title' => '

', 'after_title' => '

', - 'before_widget' => '
', + 'before_widget' => '
', 'after_widget' => '
', ) ); @@ -136,7 +136,7 @@ function responsive_widgets_init() { 'id' => 'footer-widget-3', 'before_title' => '

', 'after_title' => '

', - 'before_widget' => '
', + 'before_widget' => '
', 'after_widget' => '
', ) ); @@ -147,7 +147,7 @@ function responsive_widgets_init() { 'id' => 'footer-widget-4', 'before_title' => '

', 'after_title' => '

', - 'before_widget' => '
', + 'before_widget' => '
', 'after_widget' => '
', ) ); diff --git a/core/includes/functions.php b/core/includes/functions.php index 443ad9dfd..ff5fb7d45 100644 --- a/core/includes/functions.php +++ b/core/includes/functions.php @@ -333,9 +333,9 @@ function responsive_admin_header_style() { responsive_background_images_background_compatibility(); responsive_font_sizes_background_compatibility(); - if( ! get_option( 'responisve_old_header_footer_comaptibility_with_header_builder_done' ) ) { - responisve_old_header_footer_comaptibility_with_hfb(); - update_option( 'responisve_old_header_footer_comaptibility_with_header_builder_done', true ); + if( ! get_option( 'responsive_old_header_footer_comaptibility_with_header_builder_done' ) ) { + responsive_old_header_footer_comaptibility_with_hfb(); + update_option( 'responsive_old_header_footer_comaptibility_with_header_builder_done', true ); } } @@ -1191,7 +1191,7 @@ function defaults() { 'responsive_footer_above_row_bg_color' => '#333333', 'responsive_footer_above_row_border_color' => '#FFFFFF', 'responsive_footer_primary_row_bg_color' => '#333333', - 'responsive_footer_primary_row_border_color' => '#FFFFFF', + 'responsive_footer_primary_row_border_color' => '#aaaaaa', 'responsive_footer_below_row_bg_color' => '#333333', 'responsive_footer_below_row_border_color' => '#FFFFFF', 'responsive_footer_items' => array( @@ -1470,8 +1470,8 @@ function responsive_extract_numeric_font_size($value) { return isset($matches[0]) ? $matches[0] : '16'; } -if( ! function_exists( 'responisve_old_header_footer_comaptibility_with_hfb' ) ) : - function responisve_old_header_footer_comaptibility_with_hfb() { +if( ! function_exists( 'responsive_old_header_footer_comaptibility_with_hfb' ) ) : + function responsive_old_header_footer_comaptibility_with_hfb() { $header_hfb_elements = get_theme_mod( 'responsive_header_desktop_items', get_responsive_customizer_defaults( 'responsive_header_desktop_items' ) ); @@ -1489,6 +1489,16 @@ function responisve_old_header_footer_comaptibility_with_hfb() { $header_hfb_elements['primary']['primary_right'] = array(); } + // Vertical Header backward compatibility. + $responsive_header_layout = get_theme_mod( 'responsive_header_layout' ); + if ( 'vertical' === $responsive_header_layout ) { + unset( $header_hfb_elements['primary']['primary_left'][0] ); + unset( $header_hfb_elements['primary']['primary_right'][0] ); + array_push( $header_hfb_elements['primary']['primary_center'], 'logo' ); + unset( $header_hfb_elements['below']['below_center'][0] ); + array_push( $header_hfb_elements['below']['below_center'], 'primary_navigation' ); + } + set_theme_mod( 'responsive_header_desktop_items', $header_hfb_elements ); if( get_theme_mod( 'responsive_header_height', 0 ) !== 0 ) { @@ -1504,9 +1514,10 @@ function responisve_old_header_footer_comaptibility_with_hfb() { set_theme_mod( 'responsive_header_primary_row_bg_hover_color', get_theme_mod( 'responsive_header_background_color' ) ); } - if( get_theme_mod( 'responsive_enable_header_bottom_border', 0 ) && get_theme_mod( 'responsive_bottom_border', 0 ) > 0 ) { + if( get_theme_mod( 'responsive_enable_header_bottom_border', 1 ) && get_theme_mod( 'responsive_bottom_border', 0 ) > 0 ) { set_theme_mod( 'responsive_header_primary_row_bottom_border_size', get_theme_mod( 'responsive_bottom_border' ) ); set_theme_mod( 'responsive_header_primary_row_bottom_border_color', get_theme_mod( 'responsive_header_border_color' ) ); + set_theme_mod( 'responsive_header_primary_row_bottom_border_hover_color', get_theme_mod( 'responsive_header_border_color' ) ); } // Footer compatibility with new footer builder. @@ -1553,6 +1564,7 @@ function responisve_old_header_footer_comaptibility_with_hfb() { $footer_hfb_elements['primary']['primary_2'] = array(); array_push( $footer_hfb_elements['primary']['primary_2'], 'footer_navigation' ); array_push( $footer_hfb_elements['primary']['primary_3'], 'footer_copyright' ); + set_theme_mod( 'responsive_footer_primary_layout', 'equal' ); } else { set_theme_mod( 'responsive_footer_primary_columns', '2' ); $footer_hfb_elements['primary']['primary_1'] = array(); @@ -1624,8 +1636,8 @@ function responisve_old_header_footer_comaptibility_with_hfb() { if ( get_theme_mod( $source_mod ) ) { set_theme_mod( $target_mod, get_theme_mod( $source_mod ) ); - set_theme_mod( $source_mod, 0 ); } + set_theme_mod( $source_mod, 0 ); } $footer_widgets_columns = get_theme_mod( 'responsive_footer_widgets_columns' ); @@ -1652,14 +1664,6 @@ function responisve_old_header_footer_comaptibility_with_hfb() { if ( get_theme_mod( $source_mod ) ) { set_theme_mod( $target_mod, get_theme_mod( $source_mod ) ); } - if( empty( get_theme_mod( 'responsive_style' ) ) || 'boxed' === get_theme_mod( 'responsive_style' ) ) { - $source_mod_2 = "responsive_box_$type"; - $target_mod_2 = "responsive_footer_above_row_item_padding_$type"; - - if ( get_theme_mod( $source_mod_2, 30 ) ) { - set_theme_mod( $target_mod_2, get_theme_mod( $source_mod_2, 30 ) ); - } - } } } @@ -1675,13 +1679,6 @@ function responisve_old_header_footer_comaptibility_with_hfb() { set_theme_mod( 'responsive_footer_copyright_links_hover_color', get_theme_mod( 'responsive_footer_links_hover_color' ) ); } - // backward compatibility of layout -> border size & color. - if ( get_theme_mod( 'responsive_footer_border_size' ) ) { - set_theme_mod( 'responsive_footer_primary_row_top_border_size', get_theme_mod( 'responsive_footer_border_size' ) ); - } - if ( get_theme_mod( 'responsive_footer_border_color' ) ) { - set_theme_mod( 'responsive_footer_primary_row_border_color', get_theme_mod( 'responsive_footer_border_color' ) ); - } // backward compatibility of layout -> background color. if ( get_theme_mod( 'responsive_footer_background_color' ) && get_theme_mod( 'responsive_footer_background_image_toggle' ) ) { $prev_footer_background_color = 'transparent'; @@ -1699,6 +1696,9 @@ function responisve_old_header_footer_comaptibility_with_hfb() { set_theme_mod( 'responsive_footer_menu_background_hover_color', $prev_footer_background_color ); } + // Copyright typography backward compatibility + set_theme_mod( 'footer_copyright_typography', get_theme_mod( 'footer_typography' ) ); + set_theme_mod( 'responsive_footer_items', $footer_hfb_elements ); } endif; diff --git a/core/sass/_footer.scss b/core/sass/_footer.scss index f4e4f9e0e..bdd41043b 100644 --- a/core/sass/_footer.scss +++ b/core/sass/_footer.scss @@ -26,6 +26,7 @@ .footer-widgets { display: block; padding: $grid-gutter-width * 2 0; + flex-grow: 1; .row { justify-content: space-between; } diff --git a/core/sass/_header.scss b/core/sass/_header.scss index c43552cf7..17e1060fe 100644 --- a/core/sass/_header.scss +++ b/core/sass/_header.scss @@ -250,21 +250,6 @@ } } - &.site-header-site-branding-main-navigation { - &.last-item-spread-away { - .main-navigation .menu { - width: 100%; - float: left; - & > li.res-custom-text-menu, - & > li.res-button-menu, - & > li.res-cart-link, - & > li.res-search-link { - float: right; - } - } - } - } - &.site-header-main-navigation { &.last-item-spread-away { &.site-branding-off { @@ -276,6 +261,17 @@ } } +.last-item-spread-away { + .main-navigation .menu { + & > li.res-custom-text-menu, + & > li.res-button-menu, + & > li.res-cart-link, + & > li.res-search-link { + float: right; + } + } +} + .site-mobile-header-layout-horizontal { .main-navigation { .menu-toggle { diff --git a/template-parts/footer/footer-row.php b/template-parts/footer/footer-row.php index a9151bc3e..fd8226fba 100644 --- a/template-parts/footer/footer-row.php +++ b/template-parts/footer/footer-row.php @@ -9,7 +9,7 @@ $columns = absint( get_theme_mod( 'responsive_footer_' . $row . '_columns', ( 'above' === $row ) ? 3 : ( 'primary' === $row ? 2 : 1 ) ) ); $width = get_theme_mod( 'responsive_footer_' . $row . '_width', 'contained' ); $inline_layout = get_theme_mod( 'responsive_footer_' . $row . '_inner_elements_layout', 'inline' ); -$columns_layout = get_theme_mod( 'responsive_footer_' . $row . '_layout', 'equal' ); +$columns_layout = get_theme_mod( 'responsive_footer_' . $row . '_layout', ( 'primary' === $row ) ? 'left-heavy' : 'equal' ); $i = 0; ?>