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

Shipping Settings: revert refresh styles (#42738)

This commit is contained in:
Paul Sealock 2023-12-19 23:42:21 +13:00 committed by GitHub
parent c651b10b3d
commit 23f44c0484
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/woocommerce-admin/client/wp-admin-scripts/shipping-settings-region-picker/region-picker.js
View File

@ -21,7 +21,6 @@ export const RegionPicker = ( { options, initialValues } ) => {
placeholder="Start typing to filter zones"
selectAllLabel="Select all countries"
individuallySelectParent
clearOnSelect={ false }
maxVisibleTags={ 5 }
/>
);

4
plugins/woocommerce/changelog/42738-revert-shipping-settings-refresh-styles Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: fix
Revert styles on Shipping Settings that depart from existing styles.

67
plugins/woocommerce/client/legacy/css/admin.scss
View File

@ -4044,6 +4044,7 @@ table.wc_shipping {
.wc-shipping-zone-settings {
#zone_name {
width: 600px;
padding: 2px 8px;
}
th {
@ -4082,7 +4083,6 @@ table.wc_shipping {
margin: 0.5em 0 0;
text-decoration: underline;
display: block;
font-family: $font-sf-pro-text;
font-size: 13px;
font-weight: 400;
line-height: 16px;
@ -4103,7 +4103,6 @@ table.wc_shipping {
}
.description {
font-family: $font-sf-pro-text;
font-size: 13px;
font-weight: 400;
line-height: 18px;
@ -4449,8 +4448,7 @@ table {
display: flex;
align-items: center;
.button-primary {
display: inline-block;
.page-title-action {
margin: 0 12px;
}
}
@ -4460,7 +4458,6 @@ table {
}
.wc-shipping-zone-heading-help-text {
font-family: $font-sf-pro-text;
color: #3C434A;
font-size: 13px;
font-style: normal;
@ -4469,7 +4466,6 @@ table {
}
.wc-shipping-zone-help-text {
font-family: $font-sf-pro-text;
color: #3C434A;
font-size: 12px;
font-style: normal;
@ -4477,23 +4473,24 @@ table {
line-height: 17px;
}
#wc-shipping-zone-region-picker-root .woocommerce-tree-select-control .components-base-control {
padding: 2px 8px;
border-radius: 4px;
.woocommerce-tree-select-control__control-input {
font-size: 14px;
}
}
table.wc-shipping-zones,
table.wc-shipping-zone-methods,
table.wc-shipping-classes {
font-family: $font-sf-pro-text;
font-size: 14px;
font-weight: 400;
line-height: 20px;
color: #000000;
&.widefat p {
color: #000000;
}
thead tr th {
color: #646970;
vertical-align: middle;
padding: 12px;
padding: 1em;
font-weight: 600;
}
tbody tr td {
@ -4506,8 +4503,6 @@ table.wc-shipping-classes {
tfoot tr td {
padding: 24px 12px;
background-color: #F6F7F7;
color: #000000;
vertical-align: top;
&:last-child {
@ -4517,13 +4512,8 @@ table.wc-shipping-classes {
td,
th {
background: #fff;
display: table-cell !important;
font-family: $font-sf-pro-text;
font-size: 14px;
font-weight: 400;
line-height: 20px;
color: #000000;
vertical-align: middle;
padding: 24px 12px;
@ -4543,6 +4533,18 @@ table.wc-shipping-classes {
}
}
.wc-shipping-zone-rows,
.wc-shipping-zone-method-rows,
.wc-shipping-class-rows {
tr:nth-child(even) td {
background: #f9f9f9;
}
}
.wc-shipping-zone-rows-tfoot .even td {
background: #f9f9f9;
}
td.wc-shipping-zones-blank-state,
td.wc-shipping-zone-method-blank-state {
overflow: hidden;
@ -4603,16 +4605,6 @@ table.wc-shipping-classes {
}
tbody.wc-shipping-tables-tbody {
td {
border-top: 1px solid #C3C4C7;
}
tr:first-child {
td {
border-top: 0;
}
}
.wc-shipping-zone-name,
.wc-shipping-zone-method-title,
.wc-shipping-class-name {
@ -4684,12 +4676,7 @@ table.wc-shipping-classes {
a.wc-shipping-zone-actions,
a.wc-shipping-zone-actions:hover {
color: #D63638;
}
a.wc-shipping-zone-action-edit,
a.wc-shipping-zone-action-edit:hover {
color: #0675C4;
color: var(--wc-red);
}
}
@ -4711,8 +4698,6 @@ table.wc-shipping-classes {
}
td.wc-shipping-zone-methods {
color: #555;
.method_disabled {
text-decoration: line-through;
}

9
plugins/woocommerce/client/legacy/js/admin/wc-shipping-zones.js
View File

@ -136,11 +136,14 @@
$tr.find( '.wc-shipping-zone-delete' ).on( 'click', { view: this }, this.onDeleteRow );
},
initRows: function() {
const isEven = 0 !== ( $( 'tbody.wc-shipping-zone-rows tr' ).length % 2 );
const tfoot = $( 'tfoot.wc-shipping-zone-rows-tfoot' );
// Stripe
if ( 0 === ( $( 'tbody.wc-shipping-zone-rows tr' ).length % 2 ) ) {
$table.find( 'tbody.wc-shipping-zone-rows' ).next( 'tbody' ).find( 'tr' ).addClass( 'odd' );
if ( isEven ) {
tfoot.find( 'tr' ).addClass( 'even' );
} else {
$table.find( 'tbody.wc-shipping-zone-rows' ).next( 'tbody' ).find( 'tr' ).removeClass( 'odd' );
tfoot.find( 'tr' ).removeClass( 'even' );
}
// Tooltips
$( '#tiptip_holder' ).removeAttr( 'style' );

2
plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-classes.php
View File

@ -13,7 +13,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<h2 class="wc-shipping-zones-heading">
<span><?php esc_html_e( 'Shipping classes', 'woocommerce' ); ?></span>
<a class="button button-primary wc-shipping-class-add-new" href="#"><?php esc_html_e( 'Add shipping class', 'woocommerce' ); ?></a>
<a class="page-title-action wc-shipping-class-add-new" href="#"><?php esc_html_e( 'Add shipping class', 'woocommerce' ); ?></a>
</h2>
<p class="wc-shipping-zone-help-text">

2
plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
View File

@ -98,7 +98,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<script type="text/html" id="tmpl-wc-shipping-zone-method-row-blank">
<tr>
<td class="wc-shipping-zone-method-blank-state" colspan="4">
<td class="wc-shipping-zone-method-blank-state" colspan="5">
<p><?php esc_html_e( 'You can add multiple shipping methods within this zone. Only customers within the zone will see them.', 'woocommerce' ); ?></p>
</td>
</tr>

6
plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
View File

@ -6,7 +6,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<h2 class="wc-shipping-zones-heading">
<span><?php esc_html_e( 'Shipping zones', 'woocommerce' ); ?></span>
<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping&zone_id=new' ) ); ?>" class="button-primary"><?php esc_html_e( 'Add zone', 'woocommerce' ); ?></a>
<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping&zone_id=new' ) ); ?>" class="page-title-action"><?php esc_html_e( 'Add zone', 'woocommerce' ); ?></a>
</h2>
<p class="wc-shipping-zone-heading-help-text"><?php echo esc_html_e( 'A shipping zone consists of the region(s) you\'d like to ship to and the shipping method(s) offered. A shopper can only be matched to one zone, and we\'ll use their shipping address to show them the methods available in their area.', 'woocommerce' ); ?></p>
<table class="wc-shipping-zones widefat">
@ -21,7 +21,7 @@ if ( ! defined( 'ABSPATH' ) ) {
</thead>
<tbody class="wc-shipping-zone-rows wc-shipping-tables-tbody"></tbody>
<tfoot data-id="0" class="wc-shipping-zone-worldwide">
<tfoot data-id="0" class="wc-shipping-zone-worldwide wc-shipping-zone-rows-tfoot">
<td width="1%" class="wc-shipping-zone-worldwide"></td>
<td class="wc-shipping-zone-name">
<?php esc_html_e( 'Rest of the world', 'woocommerce' ); ?>
@ -55,7 +55,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<script type="text/html" id="tmpl-wc-shipping-zone-row-blank">
<?php if ( 0 === $method_count ) : ?>
<tr>
<td class="wc-shipping-zones-blank-state" colspan="4">
<td class="wc-shipping-zones-blank-state" colspan="5">
<p class="main"><?php _e( 'A shipping zone is a geographic region where a certain set of shipping methods and rates apply.', 'woocommerce' ); ?></p>
<p><?php _e( 'For example:', 'woocommerce' ); ?></p>
<ul>