From 6a97e171f54ca8a484ba1ca684aa55f00116f27f Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Tue, 12 May 2026 17:56:34 +0530 Subject: [PATCH 1/5] 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 Date: Tue, 12 May 2026 18:32:26 +0530 Subject: [PATCH 2/5] 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 Date: Fri, 15 May 2026 18:02:35 +0530 Subject: [PATCH 3/5] 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 From 5b6570dc1e122421e6a46ea67dd66d5d5b502eb0 Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Mon, 18 May 2026 15:29:11 +0530 Subject: [PATCH 4/5] fix: update button styles --- assets/apps/components/src/Controls/Sizing.js | 2 +- assets/apps/components/src/Style/_sizing.scss | 3 +++ assets/scss/wp7.scss | 22 ---------------- grunt/cssmin.js | 3 --- grunt/sass.js | 1 - inc/admin/dashboard/main.php | 6 +++++ inc/admin/hooks_upsells.php | 8 ++++++ inc/customizer/loader.php | 26 ------------------- 8 files changed, 18 insertions(+), 53 deletions(-) delete mode 100644 assets/scss/wp7.scss diff --git a/assets/apps/components/src/Controls/Sizing.js b/assets/apps/components/src/Controls/Sizing.js index d4f93546af..7e613e2b57 100755 --- a/assets/apps/components/src/Controls/Sizing.js +++ b/assets/apps/components/src/Controls/Sizing.js @@ -93,7 +93,7 @@ const SizingControl = ({ key="link-icon" icon={linked ? 'admin-links' : 'editor-unlink'} onClick={toggleLinked} - className={classnames([{ active: linked }, 'link'])} + className={classnames([{ active: linked }, 'link button'])} /> ); diff --git a/assets/apps/components/src/Style/_sizing.scss b/assets/apps/components/src/Style/_sizing.scss index 5bf966834a..4258d0bbce 100644 --- a/assets/apps/components/src/Style/_sizing.scss +++ b/assets/apps/components/src/Style/_sizing.scss @@ -37,6 +37,9 @@ border: 1px solid $input-borders !important; padding: 0; min-width: unset; + color: #000; + display: inline-flex; + align-items: center; } &.active, &.active:hover, &.active:focus:enabled { diff --git a/assets/scss/wp7.scss b/assets/scss/wp7.scss deleted file mode 100644 index b0394cf90c..0000000000 --- a/assets/scss/wp7.scss +++ /dev/null @@ -1,22 +0,0 @@ -.neve-responsive-sizing button.link { - min-height: 40px; -} - -.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; - } - } - } - - .type-neve_custom_layouts { - button .dashicons { - line-height: 1; - } - } -} \ No newline at end of file diff --git a/grunt/cssmin.js b/grunt/cssmin.js index 395049fce6..87dc22b589 100644 --- a/grunt/cssmin.js +++ b/grunt/cssmin.js @@ -51,9 +51,6 @@ 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 303e280c34..dc61f34a9e 100644 --- a/grunt/sass.js +++ b/grunt/sass.js @@ -22,7 +22,6 @@ 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/admin/dashboard/main.php b/inc/admin/dashboard/main.php index 6a11976538..58591cd25f 100755 --- a/inc/admin/dashboard/main.php +++ b/inc/admin/dashboard/main.php @@ -1057,6 +1057,12 @@ public function render_custom_layout_header() { line-height: 1.6; } + .neve_page_neve-custom-layout-upsell .cl-btn-action .dashicons, + .post-type-neve_custom_layouts .cl-btn-action .dashicons, + .post-type-neve_custom_layouts .cl-copy-button .dashicons { + line-height: 1; + } + /* Hide text on small screens but keep it accessible to screen readers */ @media (max-width: 500px) { .cl-header-btn-text { diff --git a/inc/admin/hooks_upsells.php b/inc/admin/hooks_upsells.php index acc5020437..dc48029220 100644 --- a/inc/admin/hooks_upsells.php +++ b/inc/admin/hooks_upsells.php @@ -288,6 +288,14 @@ public function render_custom_layouts_upsell_modal() { font-size: 2rem; } + .neve_page_neve-custom-layout-upsell .cl-modal-dismiss .cl-close-button { + border: none; + } + + .neve_page_neve-custom-layout-upsell .cl-modal-dismiss .cl-close-button span { + line-height: 1; + } + /* ----- HEADER / TITLE ----- */ .cl-modal-header { text-align: center; diff --git a/inc/customizer/loader.php b/inc/customizer/loader.php index d5ca9cb23b..4d6267813c 100644 --- a/inc/customizer/loader.php +++ b/inc/customizer/loader.php @@ -36,7 +36,6 @@ 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' ) ); } /** @@ -365,29 +364,4 @@ 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() { - $screen = get_current_screen(); - if ( ! $screen ) { - return; - } - - if ( $screen->id !== 'customize' && false === strpos( $screen->id, 'neve' ) ) { - return; - } - - if ( is_wp_version_compatible( '7.0' ) ) { - wp_enqueue_style( - 'neve-admin-styles', - NEVE_ASSETS_URL . 'css/wp7' . ( ( NEVE_DEBUG ) ? '' : '.min' ) . '.css', - array(), - NEVE_VERSION - ); - } - } } From f0b16601feebd17eef5323bd565e53fecfd5dcdd Mon Sep 17 00:00:00 2001 From: girishpanchal30 Date: Tue, 19 May 2026 15:01:55 +0530 Subject: [PATCH 5/5] fix: adjust height for input and buttons --- assets/apps/components/src/Controls/Sizing.js | 2 +- assets/apps/components/src/Style/_background-control.scss | 1 + assets/apps/components/src/Style/_sizing.scss | 3 --- assets/apps/customizer-controls/src/scss/_general.scss | 1 + assets/apps/customizer-controls/src/scss/_ranges.scss | 1 + 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/apps/components/src/Controls/Sizing.js b/assets/apps/components/src/Controls/Sizing.js index 7e613e2b57..d4f93546af 100755 --- a/assets/apps/components/src/Controls/Sizing.js +++ b/assets/apps/components/src/Controls/Sizing.js @@ -93,7 +93,7 @@ const SizingControl = ({ key="link-icon" icon={linked ? 'admin-links' : 'editor-unlink'} onClick={toggleLinked} - className={classnames([{ active: linked }, 'link button'])} + className={classnames([{ active: linked }, 'link'])} /> ); diff --git a/assets/apps/components/src/Style/_background-control.scss b/assets/apps/components/src/Style/_background-control.scss index 2f1f380179..41138da59f 100644 --- a/assets/apps/components/src/Style/_background-control.scss +++ b/assets/apps/components/src/Style/_background-control.scss @@ -6,6 +6,7 @@ border-radius: 0; padding-top: 0 !important; padding-bottom: 0 !important; + min-height: 30px; } .components-color-picker__inputs-toggle { diff --git a/assets/apps/components/src/Style/_sizing.scss b/assets/apps/components/src/Style/_sizing.scss index 4258d0bbce..5bf966834a 100644 --- a/assets/apps/components/src/Style/_sizing.scss +++ b/assets/apps/components/src/Style/_sizing.scss @@ -37,9 +37,6 @@ border: 1px solid $input-borders !important; padding: 0; min-width: unset; - color: #000; - display: inline-flex; - align-items: center; } &.active, &.active:hover, &.active:focus:enabled { diff --git a/assets/apps/customizer-controls/src/scss/_general.scss b/assets/apps/customizer-controls/src/scss/_general.scss index cb506ae541..8140f9f19a 100644 --- a/assets/apps/customizer-controls/src/scss/_general.scss +++ b/assets/apps/customizer-controls/src/scss/_general.scss @@ -23,6 +23,7 @@ input[type=number] { padding-right: 0; + min-height: 30px; } button.reset { diff --git a/assets/apps/customizer-controls/src/scss/_ranges.scss b/assets/apps/customizer-controls/src/scss/_ranges.scss index 27c7c6c157..c55ad507e0 100644 --- a/assets/apps/customizer-controls/src/scss/_ranges.scss +++ b/assets/apps/customizer-controls/src/scss/_ranges.scss @@ -14,6 +14,7 @@ width: auto; max-width: 100%; padding-right: 0; + min-height: 30px; } .components-range-control {