Merge branch 'release/1.20.5'

siteorigin · Oct 16, 2024 · a289b7a · a289b7a
2 parents b5025b8 + 8e538af
commit a289b7a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/js/north.js b/js/north.js
@@ -412,15 +412,14 @@
 
 			// Sticky header shadow.
 			var smShadow = function() {
-				if ( $( window ).scrollTop() > whenToStickyMh ) {
+				if ( $( window ).scrollTop() > whenToStickyMh() ) {
 					$( $mh ).addClass( 'floating' );
 				} else {
 					$( $mh ).removeClass( 'floating' );
 				}
 			};
 
-			smShadow();
-			$( window ).on( 'scroll', smShadow );
+			$( window ).on( 'scroll', smShadow ).trigger( 'scroll' );
 
 			var smSetup = function() {
 

diff --git a/readme.txt b/readme.txt
@@ -104,6 +104,10 @@ Original design files are available on [Google Drive](https://drive.google.com/f
 
 == Changelog ==
 
+= 1.20.5 - 17 October 2024 =
+* Header: Restored the `floating` class to the masthead on scroll.
+* Header: Ensured the sticky logo is always correctly aligned.
+
 = 1.20.4 - 18 September 2024 =
 * WooCommerce: Updated pagination template version number.
 * Updated SiteOrigin Settings.

diff --git a/sass/site/primary/_masthead.scss b/sass/site/primary/_masthead.scss
@@ -99,7 +99,7 @@
 		}
 
 		@at-root #masthead.floating img.alt-logo-scroll {
-			display: block;
+			display: inline-block;
 		}
 	}
 

diff --git a/style.css b/style.css
@@ -1429,7 +1429,7 @@ body.page-layout-stripped #main.site-main {
     #masthead .site-branding img.alt-logo-scroll {
       display: none; }
     #masthead.floating img.alt-logo-scroll {
-      display: block; }
+      display: inline-block; }
   #masthead .site-branding,
   #masthead .main-navigation {
     display: table-cell;
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,7 +99,7 @@ @@
     		}
     		@at-root #masthead.floating img.alt-logo-scroll {
-    			display: block;
+    			display: inline-block;
     		}
     	}
@@ Expand Down @@