Commit de689657f31 for woocommerce

commit de689657f31bc4fc11fa6f2bfaa039406fd6b626
Author: Albert Juhé Lluveras <contact@albertjuhe.com>
Date:   Wed Apr 29 09:53:17 2026 +0200

    Unify admin modal styles (#64265)

    * Unify modals styles

    * More improvements

    * Add changelog

    * More cleanup

    * Update PHPStan baseline

    * Small fixes

    * Fix typo in changelog

    * Improve mobile styles

    * Use same semantics as in other modals

    * Remove some more CSS from shippings modal

    * Unify modal buttons spacing

    * Fix shipping modal padding

    * Strengthen full-screen responsive modal

    * Change post-rebase

    * Refactor mobile styles for WooCommerce modal, ensuring border-radius is reset on mobile.

    * Update padding for WooCommerce modal to use dynamic calculation for better responsiveness

    * Further cleanup

    * Fix padding-bottom rule

diff --git a/plugins/woocommerce/changelog/update-create-term-modal-ii b/plugins/woocommerce/changelog/update-create-term-modal-ii
new file mode 100644
index 00000000000..7327ef738a3
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-create-term-modal-ii
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Update admin modal styles to keep them more consistent
diff --git a/plugins/woocommerce/client/admin/client/layout/style.scss b/plugins/woocommerce/client/admin/client/layout/style.scss
index bd586b49ae4..ba89b66bf7f 100644
--- a/plugins/woocommerce/client/admin/client/layout/style.scss
+++ b/plugins/woocommerce/client/admin/client/layout/style.scss
@@ -156,39 +156,6 @@
 	display: none;
 }

-.components-modal__frame.woocommerce-usage-modal {
-	width: 600px;
-	max-width: 100%;
-
-	.components-modal__header {
-		margin-bottom: 0;
-	}
-
-	.woocommerce-usage-modal__wrapper {
-		flex-grow: 1;
-		display: flex;
-		flex-direction: column;
-
-		a {
-			color: $studio-gray-60;
-		}
-
-		button.is-primary {
-			align-self: flex-end;
-		}
-	}
-
-	.woocommerce-usage-modal__actions {
-		display: flex;
-		justify-content: flex-end;
-		margin-top: $gap;
-
-		button {
-			margin-left: $gap;
-		}
-	}
-}
-
 .woocommerce-payments__usage-modal {
 	.components-modal__header {
 		height: auto;
diff --git a/plugins/woocommerce/client/legacy/css/admin.scss b/plugins/woocommerce/client/legacy/css/admin.scss
index 8ba16c13156..931440c62eb 100644
--- a/plugins/woocommerce/client/legacy/css/admin.scss
+++ b/plugins/woocommerce/client/legacy/css/admin.scss
@@ -975,27 +975,31 @@ $font-sf-pro-display: "SF Pro Text", -apple-system, BlinkMacSystemFont, "Segoe U
 	}
 }

