fixed page sidebar issue

davy440 · May 9, 2024 · ce711d0 · ce711d0
1 parent 0a1fa03
commit ce711d0
Show file tree

Hide file tree

Showing 22 changed files with 17,882 additions and 17,447 deletions.
diff --git a/README.md b/README.md
@@ -144,5 +144,7 @@ Just Install the Theme from the WordPress Repository.
 * v2.5.2
 	Code Sorting and Bug Fixes
 
+* v2.5.3
+	Fixed Page Sidebar issue
 
 Good luck!
diff --git a/assets/cache/google-web-fonts.txt b/assets/cache/google-web-fonts.txt
diff --git a/assets/js/min/bigSlide.min.js b/assets/js/min/bigSlide.min.js
diff --git a/assets/js/min/color-alpha.min.js b/assets/js/min/color-alpha.min.js
diff --git a/assets/js/min/custom.min.js b/assets/js/min/custom.min.js
diff --git a/assets/js/min/customize_controls.min.js b/assets/js/min/customize_controls.min.js
diff --git a/assets/js/min/customizer.min.js b/assets/js/min/customizer.min.js
diff --git a/assets/js/min/dismiss-notice.min.js b/assets/js/min/dismiss-notice.min.js
diff --git a/assets/js/min/jquery.min.js b/assets/js/min/jquery.min.js
diff --git a/assets/js/min/navigation.min.js b/assets/js/min/navigation.min.js
diff --git a/assets/js/min/owl.min.js b/assets/js/min/owl.min.js
diff --git a/assets/js/min/plugins-install.min.js b/assets/js/min/plugins-install.min.js
diff --git a/assets/js/min/property-map.min.js b/assets/js/min/property-map.min.js
diff --git a/assets/js/min/property.min.js b/assets/js/min/property.min.js
diff --git a/assets/js/min/typography.min.js b/assets/js/min/typography.min.js
diff --git a/functions.php b/functions.php
@@ -9,7 +9,7 @@
 
 if ( ! defined( 'ITRE_VERSION' ) ) {
 	// Replace the version number of the theme on each release.
-	define( 'ITRE_VERSION', '2.5.2' );
+	define( 'ITRE_VERSION', '2.5.3' );
 }
 
 /**

diff --git a/inc/css-mods.php b/inc/css-mods.php
@@ -57,7 +57,8 @@ function itre_custom_css() {
                 $css .= 'body.post-type-archive-property #secondary, body.tax-location  #secondary, body.tax-property-type #secondary {width: ' . $secondary_width . ';}';
             }
 
-            if (!is_front_page() && is_page() && is_active_sidebar('sidebar-page') && get_post_meta(get_the_ID(), 'enable-sidebar', true) !== '' ) {
+
+            if (!is_front_page() && is_page() && is_active_sidebar('sidebar-blog') && get_post_meta(get_the_ID(), 'enable-sidebar', true) !== '' ) {
                 $css .= 'body.page-template-default #primary {width: ' . $primary_width . ';}';
                 $css .= 'body.page-template-default #secondary {width: ' . $secondary_width . ';}';
             }

diff --git a/inc/template-functions.php b/inc/template-functions.php
@@ -19,7 +19,8 @@ function itre_body_classes( $classes ) {
 		}
 
 		// Adds a class of no-sidebar when there is no sidebar present.
-		if ( is_home() && is_active_sidebar( 'sidebar-blog' ) && !empty(get_theme_mod('itre_blog_sidebar_enable', '') ) ) {
+		if ( ( is_home() && is_active_sidebar( 'sidebar-blog' ) && !empty(get_theme_mod('itre_blog_sidebar_enable', '') ) ) ||
+			!is_front_page() && is_page() && is_active_sidebar( 'sidebar-blog' ) && get_post_meta( get_the_ID(), 'enable-sidebar', true ) ) {
 			$classes[] = 'has-sidebar';
 		}
 
@@ -52,7 +53,7 @@ function itre_get_header() {
 	function itre_get_top_bar() {
 		?>
 		<div class="container-lg">
-			<div class="d-flex align-items-center">
+			<div class="d-flex align-items-center gap-3">
 
 				<div class="branding-wrapper col-7 col-sm-5 col-lg-3">
 					<?php get_template_part('framework/sections/header/modules/site', 'branding'); ?>
@@ -236,8 +237,7 @@ function itre_get_sidebar( $template ) {
 				if	( is_page() &&
 				!is_front_page() &&
 				'' !== get_post_meta($post->ID, 'enable-sidebar', true) ) {
-
-					get_sidebar('null', ['page'	=>	'page']);
+					get_sidebar('null', ['page'	=>	'']);
 				}
 			break;
 		    default: