Merge branch 'main' into fix/WDSBT-63-retain-existing-button-style

WebDevStudios · Nov 6, 2024 · a1baba7 · a1baba7
2 parents 7e80b7a + a2bde77
commit a1baba7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 95 deletions.
diff --git a/assets/images/icons/icon-circle-right.svg b/assets/images/icons/icon-circle-right.svg
diff --git a/assets/scss/blocks/core/button.scss b/assets/scss/blocks/core/button.scss
@@ -19,23 +19,6 @@
 			opacity: 0.15;
 			pointer-events: none;
 		}
-
-		&::after {
-			background-color: currentcolor;
-			content: '';
-			display: inline-block;
-			height: 1rem;
-			margin-left: 0.5rem;
-			margin-right: unset;
-			mask-image: url(../../../images/icons/icon-circle-right.svg);
-			mask-size: contain;
-			left: unset;
-			position: absolute;
-			right: 0.75rem;
-			vertical-align: middle;
-			width: 1rem;
-			z-index: 0;
-		}
 	}
 
 	&.is-style-minimal,
@@ -68,36 +51,21 @@
 	&.has-size-m {
 		.wp-block-button__link {
 			font-size: var(--wp--preset--font-size--s);
-			padding: 0.625rem 2.5rem 0.625rem 1.25rem;
-
-			&::after {
-				height: 1.25rem;
-				width: 1.25rem;
-			}
+			padding: 0.625rem 1.25rem 0.625rem 1.25rem;
 		}
 	}
 
 	&.has-size-l {
 		.wp-block-button__link {
 			font-size: var(--wp--preset--font-size--m);
-			padding: 0.9375rem 3rem 0.9375rem 1.25rem;
-
-			&::after {
-				height: 1.5rem;
-				width: 1.5rem;
-			}
+			padding: 0.9375rem 1.25rem 0.9375rem 1.25rem;
 		}
 	}
 
 	&.has-size-xl {
 		.wp-block-button__link {
 			font-size: var(--wp--preset--font-size--l);
-			padding: 0.9375rem 3rem 0.9375rem 1.25rem;
-
-			&::after {
-				height: 1.75rem;
-				width: 1.75rem;
-			}
+			padding: 0.9375rem 1.25rem 0.9375rem 1.25rem;
 		}
 	}
 }

diff --git a/inc/hooks/enable-svg.php b/inc/hooks/enable-svg.php
diff --git a/theme.json b/theme.json
@@ -434,7 +434,7 @@
 						"spacing": {
 							"padding": {
 								"top": "0.5rem",
-								"right": "2.5rem",
+								"right": "1rem",
 								"bottom": "0.5rem",
 								"left": "1rem"
 							}