fix(@clayui/css): Global Variables remove math function parenthesis f…

…rom $spacers - Prettier confuses the parenthesis as a map key value pair and adds a trailing comma which changes the type from number to list
liferay · Jun 10, 2022 · d2ea301 · d2ea301
1 parent 95c3743
commit d2ea301
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 81 deletions.
diff --git a/packages/clay-css/src/scss/atlas/variables/_globals.scss b/packages/clay-css/src/scss/atlas/variables/_globals.scss
@@ -201,36 +201,16 @@ $spacers: () !default;
 $spacers: map-deep-merge(
 	(
 		0: 0,
-		1: (
-			$spacer * 0.25,
-		),
-		2: (
-			$spacer * 0.5,
-		),
-		3: (
-			$spacer * 1,
-		),
-		4: (
-			$spacer * 1.5,
-		),
-		5: (
-			$spacer * 3,
-		),
-		6: (
-			$spacer * 4.5,
-		),
-		7: (
-			$spacer * 6,
-		),
-		8: (
-			$spacer * 7.5,
-		),
-		9: (
-			$spacer * 9,
-		),
-		10: (
-			$spacer * 10,
-		),
+		1: $spacer * 0.25,
+		2: $spacer * 0.5,
+		3: $spacer * 1,
+		4: $spacer * 1.5,
+		5: $spacer * 3,
+		6: $spacer * 4.5,
+		7: $spacer * 6,
+		8: $spacer * 7.5,
+		9: $spacer * 9,
+		10: $spacer * 10,
 	),
 	$spacers
 );

diff --git a/packages/clay-css/src/scss/cadmin/variables/_globals.scss b/packages/clay-css/src/scss/cadmin/variables/_globals.scss
@@ -246,36 +246,16 @@ $cadmin-spacers: () !default;
 $cadmin-spacers: map-deep-merge(
 	(
 		0: 0,
-		1: (
-			$cadmin-spacer * 0.25,
-		),
-		2: (
-			$cadmin-spacer * 0.5,
-		),
-		3: (
-			$cadmin-spacer * 1,
-		),
-		4: (
-			$cadmin-spacer * 1.5,
-		),
-		5: (
-			$cadmin-spacer * 3,
-		),
-		6: (
-			$cadmin-spacer * 4.5,
-		),
-		7: (
-			$cadmin-spacer * 6,
-		),
-		8: (
-			$cadmin-spacer * 7.5,
-		),
-		9: (
-			$cadmin-spacer * 9,
-		),
-		10: (
-			$cadmin-spacer * 10,
-		),
+		1: $cadmin-spacer * 0.25,
+		2: $cadmin-spacer * 0.5,
+		3: $cadmin-spacer * 1,
+		4: $cadmin-spacer * 1.5,
+		5: $cadmin-spacer * 3,
+		6: $cadmin-spacer * 4.5,
+		7: $cadmin-spacer * 6,
+		8: $cadmin-spacer * 7.5,
+		9: $cadmin-spacer * 9,
+		10: $cadmin-spacer * 10,
 	),
 	$cadmin-spacers
 );

diff --git a/packages/clay-css/src/scss/variables/_globals.scss b/packages/clay-css/src/scss/variables/_globals.scss
@@ -189,28 +189,14 @@ $spacers: () !default;
 $spacers: map-deep-merge(
 	(
 		0: 0,
-		1: (
-			$spacer * 0.25,
-		),
-		2: (
-			$spacer * 0.5,
-		),
+		1: $spacer * 0.25,
+		2: $spacer * 0.5,
 		3: $spacer,
-		4: (
-			$spacer * 1.5,
-		),
-		5: (
-			$spacer * 3,
-		),
-		6: (
-			$spacer * 4.5,
-		),
-		7: (
-			$spacer * 6,
-		),
-		8: (
-			$spacer * 7.5,
-		),
+		4: $spacer * 1.5,
+		5: $spacer * 3,
+		6: $spacer * 4.5,
+		7: $spacer * 6,
+		8: $spacer * 7.5,
 	),
 	$spacers
 );