Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit fd591b3

Browse files
authored
Merge pull request #17 from AztlanEngineering/ft-pass-default-tag-to-default-variables
Add to the default variables and add them to the variable file
2 parents 2aa4a7c + e136068 commit fd591b3

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/_mixins.scss

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@use 'sass:map';
22
@use "collections/palettes/monochrome";
3+
@use "vars";
34

45
//
56
//
@@ -71,14 +72,8 @@ $getter-fill:"e-" !default;
7172
}
7273
}
7374

74-
$default-colorscheme-names: (
75-
"shade1": "",
76-
"shade2": "dark",
77-
"shade3": "light",
78-
"shade4": "on"
79-
);
8075

81-
@mixin define-variables($array, $colorscheme-names: $default-colorscheme-names) {
76+
@mixin define-variables($array, $colorscheme-names: vars.$default-colorscheme-names) {
8277
@each $name, $colorlist in $array {
8378
// $base:nth($colorlist, 1);
8479
// $dark:nth($colorlist, 2);
@@ -96,7 +91,7 @@ $default-colorscheme-names: (
9691
@else {
9792
--#{map.get($colorscheme-names, "shade2")}-#{$name}: #{dark-nuance($shade1)};
9893
}
99-
@if (shade3) {
94+
@if ($shade3) {
10095
--#{map.get($colorscheme-names, "shade3")}-#{$name}: #{$shade3};
10196
}
10297
@else {
@@ -111,7 +106,7 @@ $default-colorscheme-names: (
111106
}
112107
}
113108

114-
@mixin define-theme($array, $theme-name, $default:false, $colorscheme-names: $default-colorscheme-names) {
109+
@mixin define-theme($array, $theme-name, $default:false, $colorscheme-names: vars.$default-colorscheme-names) {
115110
@if $default == true {
116111
:root,
117112
.#{$theme-name} {
@@ -140,7 +135,7 @@ $default-colorscheme-names: (
140135
//
141136

142137

143-
@mixin setters-from-map($array, $colorscheme-names: $default-colorscheme-names) {
138+
@mixin setters-from-map($array, $colorscheme-names: vars.$default-colorscheme-names) {
144139
@each $name, $colorlist in $array {
145140
@each $prefix in $prefixes-setters {
146141
.#{$prefix}-#{$name},
@@ -161,7 +156,7 @@ $default-colorscheme-names: (
161156
//
162157
//
163158

164-
@mixin getters($colorscheme-names: $default-colorscheme-names) {
159+
@mixin getters($colorscheme-names: vars.$default-colorscheme-names) {
165160
// $variants:"","light","dark","on";
166161
$variants: $colorscheme-names;
167162
@each $register in $prefixes-setters {

src/_vars.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
$default-colorscheme-names: (
2+
"shade1": "",
3+
"shade2": "dark",
4+
"shade3": "light",
5+
"shade4": "on"
6+
) !default;

0 commit comments

Comments
 (0)