Merge branch 'release/1.20.27'

Author: Misplon

js/jquery.theme-main.js

@@ -279,7 +279,9 @@ jQuery ( function( $ ) {
 			if ( $body.hasClass( 'admin-bar' ) ) {
 				threshold = $( '#wpadminbar' ).css( 'position' ) == 'absolute' ? 0 : $( '#wpadminbar' ).outerHeight();
 			}
-			var navTop = parseInt( $initTop - $( window ).scrollTop() ); // Force truncation of float value.
+
+			// Round up to the nearest pixel.
+			var navTop = Math.ceil( $initTop - $( window ).scrollTop() );
 			if ( navTop < threshold ) {
 				$$.addClass( 'sticky' );
 				$body.addClass( 'vantage-sticky-menu sticky-menu' );

readme.txt

@@ -106,6 +106,10 @@ This theme makes use of the SiteOrigin Settings Framework contained in the /inc
 
 == Changelog ==
 
+= 1.20.27 - 20 October 2024 =
+* Restored menu alignment setting when a menu has not been assigned to the theme's primary menu location.
+* Logo in Menu: Moved the spacing CSS to the logo wrapper container.
+
 = 1.20.26 - 25 September 2024 =
 * Max Mega Menu: Improved full-width display.
 

style.css

@@ -668,14 +668,14 @@ body {
   margin-left: auto;
 }
 #masthead.masthead-logo-in-menu .logo-in-menu-wrapper {
-  margin-top: auto;
   margin-bottom: auto;
+  margin-right: 15px;
+  margin-top: auto;
+  padding: 10px 0;
 }
 #masthead.masthead-logo-in-menu .logo {
   align-items: center;
   display: flex;
-  padding: 10px 0;
-  margin-right: 15px;
 }
 #masthead.masthead-logo-in-menu .logo > * {
   display: block;
@@ -712,7 +712,7 @@ body {
   display: flex;
 }
 #masthead:not(.masthead-logo-in-menu) .main-navigation-container .mobile-nav-customize-wrapper,
-#masthead:not(.masthead-logo-in-menu) .main-navigation-container > div[class^="menu-"],
+#masthead:not(.masthead-logo-in-menu) .main-navigation-container > div[class^="menu"],
 #masthead.masthead-logo-in-menu .main-navigation-container {
   flex: 2;
 }

style.less

@@ -509,15 +509,15 @@ body {
 		}
 
 		.logo-in-menu-wrapper {
-			margin-top: auto;
 			margin-bottom: auto;
+			margin-right: 15px;
+			margin-top: auto;
+			padding: 10px 0;
 		}
 
 		.logo {
 			align-items: center;
 			display: flex;
-			padding: 10px 0;
-			margin-right: 15px;
 
 			> * {
 				display: block;