-.woocommerce-set-price-variations {
-	.woocommerce-usage-modal__wrapper {
-		.woocommerce-usage-modal__message {
-			height: 60px;
-			flex-wrap: wrap;
-			display: flex;
-			> span {
-				padding-bottom: 16px;
-			}
-		}
-		.woocommerce-usage-modal__actions {
-			display: flex;
-			justify-content: flex-end;
-			margin-top: 20px;
-			> button {
-				margin-left: 16px;
-				width: auto;
-				display: unset;
-			}
+/**
+ * Product editor modals
+ */
+.wc-backbone-modal-set-price-variations.wc-backbone-modal,
+.wc-backbone-modal-add-attribute-term.wc-backbone-modal {
+	@media screen and (min-width: 783px) {
+		.wc-backbone-modal-content {
+			max-width: 400px;
+			min-width: auto;
+			width: 100%;
 		}
 	}
+
+	article {
+		padding-bottom: 2em;
+	}
+
+	input[type="text"] {
+		display: block;
+		font-size: 13px;
+		line-height: 16px;
+		margin: 6px 0;
+		padding: 12px;
+		width: 100%;
+	}
 }

 /**
@@ -2258,6 +2262,8 @@ ul.wc_coupon_list_block {
 }

 #woocommerce-order-items .woocommerce_order_items_wrapper, .wc-order-preview-table-wrapper {
+	padding-bottom: 1.5em;
+
 	small.refunded {
 		display: block;
 		color: red;
@@ -3267,9 +3273,15 @@ ul.wc_coupon_list_block {

 		td:first-child,
 		th:first-child {
+			padding-left: 2em;
 			text-align: left;
 		}

+		td:last-child,
+		th:last-child {
+			padding-right: 2em;
+		}
+
 		th {
 			border-color: #ccc;
 		}
@@ -3301,7 +3313,7 @@ ul.wc_coupon_list_block {

 	.wc-order-preview-addresses {
 		overflow: hidden;
-		padding-bottom: 1.5em;
+		padding: 0 0.5em 1.5em;

 		.wc-order-preview-address,
 		.wc-order-preview-note {
@@ -3327,15 +3339,8 @@ ul.wc_coupon_list_block {
 	}

 	footer {
-		.wc-action-button-group {
-			display: inline-block;
-			float: left;
-		}
-
 		.button.button-large {
 			margin-left: 10px;
-			padding: 0 10px !important;
-			line-height: 28px;
 			height: auto;
 			display: inline-block;
 		}
@@ -3347,31 +3352,10 @@ ul.wc_coupon_list_block {
 }

 .wc-action-button-group {
-	vertical-align: middle;
-	line-height: 26px;
-	text-align: left;
-
-	label {
-		margin-right: 6px;
-		cursor: default;
-		font-weight: bold;
-		line-height: 28px;
-	}
-
-	.wc-action-button-group__items {
-		display: inline-flex;
-		flex-flow: row wrap;
-		align-content: flex-start;
-		justify-content: flex-start;
-	}
-
 	.wc-action-button {
 		margin: 0 0 0 -1px !important;
 		border: 1px solid #ccc;
-		padding: 0 10px !important;
 		border-radius: 0 !important;
-		float: none;
-		line-height: 28px;
 		height: auto;
 		z-index: 1;
 		position: relative;
@@ -3406,26 +3390,6 @@ ul.wc_coupon_list_block {
 		display: none;
 	}

-	.wc-order-preview footer {
-		.wc-action-button-group .wc-action-button-group__items {
-			display: flex;
-		}
-
-		.wc-action-button-group {
-			float: none;
-			display: block;
-			margin-bottom: 4px;
-		}
-
-		.button.button-large {
-			width: 100%;
-			float: none;
-			text-align: center;
-			margin: 0;
-			display: block;
-		}
-	}
-
 	.woocommerce_page_wc-orders .wc-orders-list-table.wp-list-table,
 	.post-type-shop_order .wp-list-table {
 		.check-column {
@@ -4261,66 +4225,19 @@ table.wc_shipping {
 /**
 * New Shipping Settings Refresh Modal Styles
 **/
-.wc-backbone-modal-add-attribute-term,
 .wc-backbone-modal-add-shipping-method,
 .wc-backbone-modal-shipping-method-settings,
 .wc-shipping-class-modal {
-	font-size: 13px;
-	font-weight: 400;
-	line-height: 16px;
-	color: #1e1e1e;
-
 	&.wc-backbone-modal .wc-backbone-modal-content {
-		border-radius: var(--wc-card-border-radius, 8px);
-		border-top: 8px solid transparent;
-		border-bottom: 8px solid transparent;
 		max-width: 600px;
-
-		@media screen and (max-width: 782px) {
-			border-radius: none;
-			border-top: none;
-			border-bottom: none;
-		}
-	}
-
-	.wc-backbone-modal-main article {
-		padding: 0 32px 32px 32px;
-	}
-
-	.wc-backbone-modal-main header{
-		padding: 20px 32px;
-	}
-
-	.wc-backbone-modal-main footer {
-		padding: 20px 32px 12px 32px;
 	}

 	.wc-backbone-modal-main .wc-backbone-modal-header h1 {
 		font-weight: 400;
 	}

-	.wc-backbone-modal-main .wc-backbone-modal-header {
-		background-color: #fff;
-		border-bottom: none;
-		font-size: 20px;
-		line-height: 28px;
-
-		.modal-close-link {
-			border-left: none;
-
-			&:hover {
-				background-color: #fff;
-			}
-		}
-	}
 	.wc-backbone-modal-main footer {
-		box-shadow: none;
-		border-top: 1px solid #E0E0E0;
-		background-color: #fff;
-
 		.inner {
-			display: flex;
-			justify-content: space-between;
 			flex-direction: row-reverse;
 		}

@@ -4402,7 +4319,6 @@ table.wc_shipping {
 		}
 	}

-	.wc-add-attribute-term-fields,
 	.wc-shipping-zone-method-fields {

 		& > label {
@@ -4536,30 +4452,6 @@ table.wc_shipping {
 	}
 }

-.wc-backbone-modal-add-attribute-term.wc-backbone-modal {
-	.wc-backbone-modal-content {
-		min-width: auto;
-		max-width: 400px;
-	}
-
-	input[type="text"] {
-		display: block;
-		font-size: 13px;
-		line-height: 16px;
-		margin: 6px 0;
-		padding: 12px;
-		width: 100%;
-	}
-
-	.wc-backbone-modal-main footer {
-		border-top: none;
-	}
-}
-
-.wc-backbone-modal-add-shipping-method .wc-backbone-modal-main article {
-	padding: 0 32px 50px 32px;
-}
-
 table {
 	tr,
 	tr:hover {
@@ -7882,6 +7774,7 @@ table.bar_chart {
 	}

 	.wc-backbone-modal-content {
+		border-radius: var(--wc-card-border-radius, 8px);
 		position: fixed;
 		background: #fff;
 		z-index: 100000;
@@ -7897,10 +7790,6 @@ table.bar_chart {
 		}
 	}

-	&.wc-backbone-modal-shipping-method-settings .wc-backbone-modal-content {
-		min-width: 500px;
-	}
-
 	&.wc-backbone-modal-add-shipping-method .wc-backbone-modal-content article {
 		min-height: 180px
 	}
@@ -7910,14 +7799,6 @@ table.bar_chart {
 	}
 }

-@media screen and (max-width: 782px) {
-	.wc-backbone-modal .wc-backbone-modal-content {
-		width: 100%;
-		height: 100%;
-		min-width: 100%;
-	}
-}
-
 .wc-backbone-modal-backdrop {
 	position: fixed;
 	top: 0;
@@ -7931,7 +7812,7 @@ table.bar_chart {
 }

 .wc-backbone-modal-main {
-	padding-bottom: 55px;
+	padding-bottom: calc( 1.5rem + 40px );

 	header,
 	article {
@@ -7941,18 +7822,17 @@ table.bar_chart {

 	.wc-backbone-modal-header {
 		height: auto;
-		background: #fcfcfc;
-		padding: 1em 1.5em;
-		border-bottom: 1px solid #ddd;
+		padding: 1.25em 2em 1em;

 		h1 {
 			margin: 0;
 			font-size: 18px;
-			font-weight: 700;
+			font-weight: 400;
 			line-height: 1.5em;
 		}

 		.modal-close-link {
+			border-radius: 0 var(--wc-card-border-radius, 8px) 0 0;
 			cursor: pointer;
 			color: #777;
 			height: 54px;
@@ -7963,7 +7843,6 @@ table.bar_chart {
 			right: 0;
 			text-align: center;
 			border: 0;
-			border-left: 1px solid #ddd;
 			background-color: transparent;
 			transition: color 0.1s ease-in-out, background 0.1s ease-in-out;

@@ -7989,7 +7868,7 @@ table.bar_chart {
 	}

 	article {
-		padding: 1.5em;
+		padding: 1em 2em 1.5em;

 		p {
 			margin: 1.5em 0;
@@ -8057,14 +7936,18 @@ table.bar_chart {
 		right: 0;
 		bottom: 0;
 		z-index: 100;
-		padding: 1em 1.5em;
-		background: #fcfcfc;
-		border-top: 1px solid #dfdfdf;
-		box-shadow: 0 -4px 4px -4px rgba(0, 0, 0, 0.1);
+		padding: 1em 2em 1.5em;

 		.inner {
-			text-align: right;
-			line-height: 23px;
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.wc-backbone-modal-buttons {
+			display: flex;
+			align-items: end;
+			justify-content: end;
+			gap: 8px;

 			.button {
 				margin-bottom: 0;
@@ -8073,6 +7956,22 @@ table.bar_chart {
 	}
 }

+@media screen and (max-width: 782px) {
+	.wc-backbone-modal .wc-backbone-modal-content {
+		border-radius: 0;
+		transform: none;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		min-width: auto;
+		width: 100%;
+	}
+	.wc-backbone-modal-main .wc-backbone-modal-header .modal-close-link {
+		border-radius: 0;
+	}
+}
+
 /**
   * Select2 elements.
   */
@@ -8419,11 +8318,6 @@ table.bar_chart {
 		}
 	}

-	// Action button groups.
-	.wc-action-button-group .wc-action-button {
-		min-height: 0 !important;
-	}
-
 	// Order actions: select + button overflow container due to WP 7.0 select margins.
 	.order_actions {
 		#actions select {
@@ -9691,5 +9585,3 @@ body.woocommerce-settings-payments-section_legacy {
 		background: #f0f0f1;
 	}
 }
-
-
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-setup-wizard.php b/plugins/woocommerce/includes/admin/class-wc-admin-setup-wizard.php
index d0d16d48b52..ba16e7657da 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-setup-wizard.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-setup-wizard.php
@@ -654,7 +654,7 @@ class WC_Admin_Setup_Wizard {
 							</p>
 						</article>
 						<footer>
-							<div class="inner">
+							<div class="wc-backbone-modal-buttons">
 								<button class="button button-primary button-large" id="wc_tracker_submit" aria-label="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>"><?php esc_html_e( 'Continue', 'woocommerce' ); ?></button>
 							</div>
 						</footer>
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php b/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
index ac92a1bf23f..2de3a02f672 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
@@ -182,7 +182,6 @@ class WC_Meta_Box_Product_Data {
 		$variations_count       = absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_count', $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'product_variation' AND post_status IN ('publish', 'private')", $post->ID ) ), $post->ID ) );
 		$variations_per_page    = absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 15 ) );
 		$variations_total_pages = ceil( $variations_count / $variations_per_page );
-		$modal_title            = get_bloginfo( 'name' ) . __( ' says', 'woocommerce' );
 		/* phpcs: enable */

 		include __DIR__ . '/views/html-product-data-variations.php';
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-items.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-items.php
index a5433567036..b39f119d40e 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-items.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-items.php
@@ -449,7 +449,7 @@ if ( wc_tax_enabled() ) {
 					</form>
 				</article>
 				<footer>
-					<div class="inner">
+					<div class="wc-backbone-modal-buttons">
 						<button id="btn-ok" class="button button-primary button-large"><?php esc_html_e( 'Add', 'woocommerce' ); ?></button>
 					</div>
 				</footer>
@@ -505,7 +505,7 @@ if ( wc_tax_enabled() ) {
 					</form>
 				</article>
 				<footer>
-					<div class="inner">
+					<div class="wc-backbone-modal-buttons">
 						<button id="btn-ok" class="button button-primary button-large"><?php esc_html_e( 'Add', 'woocommerce' ); ?></button>
 					</div>
 				</footer>
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-attributes.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-attributes.php
index 34d19edcec1..cf948ccaddb 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-attributes.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-attributes.php
@@ -80,11 +80,9 @@ $product_attributes = $product_object->get_attributes( 'edit' );
 					</form>
 				</article>
 				<footer>
-					<div class="inner">
-						<div>
-							<button class="modal-close button button-large"><?php esc_html_e( 'Cancel', 'woocommerce' ); ?></button>
-							<button id="btn-ok" disabled class="button button-primary button-large"><?php esc_html_e( 'OK', 'woocommerce' ); ?></button>
-						</div>
+					<div class="wc-backbone-modal-buttons">
+						<button class="modal-close button button-large"><?php esc_html_e( 'Cancel', 'woocommerce' ); ?></button>
+						<button id="btn-ok" disabled class="button button-primary button-large"><?php esc_html_e( 'OK', 'woocommerce' ); ?></button>
 					</div>
 				</footer>
 			</section>
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-variations.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-variations.php
index 3e0d9528857..80ecbe9e01d 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-variations.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-variations.php
@@ -203,23 +203,28 @@ $arrow_img_url          = WC_ADMIN_IMAGES_FOLDER_URL . '/product_data/no-variati
 	</div>
 </div>
 <script type="text/template" id="tmpl-wc-modal-set-price-variations">
-	<div class="wc-backbone-modal">
+	<div class="wc-backbone-modal wc-backbone-modal-set-price-variations">
 		<div class="wc-backbone-modal-content">
-			<div class="components-modal__content woocommerce-set-price-variations" role="document">
-				<div class="components-modal__header">
-					<h2><?php echo esc_attr( $modal_title ); ?></h2>
-				</div>
-				<div class="woocommerce-usage-modal__wrapper">
-					<div class="woocommerce-usage-modal__message">
+			<section class="wc-backbone-modal-main" role="main">
+				<header class="wc-backbone-modal-header">
+					<h1><?php esc_html_e( 'Set variation prices', 'woocommerce' ); ?></h1>
+					<button class="modal-close modal-close-link dashicons dashicons-no-alt">
+						<span class="screen-reader-text"><?php esc_html_e( 'Close modal panel', 'woocommerce' ); ?></span>
+					</button>
+				</header>
+				<article>
+					<div>
 						<span><?php esc_html_e( 'Add price to all variations that don\'t have a price', 'woocommerce' ); ?> (<?php echo esc_attr( get_woocommerce_currency_symbol() ); ?> <?php echo esc_textarea( get_woocommerce_currency() ); ?>)</span>
 						<input type="text" class="components-text-control__input wc_input_variations_price"/>
 					</div>
-					<div class="woocommerce-usage-modal__actions">
-						<button class="modal-close components-button is-secondary"><?php esc_html_e( 'Cancel', 'woocommerce' ); ?></button>
+				</article>
+				<footer>
+					<div class="wc-backbone-modal-buttons">
+						<button class="modal-close button components-button is-secondary"><?php esc_html_e( 'Cancel', 'woocommerce' ); ?></button>
 						<button class="modal-close button components-button add_variations_price_button button-primary" disabled><?php esc_html_e( 'Add prices', 'woocommerce' ); ?></button>
 					</div>
-				</div>
-			</div>
+				</footer>
+			</section>
 		</div>
 	</div>
 	<div class="wc-backbone-modal-backdrop modal-close"></div>
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 adee66cb6f2..9b197af6b52 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
@@ -108,7 +108,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 				</form>
 				</article>
 				<footer>
-					<div class="inner">
+					<div class="wc-backbone-modal-buttons">
 						<button id="btn-ok" disabled class="button button-primary button-large disabled">
 							<div class="wc-backbone-modal-action-{{ data.action === 'create' ? 'active' : 'inactive' }}"><?php esc_html_e( 'Create', 'woocommerce' ); ?></div>
 							<div class="wc-backbone-modal-action-{{ data.action === 'edit' ? 'active' : 'inactive' }}"><?php esc_html_e( 'Save', 'woocommerce' ); ?></div>
diff --git a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-providers.php b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-providers.php
index 326daa8acd9..a7c89bcc615 100644
--- a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-providers.php
+++ b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-providers.php
@@ -121,7 +121,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 				</form>
 				</article>
 				<footer>
-					<div class="inner">
+					<div class="wc-backbone-modal-buttons">
 						<button id="btn-ok" disabled class="button button-primary button-large disabled">
 							<div class="wc-backbone-modal-action-{{ data.action === 'create' ? 'active' : 'inactive' }}"><?php esc_html_e( 'Create', 'woocommerce' ); ?></div>
 							<div class="wc-backbone-modal-action-{{ data.action === 'edit' ? 'active' : 'inactive' }}"><?php esc_html_e( 'Save', 'woocommerce' ); ?></div>
diff --git a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
index dd972346d82..948f9886478 100644
--- a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
+++ b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
@@ -157,7 +157,7 @@ do_action( 'woocommerce_shipping_zone_after_methods_table', $zone );
 				</article>
 				<footer>
 					<div class="inner">
-						<div>
+						<div class="wc-backbone-modal-buttons">
 							<button id="btn-back" class="button button-large wc-backbone-modal-back-{{ data.status === 'new' ? 'active' : 'inactive' }}"><?php esc_html_e( 'Back', 'woocommerce' ); ?></button>
 							<button id="btn-ok" data-status='{{ data.status }}' class="button button-primary button-large">
 								<div class="wc-backbone-modal-action-{{ data.status === 'new' ? 'active' : 'inactive' }}"><?php esc_html_e( 'Create and save', 'woocommerce' ); ?></div>
@@ -267,7 +267,9 @@ do_action( 'woocommerce_shipping_zone_after_methods_table', $zone );
 				</article>
 				<footer>
 					<div class="inner">
-						<button id="btn-next" disabled class="button button-primary button-large disabled"><?php esc_html_e( 'Continue', 'woocommerce' ); ?></button>
+						<div class="wc-backbone-modal-buttons">
+							<button id="btn-next" disabled class="button button-primary button-large disabled"><?php esc_html_e( 'Continue', 'woocommerce' ); ?></button>
+						</div>
 						<div class="wc-shipping-zone-method-modal-info"><?php esc_html_e( 'STEP 1 OF 2', 'woocommerce' ); ?></div>
 					</div>
 				</footer>
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 1d40e974290..cca77f8ab6c 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
@@ -147,7 +147,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 					</form>
 				</article>
 				<footer>
-					<div class="inner">
+					<div class="wc-backbone-modal-buttons">
 						<button id="btn-ok" class="button button-primary button-large"><?php _e( 'Add shipping method', 'woocommerce' ); ?></button>
 					</div>
 				</footer>
diff --git a/plugins/woocommerce/phpstan-baseline.neon b/plugins/woocommerce/phpstan-baseline.neon
index fbe3adb94ae..f288568d8b8 100644
--- a/plugins/woocommerce/phpstan-baseline.neon
+++ b/plugins/woocommerce/phpstan-baseline.neon
@@ -6306,12 +6306,6 @@ parameters:
 			count: 1
 			path: includes/admin/meta-boxes/views/html-product-data-variations.php

-		-
-			message: '#^Variable \$modal_title might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: includes/admin/meta-boxes/views/html-product-data-variations.php
-
 		-
 			message: '#^Variable \$product_object might not be defined\.$#'
 			identifier: variable.undefined
diff --git a/plugins/woocommerce/src/Internal/Admin/Orders/ListTable.php b/plugins/woocommerce/src/Internal/Admin/Orders/ListTable.php
index 91cbc74d950..526c48a7426 100644
--- a/plugins/woocommerce/src/Internal/Admin/Orders/ListTable.php
+++ b/plugins/woocommerce/src/Internal/Admin/Orders/ListTable.php
@@ -1755,7 +1755,9 @@ class ListTable extends WP_List_Table {
 								{{{ data.actions_html }}}

 								<# if ( data.is_editable ) { #>
-								<a class="button button-primary button-large" aria-label="<?php esc_attr_e( 'Edit this order', 'woocommerce' ); ?>" href="<?php echo $order_edit_url_placeholder; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>"><?php esc_html_e( 'Edit', 'woocommerce' ); ?></a>
+								<div class="wc-backbone-modal-buttons">
+									<a class="button button-primary button-large" aria-label="<?php esc_attr_e( 'Edit this order', 'woocommerce' ); ?>" href="<?php echo $order_edit_url_placeholder; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>"><?php esc_html_e( 'Edit', 'woocommerce' ); ?></a>
+								</div>
 								<# } #>
 							</div>
 						</footer>