Merge pull request #80 from nimblehq/release/2.2.1

Release 2.2.1
nimblehq · May 27, 2022 · 16b9ad6 · 16b9ad6
2 parents e3e70ea + 4c6ce79
commit 16b9ad6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cra-template-nimble",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "keywords": [
     "react",
     "create-react-app",

diff --git a/template/.npmrc b/template/.npmrc
@@ -0,0 +1 @@
+save-exact=true
diff --git a/template/src/assets/stylesheets/_variables.scss b/template/src/assets/stylesheets/_variables.scss
@@ -0,0 +1,3 @@
+// dummy variables
+$bg-color: #282c34;
+$link-color: #61dafb;
diff --git a/template/src/assets/stylesheets/application.scss b/template/src/assets/stylesheets/application.scss
@@ -1,10 +1,10 @@
 // Variables
-@import 'variables';
+@forward 'src/assets/stylesheets/variables';
 
 // Dependencies
 
 // Functions
-@import 'functions/sizing';
+@forward 'src/assets/stylesheets/functions/sizing';
 
 // Mixins
 

diff --git a/template/src/dummy.scss b/template/src/dummy.scss
@@ -1,3 +1,5 @@
+@use 'src/assets/stylesheets/application';
+
 body {
   margin: 0;
 
@@ -36,14 +38,14 @@ code {
   justify-content: center;
   min-height: 100vh;
 
-  background-color: #282c34;
+  background-color: application.$bg-color;
 
   color: #fff;
-  font-size: calc(10px + 2vmin);
+  font-size: calc(#{application.rem(10px)} + 2vmin);
 }
 
 .app-link {
-  color: #61dafb;
+  color: application.$link-color;
 }
 
 @keyframes app-logo-spin {