Skip to content

Make layout compatible with wp7.0 #4497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
girishpanchal30 wants to merge 3 commits into
base: development
Choose a base branch
from
+52 −0
Open

Make layout compatible with wp7.0 #4497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a97e17
fix: make layout compatible with wp7.0
girishpanchal30 May 12, 2026
3684b12
fix: enhance admin styles loading
girishpanchal30 May 12, 2026
ec21ec6
fix: adjust button styles for custom layouts
girishpanchal30 May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions assets/scss/wp7.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.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;
}
}
}
Comment on lines +1 to +22
Copy link
Copy Markdown
Contributor

@Soare-Robert-Daniel Soare-Robert-Daniel May 15, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure about those changes since you are practically reverting the core styles of .wp-core-ui WP 7.0 at a general level.

I will suggest working with a targeted selector. @abaicus @HardeepAsrani, if you have some feedback about this.

Copy link
Copy Markdown
Contributor Author

@girishpanchal30 girishpanchal30 May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Soare-Robert-Daniel, I have implemented as you suggested with the latest commit. Please check it and let me know if any changes are needed.

Copy link
Copy Markdown
Contributor

@Soare-Robert-Daniel Soare-Robert-Daniel May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new selectors look nice. We still have a problem since this change is loaded as an extra file. I do not think I saw this before, and not sure if it is a good pattern.

The current CSS, I think, can go directly into the main CSS files

Copy link
Copy Markdown
Contributor Author

@girishpanchal30 girishpanchal30 May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current CSS, I think, can go directly into the main CSS files

For the button styles, we can go with what you suggested. However, the input field height has also been updated to 40px in WP 7.x. Because of that, the buttons in the Customizer for WP 6.x look like this:

image

Copy link
Copy Markdown
Contributor

@Soare-Robert-Daniel Soare-Robert-Daniel May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That 40px is a good point. Another version that I am thinking will be to add a special class on the component based on the WP version and some CSS based on it, like some sort of versioning:
CleanShot 2026-05-15 at 17 47 20@2x

But a separate file might be simpler. @abaicus @HardeepAsrani, what do you think?

Copy link
Copy Markdown
Collaborator

@abaicus abaicus May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Soare-Robert-Daniel Any reason to not set the size straight in the button? Why would we add classes based on version and overcomplicate things?

3 changes: 3 additions & 0 deletions grunt/cssmin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
},
},
};
1 change: 1 addition & 0 deletions grunt/sass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
],
},
Expand Down
26 changes: 26 additions & 0 deletions inc/customizer/loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ) );
}

/**
Expand Down Expand Up @@ -364,4 +365,29 @@ 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
);
Comment thread
girishpanchal30 marked this conversation as resolved.
}
}
}
Loading