Merge branch 'release/1.20.23'

Author: Misplon

build-config.js

@@ -47,7 +47,6 @@ module.exports = {
             'js/**/*.js',
             'inc/sliders/js/**/*.js',
             'inc/customizer/js/**/*.js',
-            'inc/metaslider/js/**/*.js',
             'inc/mobilenav/js/**/*.js',
             'inc/settings/js/**/*.js',
             'inc/settings/chosen/*.js',

js/jquery.theme-main.js

@@ -8,7 +8,7 @@ jQuery ( function( $ ) {
 	$( 'body.no-js' ).removeClass( 'no-js' );
 
 	// Initialize FlexSlider.
-	$( '.entry-content .flexslider:not(.metaslider .flexslider), #metaslider-demo.flexslider, .gallery-format-slider' ).flexslider( { 
+	$( '.entry-content .flexslider:not(.metaslider .flexslider), #metaslider-demo.flexslider, .gallery-format-slider' ).flexslider( {
 		namespace: "flex-vantage-",
 	} );
 
@@ -262,7 +262,7 @@ jQuery ( function( $ ) {
 	} ).trigger( 'resize' );
 
 	// The sticky menu.
-	if ( ( $( 'nav.site-navigation.primary' ).hasClass( 'use-sticky-menu' ) && !isMobileDevice ) ||
+	if ( ( $( 'nav.site-navigation.primary' ).hasClass( 'use-vantage-sticky-menu' ) && !isMobileDevice ) ||
 		( ( isMobileDevice || isCustomizer ) && isMobileNav ) ) {
 
 		var $$ = $( 'nav.site-navigation.primary' );
@@ -282,16 +282,16 @@ jQuery ( function( $ ) {
 			var navTop = parseInt( $initTop - $( window ).scrollTop() ); // Force truncation of float value.
 			if ( navTop < threshold ) {
 				$$.addClass( 'sticky' );
-				$body.addClass( 'sticky-menu' );
+				$body.addClass( 'vantage-sticky-menu sticky-menu' );
 				$( '#masthead' ).css( 'padding-bottom', $$.innerHeight() + 'px' );
 
 				if ( isBoxedMega ) {
 					$$.width( boxedMegaWidth );
 				}
-			} else if ( $body.hasClass( 'sticky-menu' ) ) {
+			} else if ( $body.hasClass( 'vantage-sticky-menu' ) ) {
 				$( '#masthead' ).css( 'padding-bottom', 0 );
 				$$.removeClass( 'sticky' );
-				$body.removeClass( 'sticky-menu' );
+				$body.removeClass( 'vantage-sticky-menu sticky-menu' );
 
 				if ( isBoxedMega ) {
 					$$.width( 'auto' );

less/page-settings.less

@@ -55,7 +55,7 @@
 		}
 
 		@media ( min-width: 1100px ) {
-			.main-navigation.use-sticky-menu.sticky {
+			.main-navigation.use-vantage-sticky-menu.sticky {
 				left: 0;
 				margin: 0 auto;
 				max-width: calc(100% - 40px);

parts/menu.php

@@ -12,6 +12,7 @@
 $nav_classes[] = 'primary';
 
 if ( siteorigin_setting( 'navigation_use_sticky_menu' ) ) {
+	$nav_classes[] = 'use-vantage-sticky-menu';
 	$nav_classes[] = 'use-sticky-menu';
 }
 

readme.txt

@@ -4,7 +4,7 @@ Contributors: siteorigin
 
 Tags: two-columns, left-sidebar, right-sidebar, grid-layout, 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: 5.6.20
 License: GPLv2 or later
@@ -106,6 +106,10 @@ This theme makes use of the SiteOrigin Settings Framework contained in the /inc
 
 == Changelog ==
 
+= 1.20.23 - 04 August 2024 =
+* Updated `Tested up to` tag.
+* Prefixed `sticky-menu` class to prevent a possible core Editor JavaScript conflict.
+
 = 1.20.22 - 15 June 2024 =
 * Updated `Tested up to` tag.
 * Resolved a potential sticky header offset error.

style.css

@@ -708,11 +708,11 @@ body {
   margin: -10px 0 0;
   padding: 0 0 15px;
 }
-.sticky-menu #masthead.masthead-logo-in-menu img.alt-logo,
+.vantage-sticky-menu #masthead.masthead-logo-in-menu img.alt-logo,
 #masthead.masthead-logo-in-menu img.alt-logo-scroll {
   display: none;
 }
-.sticky-menu #masthead.masthead-logo-in-menu img.alt-logo-scroll {
+.vantage-sticky-menu #masthead.masthead-logo-in-menu img.alt-logo-scroll {
   display: block;
 }
 .layout-boxed #masthead.masthead-logo-in-menu .logo,
@@ -1052,41 +1052,41 @@ body.responsive.layout-full #page-wrapper .full-container {
   font-weight: bold;
 }
 /* For when the menu becomes a sticky menu */
-body.sticky-menu.layout-full .site-navigation {
+body.vantage-sticky-menu.layout-full .site-navigation {
   right: 0;
   left: 0;
   margin-right: 0;
   margin-left: 0;
 }
-body.sticky-menu.layout-boxed .main-navigation {
+body.vantage-sticky-menu.layout-boxed .main-navigation {
   width: 100%;
   max-width: 1080px;
 }
-body.sticky-menu.mega-menu-primary.layout-boxed .site-navigation {
+body.vantage-sticky-menu.mega-menu-primary.layout-boxed .site-navigation {
   max-width: 1100px;
 }
-body.sticky-menu.mega-menu-primary.layout-full .site-navigation {
+body.vantage-sticky-menu.mega-menu-primary.layout-full .site-navigation {
   padding-left: 35px;
   padding-right: 35px;
 }
-body.sticky-menu.mega-menu-primary .site-navigation {
+body.vantage-sticky-menu.mega-menu-primary .site-navigation {
   z-index: 9999;
 }
 @media (min-width: 783px) {
-  body.sticky-menu.admin-bar .site-navigation.use-sticky-menu {
+  body.vantage-sticky-menu.admin-bar .site-navigation.use-vantage-sticky-menu {
     top: 32px;
   }
 }
 @media (max-width: 782px) and (min-width: 601px) {
-  body.sticky-menu.admin-bar .site-navigation.use-sticky-menu {
+  body.vantage-sticky-menu.admin-bar .site-navigation.use-vantage-sticky-menu {
     top: 42px;
   }
 }
-body.sticky-menu .site-navigation.sticky {
+body.vantage-sticky-menu .site-navigation.sticky {
   position: fixed;
   top: 0;
 }
-body.admin-bar:not(.sticky-menu) .site-navigation.use-sticky-menu {
+body.admin-bar:not(.vantage-sticky-menu) .site-navigation.use-vantage-sticky-menu {
   top: 0;
 }
 .main-navigation.sticky:after {
@@ -2457,8 +2457,8 @@ body.layout-full {
   }
 }
 @media (min-width: 1100px) {
-  :not(.not-default-page).page-layout-full-width-sidebar.layout-boxed .main-navigation.use-sticky-menu.sticky,
-  :not(.not-default-page).page-layout-full-width.layout-boxed .main-navigation.use-sticky-menu.sticky {
+  :not(.not-default-page).page-layout-full-width-sidebar.layout-boxed .main-navigation.use-vantage-sticky-menu.sticky,
+  :not(.not-default-page).page-layout-full-width.layout-boxed .main-navigation.use-vantage-sticky-menu.sticky {
     left: 0;
     margin: 0 auto;
     max-width: calc(100% - 40px);

style.less

@@ -5,7 +5,7 @@ Author URI: https://siteorigin.com/
 Theme URI: https://siteorigin.com/theme/vantage/
 Description: Vantage is a flexible multipurpose theme. Its strength lies in its tight integration with some powerful plugins like Page Builder for responsive page layouts, Smart Slider 3 for big beautiful sliders and WooCommerce to help you sell online. Vantage is fully responsive and retina ready. Use it to start a business site, portfolio or online store. We offer free support on our <a href="https://siteorigin.com/thread/">forum</a> (https://siteorigin.com/thread/).
 Version: dev
-Tested up to: 6.5
+Tested up to: 6.6
 Requires at least: 4.7
 Requires PHP: 5.6.20
 License: GNU General Public License v2 or later
@@ -239,7 +239,7 @@ textarea {
 	border-radius: 3px;
 	box-sizing: border-box;
 	color: #666;
-	font-weight: normal; 
+	font-weight: normal;
 	line-height: normal;
 	outline: none;
 	padding: 9px 12px;
@@ -252,7 +252,7 @@ textarea {
 }
 
 input[type="checkbox"] {
-	margin-right: 2px; 
+	margin-right: 2px;
 }
 
 select {
@@ -268,7 +268,7 @@ textarea {
 
 /* Alignment */
 
-.alignnone, 
+.alignnone,
 .aligncenter {
 	margin-bottom: 1.6em;
 }
@@ -412,7 +412,7 @@ body {
 		position: relative;
 		padding-top: 45px;
 		padding-bottom: 45px;
-		
+
 		&:not(.masthead-sidebar) {
 			gap: 25px;
 			display: flex;
@@ -560,12 +560,12 @@ body {
 	}
 }
 
-.sticky-menu #masthead.masthead-logo-in-menu img.alt-logo,
+.vantage-sticky-menu #masthead.masthead-logo-in-menu img.alt-logo,
 #masthead.masthead-logo-in-menu img.alt-logo-scroll {
 	display: none;
 }
 
-.sticky-menu #masthead.masthead-logo-in-menu img.alt-logo-scroll {
+.vantage-sticky-menu #masthead.masthead-logo-in-menu img.alt-logo-scroll {
 	display: block;
 }
 
@@ -828,7 +828,7 @@ body.responsive {
 
 /* =Menu
 ----------------------------------------------- */
-	
+
 .main-navigation {
 	background: #343538;
 	clear: both;
@@ -942,7 +942,7 @@ body.responsive {
 }
 
 /* For when the menu becomes a sticky menu */
-body.sticky-menu {
+body.vantage-sticky-menu {
 	&.layout-full .site-navigation {
 		right: 0;
 		left: 0;
@@ -970,7 +970,7 @@ body.sticky-menu {
 		}
 	}
 
-	&.admin-bar .site-navigation.use-sticky-menu {
+	&.admin-bar .site-navigation.use-vantage-sticky-menu {
 		@media (min-width: 783px) {
 			top: 32px;
 		}
@@ -986,7 +986,7 @@ body.sticky-menu {
 	}
 }
 
-body.admin-bar:not(.sticky-menu) .site-navigation.use-sticky-menu {
+body.admin-bar:not(.vantage-sticky-menu) .site-navigation.use-vantage-sticky-menu {
 	top: 0;
 }
 
@@ -2151,13 +2151,13 @@ article.page{
 		align-items: center;
 		clear: both;
 		display: flex;
-		
+
 		input {
 			line-height: 1;
 			margin-right: 7px;
 			width: auto;
 		}
-		
+
 		label {
 			display: inline-block;
 			font-weight: normal;
@@ -2225,15 +2225,15 @@ article.page{
 	#site-info {
 
 		span {
-			
+
 			&:after {
 				content: "\002d";
 				display: inline-block;
 				padding: 0 5px;
 			}
 
 			&:last-of-type {
-				
+
 				&:after {
 					content: none;
 				}