Update to support latest Sass merge changes

ThinkUniform · Aug 17, 2022 · b33efc4 · b33efc4
1 parent 6a4aee9
commit b33efc4
Show file tree

Hide file tree

Showing 10 changed files with 32,321 additions and 84,227 deletions.
diff --git a/dist/static/uniform.css b/dist/static/uniform.css
diff --git a/dist/static/uniform.min.css b/dist/static/uniform.min.css
diff --git a/dist/uniform.css b/dist/uniform.css
diff --git a/dist/uniform.min.css b/dist/uniform.min.css
diff --git a/dist/variablized/uniform.css b/dist/variablized/uniform.css
diff --git a/dist/variablized/uniform.min.css b/dist/variablized/uniform.min.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uniformcss",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "A fully configurable utility class generator and CSS framework built for Sass projects.",
   "main": "main.sass",
   "scripts": {

diff --git a/uniform/_index.scss b/uniform/_index.scss
diff --git a/uniform/core/_index.scss b/uniform/core/_index.scss
@@ -1,4 +1,4 @@
-/*! UniformCSS v1.5.3 | MIT License | github.com/ThinkUniform/uniformcss */
+/*! UniformCSS v1.5.4 | MIT License | github.com/ThinkUniform/uniformcss */
 
 @use "sass:map";
 @use "sass:list";

diff --git a/uniform/core/starter/_index.scss b/uniform/core/starter/_index.scss
@@ -5,6 +5,7 @@
 $exclude: map.get($all-config, excludes);
 $include: map.get($all-config, includes);
 $output: map.get($all-config, output);
+$css-variables: map.get($all-config, css-variables);
 
 $include-condition: true;
 @if ( $output == 'headless' or map.get($config, output) == 'json' ) {
@@ -38,7 +39,11 @@ $include-condition: true;
   }
 
   pre, code {
-		font-family: var(--font-mono);
+    @if ( $css-variables == true ) {
+      font-family: var(--font-mono);
+    } @else {
+      font-family: font(mono);
+    }
 	}
 
   [type=date],