Fixed a bug in base.scss and made $extended-color-map the default for…

… getters
zaydek · Nov 16, 2020 · ce41f97 · ce41f97
1 parent 15c5373
commit ce41f97
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/consumer.scss b/src/consumer.scss
@@ -1,5 +1,5 @@
 @use "duomo" as * with (
-	// $headless: true,
+	$headless: true,
 	$separator: ".",
 	$xl: 1344,
 	$breakpoint-map: (
@@ -13,6 +13,10 @@
 	$opacity-range: (0.5)
 );
 
+.font-sans {
+	font-family: font-family(sans-serif);
+}
+
 // Exports:
 //
 // $headless

diff --git a/src/duomo/helpers/getters.scss b/src/duomo/helpers/getters.scss
@@ -11,10 +11,10 @@
 }
 
 // prettier-ignore
-@function font($key) {
+@function font-family($key) {
 	@return __getter(
 		"font",
-		configuration.$font-map,
+		configuration.$font-family-map,
 		$key,
 	);
 }
@@ -23,13 +23,13 @@
 @function color($key) {
 	@return __getter(
 		"color",
-		configuration.$color-map,
+		configuration.$extended-color-map,
 		$key,
 	);
 }
 
 // prettier-ignore
-@function shadow($key) {
+@function box-shadow($key) {
 	@return __getter(
 		"shadow",
 		configuration.$shadow-map,

diff --git a/src/duomo/preflight/base.scss b/src/duomo/preflight/base.scss
@@ -1,6 +1,4 @@
-@use "sass:map";
-
-@use "../configuration";
+@use "../helpers/getters" as *;
 
 @mixin base {
 	/**
@@ -68,7 +66,7 @@
 	 */
 
 	html {
-		font-family: #{map.get(configuration.$font-family-map, "sans")}; /* 1 */
+		font-family: font-family(sans-serif); /* 1 */
 		line-height: 1.5; /* 2 */
 	}
 
@@ -114,7 +112,7 @@
 		box-sizing: border-box; /* 1 */
 		border-width: 0; /* 2 */
 		border-style: solid; /* 2 */
-		border-color: #{map.get(configuration.$color-map, "cool-gray-200")}; /* 2 */
+		border-color: color(cool-gray-200); /* 2 */
 	}
 
 	/*
@@ -145,7 +143,7 @@
 
 	input::placeholder,
 	textarea::placeholder {
-		color: #{map.get(configuration.$color-map, "cool-gray-400")};
+		color: color(cool-gray-400);
 	}
 
 	button,
@@ -206,7 +204,7 @@
 	code,
 	kbd,
 	samp {
-		font-family: #{map.get(configuration.$font-family-map, "mono")};
+		font-family: font-family(monospace);
 	}
 
 	/**