Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26251 from xristos3490/fix-wp-54-styles 

[WC4.1 RC] WP 5.3 select2 css fixes broken in WP 5.4
This commit is contained in:
Christopher Allford 2020-05-12 07:39:10 -07:00 committed by GitHub
parent 327f5fe30b 224559e73f
commit f41cb52e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/css/admin.scss
View File

@ -637,7 +637,7 @@ mark.amount {
}
}
.branch-5-3 {
.wc-wp-version-gte-53 {
.woocommerce-help-tip {
font-size: 1.2em;
@ -2167,7 +2167,7 @@ ul.wc_coupon_list_block {
}
}
.branch-5-3 {
.wc-wp-version-gte-53 {
.widefat {
@ -4123,7 +4123,7 @@ img.help_tip {
}
}
.branch-5-3 {
.wc-wp-version-gte-53 {
.woocommerce {
@ -6694,7 +6694,7 @@ table.bar_chart {
min-width: 400px !important;
}
.branch-5-3 {
.wc-wp-version-gte-53 {
.select2-results {
@ -6831,7 +6831,7 @@ table.bar_chart {
@each $name, $color in $wp_admin_colors {
&-#{$name}.branch-5-3 {
&-#{$name}.wc-wp-version-gte-53 {
.select2-dropdown {
border-color: $color;

4
assets/css/wc-setup.scss
View File

@ -1185,7 +1185,7 @@ h3.jetpack-reasons {
}
.branch-5-2,
.branch-5-3 {
.wc-wp-version-gte-53 {
.location-input {
margin: 0;
@ -1415,7 +1415,7 @@ p.jetpack-terms {
}
.branch-5-2,
.branch-5-3 {
.wc-wp-version-gte-53 {
.wc-wizard-service-setting-stripe_create_account,
.wc-wizard-service-setting-ppec_paypal_reroute_requests {

27
includes/admin/class-wc-admin.php
View File

@ -33,6 +33,9 @@ class WC_Admin {
// Disable WXR export of schedule action posts.
add_filter( 'action_scheduler_post_type_args', array( $this, 'disable_webhook_post_export' ) );
// Add body class for WP 5.3+ compatibility.
add_filter( 'admin_body_class', array( $this, 'include_admin_body_class' ) );
}
/**
@ -306,6 +309,30 @@ class WC_Admin {
$args['can_export'] = false;
return $args;
}
/**
* Include admin classes.
*
* @since 4.2.0
* @param string $classes Body classes string.
* @return string
*/
public function include_admin_body_class( $classes ) {
if ( false !== strpos( $classes, 'wc-wp-version-gte-53' ) ) {
return $classes;
}
$raw_version = get_bloginfo( 'version' );
$version_parts = explode( '-', $raw_version );
$version = count( $version_parts ) > 1 ? $version_parts[0] : $raw_version;
// Add WP 5.3+ compatibility class.
if ( $raw_version && version_compare( $version, '5.3', '>=' ) ) {
$classes .= ' wc-wp-version-gte-53';
}
return $classes;
}
}
return new WC_Admin();