fix(@clayui/css): Utilities remove duplicate rounded utilities

liferay · Jul 23, 2021 · 6687624 · 6687624
1 parent d8251c4
commit 6687624
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 50 deletions.
diff --git a/packages/clay-css/src/scss/cadmin/components/_utilities-functional-important.scss b/packages/clay-css/src/scss/cadmin/components/_utilities-functional-important.scss
@@ -119,43 +119,43 @@
 }
 
 .rounded {
-	border-radius: $cadmin-border-radius !important;
+	border-radius: $cadmin-rounded-border-radius !important;
 }
 
 .rounded-top {
-	border-top-left-radius: $cadmin-border-radius !important;
-	border-top-right-radius: $cadmin-border-radius !important;
+	border-top-left-radius: $cadmin-rounded-border-radius !important;
+	border-top-right-radius: $cadmin-rounded-border-radius !important;
 }
 
 .rounded-right {
-	border-bottom-right-radius: $cadmin-border-radius !important;
-	border-top-right-radius: $cadmin-border-radius !important;
+	border-bottom-right-radius: $cadmin-rounded-border-radius !important;
+	border-top-right-radius: $cadmin-rounded-border-radius !important;
 }
 
 .rounded-bottom {
-	border-bottom-left-radius: $cadmin-border-radius !important;
-	border-bottom-right-radius: $cadmin-border-radius !important;
+	border-bottom-left-radius: $cadmin-rounded-border-radius !important;
+	border-bottom-right-radius: $cadmin-rounded-border-radius !important;
 }
 
 .rounded-left {
-	border-bottom-left-radius: $cadmin-border-radius !important;
-	border-top-left-radius: $cadmin-border-radius !important;
+	border-bottom-left-radius: $cadmin-rounded-border-radius !important;
+	border-top-left-radius: $cadmin-rounded-border-radius !important;
 }
 
 .rounded-lg {
 	border-radius: $cadmin-border-radius-lg !important;
 }
 
 .rounded-circle {
-	border-radius: 50% !important;
+	border-radius: $cadmin-rounded-circle-border-radius !important;
 }
 
 .rounded-pill {
 	border-radius: $cadmin-rounded-pill !important;
 }
 
 .rounded-0 {
-	border-radius: 0 !important;
+	border-radius: $cadmin-rounded-0-border-radius !important;
 }
 
 // Clearfix

diff --git a/packages/clay-css/src/scss/cadmin/components/_utilities.scss b/packages/clay-css/src/scss/cadmin/components/_utilities.scss
@@ -4,20 +4,6 @@
 	@include clay-bg-checkered($cadmin-bg-checkered-fg);
 }
 
-// Rounded
-
-.rounded {
-	border-radius: $cadmin-rounded-border-radius !important;
-}
-
-.rounded-circle {
-	border-radius: $cadmin-rounded-circle-border-radius !important;
-}
-
-.rounded-0 {
-	border-radius: $cadmin-rounded-0-border-radius !important;
-}
-
 // Close
 
 .close {

diff --git a/packages/clay-css/src/scss/components/_utilities-functional-important.scss b/packages/clay-css/src/scss/components/_utilities-functional-important.scss
@@ -115,43 +115,43 @@
 }
 
 .rounded {
-	border-radius: $border-radius !important;
+	border-radius: $rounded-border-radius !important;
 }
 
 .rounded-top {
-	border-top-left-radius: $border-radius !important;
-	border-top-right-radius: $border-radius !important;
+	border-top-left-radius: $rounded-border-radius !important;
+	border-top-right-radius: $rounded-border-radius !important;
 }
 
 .rounded-right {
-	border-bottom-right-radius: $border-radius !important;
-	border-top-right-radius: $border-radius !important;
+	border-bottom-right-radius: $rounded-border-radius !important;
+	border-top-right-radius: $rounded-border-radius !important;
 }
 
 .rounded-bottom {
-	border-bottom-left-radius: $border-radius !important;
-	border-bottom-right-radius: $border-radius !important;
+	border-bottom-left-radius: $rounded-border-radius !important;
+	border-bottom-right-radius: $rounded-border-radius !important;
 }
 
 .rounded-left {
-	border-bottom-left-radius: $border-radius !important;
-	border-top-left-radius: $border-radius !important;
+	border-bottom-left-radius: $rounded-border-radius !important;
+	border-top-left-radius: $rounded-border-radius !important;
 }
 
 .rounded-lg {
 	border-radius: $border-radius-lg !important;
 }
 
 .rounded-circle {
-	border-radius: 50% !important;
+	border-radius: $rounded-circle-border-radius !important;
 }
 
 .rounded-pill {
 	border-radius: $rounded-pill !important;
 }
 
 .rounded-0 {
-	border-radius: 0 !important;
+	border-radius: $rounded-0-border-radius !important;
 }
 
 // Clearfix

diff --git a/packages/clay-css/src/scss/components/_utilities.scss b/packages/clay-css/src/scss/components/_utilities.scss
@@ -4,20 +4,6 @@
 	@include clay-bg-checkered($bg-checkered-fg);
 }
 
-// Rounded
-
-.rounded {
-	border-radius: $rounded-border-radius !important;
-}
-
-.rounded-circle {
-	border-radius: $rounded-circle-border-radius !important;
-}
-
-.rounded-0 {
-	border-radius: $rounded-0-border-radius !important;
-}
-
 // Close
 
 .close {