fix(@clayui/css): Mixins clay-nav-variant don't set to empty map

liferay · Dec 16, 2021 · 22f183d · 22f183d
1 parent d79e115
commit 22f183d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/packages/clay-css/src/scss/cadmin/components/_navs.scss b/packages/clay-css/src/scss/cadmin/components/_navs.scss
@@ -127,7 +127,9 @@
 // Nav Tabs
 
 .nav-tabs {
-	@include clay-nav-variant($cadmin-nav-tabs) .dropdown-menu {
+	@include clay-nav-variant($cadmin-nav-tabs);
+
+	.dropdown-menu {
 		@include border-top-radius(0);
 
 		margin-top: math-sign($cadmin-nav-tabs-border-width);

diff --git a/packages/clay-css/src/scss/mixins/_nav.scss b/packages/clay-css/src/scss/mixins/_nav.scss
@@ -94,12 +94,11 @@
 	@if (type-of($map) == 'map') {
 		$enabled: setter(map-get($map, enabled), true);
 
-		$base: setter($map, ());
 		$base: map-merge(
-			$base,
+			$map,
 			(
 				background-color:
-					setter(map-get($map, bg), map-get($base, background-color)),
+					setter(map-get($map, bg), map-get($map, background-color)),
 			)
 		);
 
@@ -221,21 +220,15 @@
 			}
 
 			.nav-link-monospaced {
-				@include clay-link(
-					setter(map-get($map, nav-link-monospaced), ())
-				);
+				@include clay-link(map-get($map, nav-link-monospaced));
 			}
 
 			.nav-btn {
-				@include clay-button-variant(
-					setter(map-get($map, nav-btn), ())
-				);
+				@include clay-button-variant(map-get($map, nav-btn));
 			}
 
 			.nav-btn-monospaced {
-				@include clay-button-variant(
-					setter(map-get($map, nav-btn-monospaced), ())
-				);
+				@include clay-button-variant(map-get($map, nav-btn-monospaced));
 			}
 
 			.nav-item {