Put var application into mixin

4 files changed, 20 insertions, 21 deletions

diff --git a/src/_apply-vars.scss b/src/_apply-vars.scss
deleted file mode 100644
index a2ee404..0000000
--- a/src/_apply-vars.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@use 'sass:map';
-@use 'iro-sass/src/index' as iro;
-@use 'include-media/dist/include-media' as media;
-
-:root {
-    @include iro.props-assign;
-
-    @each $breakpoint in map.keys(media.$breakpoints) {
-        @include media.media('<=#{$breakpoint}') {
-            @include iro.props-assign($breakpoint);
-        }
-    }
-
-    @media (prefers-color-scheme: dark) {
-        @include iro.props-assign('dark');
-    }
-}
diff --git a/src/_declare-vars.scss b/src/_declare-vars.scss
index 0aa1cca..afe1e15 100644
--- a/src/_declare-vars.scss
+++ b/src/_declare-vars.scss
@@ -271,3 +271,19 @@
         ),
     ), $tree);
 }
+
+@mixin apply-vars {
+    :root {
+        @include iro.props-assign;
+
+        @each $breakpoint in map.keys(media.$breakpoints) {
+            @include media.media('<=#{$breakpoint}') {
+                @include iro.props-assign($breakpoint);
+            }
+        }
+
+        @media (prefers-color-scheme: dark) {
+            @include iro.props-assign('dark');
+        }
+    }
+}
diff --git a/src/index.scss b/src/index.scss
index 50927e2..bae26bc 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -1,4 +1,4 @@
-@use 'declare-vars';
+@use 'declare-vars' as vars;
 
 @use 'base';
 @use 'layouts';
@@ -7,4 +7,4 @@
 @use 'themes';
 @use 'utils';
 
-@use 'apply-vars';
+@include vars.apply-vars;
diff --git a/src_demo/index.scss b/src_demo/index.scss
index 4845e03..22472a3 100644
--- a/src_demo/index.scss
+++ b/src_demo/index.scss
@@ -1,4 +1,4 @@
-@use '../src/declare-vars';
+@use '../src/declare-vars' as vars;
 
 @use '../src/base';
 @use 'base' as demo-base;
@@ -14,5 +14,5 @@
 @use '../src/themes';
 @use '../src/utils';
 
-@use '../src/apply-vars';
+@include vars.apply-vars;