Cebtralize remaining Woo overrides

Author: adamwoodnz

client/assets/stylesheets/_wp-components-overrides.scss

@@ -120,6 +120,36 @@
 		&:focus:not(:disabled) {
 			--wp-components-color-accent: var(--woo-purple-60);
 		}
+
+		&.is-primary,
+		&.social-buttons__button {
+			border-radius: 8px; /* stylelint-disable-line scales/radii */
+			font-size: 1rem;
+			font-weight: 500;
+			height: 48px;
+		}
+
+		&.social-buttons__button {
+			&:focus:not(:disabled) {
+				box-shadow: inset 0 0 0 1px var(--wp-components-color-background, #fff), 0 0 0 2px var(--wp-components-color-accent);
+			}
+		}
+
+		&.is-primary {
+			&:focus:not(:disabled) {
+				box-shadow: 0 0 0 2px var(--wp-components-color-accent);
+			}
+
+			&:disabled {
+				--wp-components-color-accent: var(--studio-gray-5);
+
+				color: var(--studio-gray-50);
+			}
+
+			.components-spinner {
+				margin-top: 0;
+			}
+		}
 	}
 }
 

client/layout/masterbar/woo.scss

@@ -1291,38 +1291,6 @@ $breakpoint-mobile: 660px;
 			}
 		}
 
-		.components-button {
-			&.is-primary,
-			&.social-buttons__button {
-				border-radius: 8px; /* stylelint-disable-line scales/radii */
-				font-size: 1rem;
-				font-weight: 500;
-				height: 48px;
-			}
-
-			&.social-buttons__button {
-				&:focus:not(:disabled) {
-					box-shadow: inset 0 0 0 1px var(--wp-components-color-background, #fff), 0 0 0 2px var(--wp-components-color-accent);
-				}
-			}
-
-			&.is-primary {
-				&:focus:not(:disabled) {
-					box-shadow: 0 0 0 2px var(--wp-components-color-accent);
-				}
-
-				&:disabled {
-					--color-accent: var(--studio-gray-5);
-
-					color: var(--studio-gray-50);
-				}
-
-				.components-spinner {
-					margin-top: 0;
-				}
-			}
-		}
-
 		input[type="text"].form-text-input,
 		input[type="email"].form-text-input,
 		input[type="password"].form-text-input,