From 6a97e171f54ca8a484ba1ca684aa55f00116f27f Mon Sep 17 00:00:00 2001
From: girishpanchal30 <girish@krishaweb.com>
Date: Tue, 12 May 2026 17:56:34 +0530
Subject: [PATCH 1/3] fix: make layout compatible with wp7.0

---
 assets/scss/wp7.scss      | 14 ++++++++++++++
 grunt/cssmin.js           |  3 +++
 grunt/sass.js             |  1 +
 inc/customizer/loader.php | 19 +++++++++++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 assets/scss/wp7.scss

diff --git a/assets/scss/wp7.scss b/assets/scss/wp7.scss
new file mode 100644
index 0000000000..a0bd42460c
--- /dev/null
+++ b/assets/scss/wp7.scss
@@ -0,0 +1,14 @@
+.neve-responsive-sizing button.link {
+    min-height: 40px;
+}
+
+.wp-core-ui .button .dashicons,
+.wp-core-ui .button-primary .dashicons,
+.wp-core-ui .button-secondary .dashicons {
+    line-height: 1;
+}
+
+.wp-core-ui .button-link,
+.wp-core-ui .button.button-link {
+    border: none;
+}
\ No newline at end of file
diff --git a/grunt/cssmin.js b/grunt/cssmin.js
index 87dc22b589..395049fce6 100644
--- a/grunt/cssmin.js
+++ b/grunt/cssmin.js
@@ -51,6 +51,9 @@ module.exports = {
 			'assets/css/easy-digital-downloads-rtl.min.css': [
 				'assets/css/easy-digital-downloads-rtl.css',
 			],
+			'assets/css/wp7.min.css': [
+				'assets/css/wp7.css',
+			],
 		},
 	},
 };
diff --git a/grunt/sass.js b/grunt/sass.js
index dc61f34a9e..303e280c34 100644
--- a/grunt/sass.js
+++ b/grunt/sass.js
@@ -22,6 +22,7 @@ module.exports = {
 					'assets/scss/gutenberg-editor-style.scss',
 				'assets/css/easy-digital-downloads.css':
 					'assets/scss/easy-digital-downloads.scss',
+				'assets/css/wp7.css': 'assets/scss/wp7.scss',
 			},
 		],
 	},
diff --git a/inc/customizer/loader.php b/inc/customizer/loader.php
index 4d6267813c..8b7d35457a 100644
--- a/inc/customizer/loader.php
+++ b/inc/customizer/loader.php
@@ -36,6 +36,7 @@ public function __construct() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'set_featured_image' ) );
 		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_customizer_controls' ) );
 		add_action( 'wp_ajax_neve_dismiss_starter_content', array( $this, 'dismiss_starter_content' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
 	}
 
 	/**
@@ -364,4 +365,22 @@ public function get_black_friday_data() {
 			'bannerSrc' => get_template_directory_uri() . '/assets/img/dashboard/black-friday-customizer-banner.png',
 		);
 	}
+
+	/**
+	 * Enqueue admin styles.
+	 *
+	 * @return void
+	 */
+	public function enqueue_admin_styles() {
+		global $wp_version;
+
+		if ( version_compare( $wp_version, '6.9.4', '>' ) ) {
+			wp_enqueue_style(
+				'neve-admin-styles',
+				NEVE_ASSETS_URL . 'css/wp7' . ( ( NEVE_DEBUG ) ? '' : '.min' ) . '.css',
+				array(),
+				NEVE_VERSION
+			);
+		}
+	}
 }

From 3684b12eb1fb1b025af0feb162e60a6b1bb98b76 Mon Sep 17 00:00:00 2001
From: girishpanchal30 <girish@krishaweb.com>
Date: Tue, 12 May 2026 18:32:26 +0530
Subject: [PATCH 2/3] fix: enhance admin styles loading

---
 inc/customizer/loader.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/inc/customizer/loader.php b/inc/customizer/loader.php
index 8b7d35457a..d5ca9cb23b 100644
--- a/inc/customizer/loader.php
+++ b/inc/customizer/loader.php
@@ -372,9 +372,16 @@ public function get_black_friday_data() {
 	 * @return void
 	 */
 	public function enqueue_admin_styles() {
-		global $wp_version;
+		$screen = get_current_screen();
+		if ( ! $screen ) {
+			return;
+		}
+
+		if ( $screen->id !== 'customize' && false === strpos( $screen->id, 'neve' ) ) {
+			return;
+		}
 
-		if ( version_compare( $wp_version, '6.9.4', '>' ) ) {
+		if ( is_wp_version_compatible( '7.0' ) ) {
 			wp_enqueue_style(
 				'neve-admin-styles',
 				NEVE_ASSETS_URL . 'css/wp7' . ( ( NEVE_DEBUG ) ? '' : '.min' ) . '.css',

From ec21ec673c69528f7cfaa3e724072cc8cf694630 Mon Sep 17 00:00:00 2001
From: girishpanchal30 <girish@krishaweb.com>
Date: Fri, 15 May 2026 18:02:35 +0530
Subject: [PATCH 3/3] fix: adjust button styles for custom layouts

---
 assets/scss/wp7.scss | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/assets/scss/wp7.scss b/assets/scss/wp7.scss
index a0bd42460c..b0394cf90c 100644
--- a/assets/scss/wp7.scss
+++ b/assets/scss/wp7.scss
@@ -2,13 +2,21 @@
     min-height: 40px;
 }
 
-.wp-core-ui .button .dashicons,
-.wp-core-ui .button-primary .dashicons,
-.wp-core-ui .button-secondary .dashicons {
-    line-height: 1;
-}
+.neve_page_neve-custom-layout-upsell, .post-type-neve_custom_layouts {
+    .cl-modal, .cl-header-container {
+        .button {
+            .dashicons {
+                line-height: 1;
+            }
+            &.button-link {
+                border: none;
+            }
+        }
+    }
 
-.wp-core-ui .button-link,
-.wp-core-ui .button.button-link {
-    border: none;
+    .type-neve_custom_layouts {
+        button .dashicons {
+            line-height: 1;
+        }
+    }
 }
\ No newline at end of file