From 6021e78cdc08d801bc720a39ca650207c604f993 Mon Sep 17 00:00:00 2001
From: Paul Sealock <psealock@gmail.com>
Date: Tue, 31 Oct 2023 11:19:40 +1300
Subject: [PATCH] Shipping Settings: Handle theme colors (#41054)

* Fix primary btns colors

* go back to var(--wp-admin-theme-color)

* Add changefile(s) from automation for the following project(s): woocommerce

---------

Co-authored-by: github-actions <github-actions@github.com>
---
 .../fix-shipping-settings-theme-color         |  4 ++++
 .../woocommerce/client/legacy/css/admin.scss  | 22 +++----------------
 .../html-admin-page-shipping-classes.php      |  2 +-
 .../views/html-admin-page-shipping-zones.php  |  2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)
 create mode 100644 plugins/woocommerce/changelog/fix-shipping-settings-theme-color

diff --git a/plugins/woocommerce/changelog/fix-shipping-settings-theme-color b/plugins/woocommerce/changelog/fix-shipping-settings-theme-color
new file mode 100644
index 00000000000..d98668040be
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-shipping-settings-theme-color
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+Comment: Fixes unreleased issue with theme colors
+
diff --git a/plugins/woocommerce/client/legacy/css/admin.scss b/plugins/woocommerce/client/legacy/css/admin.scss
index 041802f79d4..9559728bb27 100644
--- a/plugins/woocommerce/client/legacy/css/admin.scss
+++ b/plugins/woocommerce/client/legacy/css/admin.scss
@@ -4036,23 +4036,6 @@ table.wc_shipping {
 	line-height: 16px;
 	color: #1e1e1e;
 
-	.button-primary,
-	.button-primary:hover,
-	.button-primary:focus {
-		background-color: #3858E9;
-		border-radius: 2px;
-		color: #FFFFFF;
-		border-color: #3858e9
-	}
-	.button-primary:focus {
-		box-shadow: 0 0 0 1px #fff, 0 0 0 3px #3858E9;
-	}
-	.button-primary.disabled {
-		background-color: #3858E9 !important;
-		border-color: #3858E9 !important;
-		color: #8494EC !important;
-	}
-
 	&.wc-backbone-modal .wc-backbone-modal-content {
 		border-radius: 8px;
 		border-top: 8px solid transparent;
@@ -4143,7 +4126,7 @@ table.wc_shipping {
 			width: 1px;
 
 			&:checked + label {
-				outline: 2px solid #3858E9;
+				outline: 2px solid var(--wp-admin-theme-color);
 
 				.dashicons-yes {
 					display: block;
@@ -4346,8 +4329,9 @@ table {
 
 .wc-shipping-zones-heading {
 	display: flex;
+	align-items: center;
 
-	.page-title-action {
+	.button-primary {
 		display: inline-block;
 		margin: 0 12px;
 	}
diff --git a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-classes.php b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-classes.php
index 905f2566d6c..a1301333331 100644
--- a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-classes.php
+++ b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-classes.php
@@ -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 page-title-action" href="#"><?php esc_html_e( 'Add shipping class', 'woocommerce' ); ?></a>
+	<a class="button button-primary wc-shipping-class-add-new" href="#"><?php esc_html_e( 'Add shipping class', 'woocommerce' ); ?></a>
 </h2>
 
 <p class="wc-shipping-zone-help-text">
diff --git a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
index 26985b774af..6d11704c9f9 100644
--- a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
+++ b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
@@ -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="page-title-action 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="button-primary"><?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 one or more regions you\'d like to ship to and the shipping method(s) offered. We\'ll use your customer\'s shipping address to show them available shipping methods in their area.', 'woocommerce' ) . ' ' . esc_html_e( 'WooCommerce will match a customer to a single zone using their shipping address and present the shipping methods within that zone to them.', 'woocommerce' ); ?></p>
 <table class="wc-shipping-zones widefat">