From 648e71eaf2ddfee4cc2ca73af7cf3f1d19fea3b7 Mon Sep 17 00:00:00 2001
From: HerrHase <me@herr-hase.wtf>
Date: Mon, 22 Jan 2018 00:29:06 +0100
Subject: [PATCH] change includes

---
 package-lock.json    | 18 ++++++++++++++++++
 package.json         |  5 +++--
 src/scss/_base.scss  |  7 ++-----
 src/scss/crispy.scss |  8 +++++++-
 4 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..7844530
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,18 @@
+{
+  "name": "crispy-boilerplate",
+  "version": "0.9.4",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "normalize.css": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-7.0.0.tgz",
+      "integrity": "sha1-q/sd2CRwZ04DIrU86xqvQSk45L8="
+    },
+    "reflex-grid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/reflex-grid/-/reflex-grid-2.0.1.tgz",
+      "integrity": "sha1-bvcKGYa4LZxo5cRz5i28rxxdwV0="
+    }
+  }
+}
diff --git a/package.json b/package.json
index d9c08d1..648fc1f 100644
--- a/package.json
+++ b/package.json
@@ -14,13 +14,14 @@
   },
   "config": {
     "dest_dir": "dest/",
-    "src_dir": "src/",
+    "src_dir": "src/"
   },
   "scripts": {
     "preinstall": "npm install -g node-sass clean-css-cli postcss-cli autoprefixer",
     "build": "npm run css:build",
-    "css:build": "npm run css:clean && npm run css:postcss && npm run css:minify",
+    "css:build": "npm run css:clean && npm run css:scss && npm run css:postcss && npm run css:minify",
     "css:clean": "rimraf $npm_package_config_dist_dir/css/*",
+    "css:scss": "node-sass $npm_package_config_src_dir/scss/crispy.scss $npm_package_config_dest_dir/css/crispy.css",
     "css:postcss": "postcss $npm_package_config_dest_dir/css/*.css --use autoprefixer -d $npm_package_config_dest_dir/css/",
     "css:minify": "cleancss $npm_package_config_dest_dir/css/landingPage.css > $npm_package_config_dest_dir/css/landingPage.min.css"
   }
diff --git a/src/scss/_base.scss b/src/scss/_base.scss
index 3119209..290f751 100644
--- a/src/scss/_base.scss
+++ b/src/scss/_base.scss
@@ -1,9 +1,6 @@
 @import
     '../../normalize.css/normalize',
-    '../../reflex-grid/scss/reflex',
-    
-    'functions/functions',
-    'mixins/mixins';
+    '../../reflex-grid/scss/reflex';
 
 /**
  * base
@@ -73,7 +70,7 @@ abbr[title] {
 }
 
 kbd {
-    // ?
+    // @TODO do something
 }
 
 mark {
diff --git a/src/scss/crispy.scss b/src/scss/crispy.scss
index f35a979..726af80 100644
--- a/src/scss/crispy.scss
+++ b/src/scss/crispy.scss
@@ -1,6 +1,12 @@
 @import
+    'functions/functions',
+    'mixins/mixins',
+
+    'config',
+    'base',
+
     'helpers/helpers',
-    
+
     'components/button',
     'components/heading',
     'components/icon',