Merge pull request #2 from evanshunt/forward-mixins

Forward mixins
evanshunt · Aug 6, 2020 · c1c6600 · c1c6600
2 parents 61034db + 48ef4eb
commit c1c6600
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evanshunt/derekstrap",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A base layout and styles library by Evans Hunt",
   "main": "dist/main.js",
   "keywords": [

diff --git a/proportional-box/_index.scss b/proportional-box/_index.scss
@@ -1 +1 @@
-@use 'mixins' as *;
+@forward 'mixins';
diff --git a/proportional-box/_mixins.scss b/proportional-box/_mixins.scss
@@ -4,12 +4,12 @@
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center;
-  display: $display;
-  position: $position;
+  display: #{$display};
+  position: #{$position};
 
   @include proportional-box-aspect-ratio($aspect-ratio, $vw);
 }
 
-@mixin proportional-box-aspect-ratio($aspect-ratio, $vw, $offset: 0) {
+@mixin proportional-box-aspect-ratio($aspect-ratio, $vw, $offset: 0px) {
   height: calc(#{1 / $aspect-ratio} * (100vw - 2 * #{$offset}));
 }
diff --git a/proportional-text/_index.scss b/proportional-text/_index.scss
@@ -3,6 +3,8 @@
 @use '../text-sizing/index' as *;
 @use 'mixins' as *;
 
+@forward 'mixins';
+
 html {
     font-size: proportional-text($base-font-size, 320px);
 

diff --git a/spacing/_index.scss b/spacing/_index.scss
@@ -1,2 +1,2 @@
 @forward 'variables';
-@use 'mixins' as *;
+@forward 'mixins';
diff --git a/text-sizing/_index.scss b/text-sizing/_index.scss
@@ -1,5 +1,6 @@
-@forward 'variables';
 @use 'mixins' as *;
+@forward 'mixins';
+@forward 'variables';
 
 body {
     @include base-text();