Skip to content

Commit b33efc4

Browse files
committed
Update to support latest Sass merge changes
1 parent 6a4aee9 commit b33efc4

10 files changed

Lines changed: 32321 additions & 84227 deletions

File tree

dist/static/uniform.css

Lines changed: 16071 additions & 22195 deletions
Large diffs are not rendered by default.

dist/static/uniform.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/uniform.css

Lines changed: 16071 additions & 22195 deletions
Large diffs are not rendered by default.

dist/uniform.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/variablized/uniform.css

Lines changed: 0 additions & 39619 deletions
This file was deleted.

dist/variablized/uniform.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "uniformcss",
3-
"version": "1.5.3",
3+
"version": "1.5.4",
44
"description": "A fully configurable utility class generator and CSS framework built for Sass projects.",
55
"main": "main.sass",
66
"scripts": {

uniform/_index.scss

Lines changed: 169 additions & 212 deletions
Large diffs are not rendered by default.

uniform/core/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! UniformCSS v1.5.3 | MIT License | github.com/ThinkUniform/uniformcss */
1+
/*! UniformCSS v1.5.4 | MIT License | github.com/ThinkUniform/uniformcss */
22

33
@use "sass:map";
44
@use "sass:list";

uniform/core/starter/_index.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
$exclude: map.get($all-config, excludes);
66
$include: map.get($all-config, includes);
77
$output: map.get($all-config, output);
8+
$css-variables: map.get($all-config, css-variables);
89

910
$include-condition: true;
1011
@if ( $output == 'headless' or map.get($config, output) == 'json' ) {
@@ -38,7 +39,11 @@ $include-condition: true;
3839
}
3940

4041
pre, code {
41-
font-family: var(--font-mono);
42+
@if ( $css-variables == true ) {
43+
font-family: var(--font-mono);
44+
} @else {
45+
font-family: font(mono);
46+
}
4247
}
4348

4449
[type=date],

0 commit comments

Comments
 (0)