Merge branch 'release/1.20.4'

functions.php

@@ -312,6 +312,7 @@ function siteorigin_north_scripts() {
 
 		// Add settings variables used by main theme JS.
 		$logo_sticky_scale = apply_filters( 'siteorigin_north_logo_sticky_scale', 0.755 );
+		$sticky_topbar = apply_filters( 'siteorigin_north_sticky_topbar', false );
 		wp_localize_script(
 			'siteorigin-north-script',
 			'siteoriginNorth',
@@ -320,6 +321,7 @@ function siteorigin_north_scripts() {
 				'logoScale' => is_numeric( $logo_sticky_scale ) ? $logo_sticky_scale : 0.755,
 				'collapse' => siteorigin_setting( 'responsive_menu_breakpoint' ),
 				'fitvids' => siteorigin_setting( 'responsive_fitvids' ),
+				'stickyTopbar' => $sticky_topbar,
 			)
 		);
 

js/north.js

@@ -124,7 +124,7 @@
 			$( this ).on( 'click touchend', function( e ) {
 				var link = $( this );
 				e.stopPropagation();
-				
+
 				if ( e.type == 'click' ) {
 					return;
 				}
@@ -402,14 +402,23 @@
 				$tb = $( '#topbar' ),
 				$wpab = $( '#wpadminbar' );
 
+			var whenToStickyMh = function() {
+				var wpabMobile = $( window ).width() <= 600;
+				var wpabHeight = $wpab.length && ! wpabMobile ? $wpab.outerHeight() : 0;
+				var tbHeight = $tb.length && siteoriginNorth.stickyTopbar ? $tb.outerHeight() : 0;
+
+				return wpabHeight + tbHeight;
+			};
+
 			// Sticky header shadow.
 			var smShadow = function() {
-				if ( $( window ).scrollTop() > 0 ) {
+				if ( $( window ).scrollTop() > whenToStickyMh ) {
 					$( $mh ).addClass( 'floating' );
 				} else {
 					$( $mh ).removeClass( 'floating' );
 				}
 			};
+
 			smShadow();
 			$( window ).on( 'scroll', smShadow );
 
@@ -430,7 +439,13 @@
 					$( 'body' ).removeClass( 'topbar-out' );
 				}
 
-				if ( $( 'body' ).hasClass( 'no-topbar' ) || ( ! $( 'body' ).hasClass( 'no-topbar' ) &&  $( 'body' ).hasClass( 'topbar-out' ) ) ) {
+				if (
+					$( 'body' ).hasClass( 'no-topbar' ) ||
+					(
+						! $( 'body' ).hasClass( 'no-topbar' ) &&
+						$( 'body' ).hasClass( 'topbar-out' )
+					)
+				) {
 					$mh.css( 'position', 'fixed' );
 				} else if ( ! $( 'body' ).hasClass( 'no-topbar' ) &&  ! $( 'body' ).hasClass( 'topbar-out' ) ) {
 					$mh.css( 'position', 'absolute' );
@@ -455,9 +470,27 @@
 					$mh.removeClass( 'mobile-sticky-menu' );
 				}
 			}
-
-			smSetup();
-			$( window ).on( 'resize scroll', smSetup );
+
+			if ( whenToStickyMh() === 0 || ! siteoriginNorth.stickyTopbar ) {
+				smSetup();
+				$( window ).on( 'resize scroll', smSetup );
+			} else {
+				var tbMhStickyPosition = function() {
+					var wpabMobile = $( window ).width() <= 600;
+					$tb.css( {
+						'position': 'sticky',
+						'top': $wpab.length && ! wpabMobile ? $wpab.outerHeight() : 0,
+					} );
+
+					$mh.css( {
+						'position': 'sticky',
+						'top': whenToStickyMh(),
+					} );
+				};
+
+				tbMhStickyPosition();
+				$( window ).on( 'resize', tbMhStickyPosition );
+			}
 		}
 
 		// Adjust for sticky header when linking from external anchors.

readme.txt

@@ -4,7 +4,7 @@ Contributors: siteorigin
 
 Tags: one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-menu, custom-logo, featured-images, footer-widgets, full-width-template, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce
 
-Tested up to: 6.5
+Tested up to: 6.6
 Requires at least: 4.7
 Requires PHP: 7.0.0
 License: GPLv2 or later
@@ -104,6 +104,44 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.20.4 - 18 September 2024 =
+* WooCommerce: Updated pagination template version number.
+* Updated SiteOrigin Settings.
+* Developer: Added `siteorigin_north_sticky_topbar`.
+
+= 1.20.3 - 26 June 2024 =
+* Updated Tested up to and required PHP tags.
+* WooCommerce: Replaced Add to Cart template with filter.
+* Updated SiteOrigin Settings.
+
+= 1.20.2 - 11 February 2024 =
+* FlexSlider: Removed unused font inclusion.
+* Updated Tested up to tag.
+* Updated SiteOrigin Settings submodule.
+
+= 1.20.1 - 15 October 2023 =
+* Updated SiteOrigin Settings.
+
+= 1.20.0 - July 25 2023 =
+* Removed the "cart.php" file in favor of using hooks for the WooCommerce cart page.
+* Adjusted the action buttons in the WC Cart for better structuring and mobile responsiveness.
+* Added new styles for the `.wc-buttons` class in the WC Cart.
+* Updated the styling of the cart buttons in WooCommerce to accommodate a sidebar and to be full-width when the sidebar is not present.
+* Added new functions `siteorigin_north_wc_cart_contents_after` and `siteorigin_north_wc_cart_contents` to modify the structure of the cart contents table in WooCommerce.
+
+= 1.19.18 - 08 July 2023 =
+* WooCommerce: Updated cart.php for WC `7.8.0`.
+* Updated SiteOrigin Settings.
+
+= 1.19.17 - 18 May 2023 =
+* Breadcrumbs: Improved long breadcrumb display.
+* Changed custom logo wrapper from `div` to `span` tag.
+* Updated SiteOrigin Settings.
+
+= 1.19.16 - 26 April 2023 =
+* Resolved Settings missing text domain.
+* WooCommerce: Correctly output Apply Coupon text.
+
 = 1.19.15 - 09 April 2023 =
 * Moved breadcrumb functionality to SiteOrigin Settings framework.
 

sass/style.scss

@@ -5,7 +5,7 @@ Author URI: https://siteorigin.com/
 Theme URI: https://siteorigin.com/theme/north/
 Description: Inspired by the elegant majesty and purity of the Swiss Alps and built with business owners in mind, North is the star in the SiteOrigin sky. With easy-to-use options, classic lines and a minimal feel, North feels visually limitless and technically effortless. It's fully responsive and retina ready. Some key features are its responsive menu, gorgeous animations and tight integration with all the major plugins you've come to rely on. You can use it to create a business website using SiteOrigin Page Builder and our Widgets Bundle. You can also build a full ecommerce store though North's WooCommerce integration. We offer free and premium support on our support <a href="http://siteorigin.com/thread/">forums</a> (http://siteorigin.com/thread/).
 Version: dev
-Tested up to: 6.5
+Tested up to: 6.6
 Requires at least: 4.7
 Requires PHP: 7.0.0
 License: GNU General Public License v2 or later

woocommerce/loop/pagination.php

@@ -4,7 +4,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  *
- * @version 3.3.1
+ * @version 9.3.0
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly