Merge branch 'master' into develop

Author: Dennis Heibült

config/sass.js

@@ -1,17 +1,21 @@
 module.exports = {
+    "options": {
+        "require": "sass-globbing",
+        "loadPath": "bower_components"
+    },
     "dev": {
         "options": {
             "style": "expanded",
-            "require": "sass-globbing"
+            "lineNumbers": true,
+            "sourcemap": true
         },
         "files": {
             "dist/assets/css/style.css": "src/assets/css/style.scss"
         }
     },
     "build": {
         "options": {
-            "style": "compressed",
-            "require": "sass-globbing"
+            "style": "compressed"
         },
         "files": {
             "build/assets/css/style.css": "src/assets/css/style.scss"

src/assets/css/style.scss

@@ -17,8 +17,8 @@
 //     #SETTINGS
 // \*------------------------------------*/
 @import "ui/settings/*.*";
-@import "../../../bower_components/inuit-defaults/_settings.defaults";
-@import "../../../bower_components/inuit-responsive-settings/_settings.responsive";
+@import "inuit-defaults/_settings.defaults";
+@import "inuit-responsive-settings/_settings.responsive";
 
 
 
@@ -28,9 +28,9 @@
 //     #TOOLS
 // \*------------------------------------*/
 @import "ui/tools/*.*";
-@import "../../../bower_components/inuit-functions/_tools.functions";
-@import "../../../bower_components/inuit-mixins/_tools.mixins";
-@import "../../../bower_components/inuit-responsive-tools/_tools.responsive";
+@import "inuit-functions/_tools.functions";
+@import "inuit-mixins/_tools.mixins";
+@import "inuit-responsive-tools/_tools.responsive";
 
 
 
@@ -39,11 +39,10 @@
 // /*------------------------------------*\
 //     #GENERIC
 // \*------------------------------------*/
-@import "../../../bower_components/inuit-box-sizing/_generic.box-sizing";
-@import "../../../bower_components/inuit-normalize/_generic.normalize";
-@import "../../../bower_components/inuit-reset/_generic.reset";
-@import "../../../bower_components/inuit-shared/_generic.shared";
-@import "../../../bower_components/inuit-clearfix/_trumps.clearfix";
+@import "inuit-box-sizing/_generic.box-sizing";
+@import "inuit-normalize/_generic.normalize";
+@import "inuit-reset/_generic.reset";
+@import "inuit-shared/_generic.shared";
 
 
 
@@ -52,11 +51,11 @@
 // /*------------------------------------*\
 //     #BASE
 // \*------------------------------------*/
-@import "../../../bower_components/inuit-page/_base.page";
-@import "../../../bower_components/inuit-headings/_base.headings";
-@import "../../../bower_components/inuit-paragraphs/_base.paragraphs";
-@import "../../../bower_components/inuit-lists/_base.lists";
-@import "../../../bower_components/inuit-images/_base.images";
+@import "inuit-page/_base.page";
+@import "inuit-headings/_base.headings";
+@import "inuit-paragraphs/_base.paragraphs";
+@import "inuit-lists/_base.lists";
+@import "inuit-images/_base.images";
 @import "ui/base/*.*";
 
 
@@ -75,20 +74,20 @@
 // /*------------------------------------*\
 //     #OBJECTS
 // \*------------------------------------*/
-@import "../../../bower_components/genesis-icon/_objects.icon";
-@import "../../../bower_components/genesis-text-input/_objects.text-input";
-@import "../../../bower_components/genesis-page-wrap/_objects.page-wrap";
-@import "../../../bower_components/inuit-box/_objects.box";
-@import "../../../bower_components/inuit-buttons/_objects.buttons";
-@import "../../../bower_components/inuit-flag/_objects.flag";
-@import "../../../bower_components/inuit-layout/_objects.layout";
-@import "../../../bower_components/inuit-list-bare/_objects.list-bare";
-@import "../../../bower_components/inuit-list-block/_objects.list-block";
-@import "../../../bower_components/inuit-list-inline/_objects.list-inline";
-@import "../../../bower_components/inuit-list-ui/_objects.list-ui";
-@import "../../../bower_components/inuit-media/_objects.media";
-@import "../../../bower_components/inuit-tables/_objects.tables";
-@import "../../../bower_components/inuit-tabs/_objects.tabs";
+@import "genesis-icon/_objects.icon";
+@import "genesis-text-input/_objects.text-input";
+@import "genesis-page-wrap/_objects.page-wrap";
+@import "inuit-box/_objects.box";
+@import "inuit-buttons/_objects.buttons";
+@import "inuit-flag/_objects.flag";
+@import "inuit-layout/_objects.layout";
+@import "inuit-list-bare/_objects.list-bare";
+@import "inuit-list-block/_objects.list-block";
+@import "inuit-list-inline/_objects.list-inline";
+@import "inuit-list-ui/_objects.list-ui";
+@import "inuit-media/_objects.media";
+@import "inuit-tables/_objects.tables";
+@import "inuit-tabs/_objects.tabs";
 @import "ui/objects/*.*";
 
 
@@ -125,12 +124,13 @@
 // /*------------------------------------*\
 //     #TRUMPS
 // \*------------------------------------*/
-@import "../../../bower_components/inuit-widths/_trumps.widths";
-@import "../../../bower_components/inuit-widths-responsive/_trumps.widths-responsive";
-@import "../../../bower_components/inuit-spacing/_trumps.spacing";
-@import "../../../bower_components/inuit-spacing-responsive/_trumps.spacing-responsive";
-@import "../../../bower_components/inuit-print/_trumps.print";
-@import "../../../bower_components/genesis-helper/_trumps.helper";
+@import "inuit-clearfix/_trumps.clearfix";
+@import "inuit-widths/_trumps.widths";
+@import "inuit-widths-responsive/_trumps.widths-responsive";
+@import "inuit-spacing/_trumps.spacing";
+@import "inuit-spacing-responsive/_trumps.spacing-responsive";
+@import "inuit-print/_trumps.print";
+@import "genesis-helper/_trumps.helper";
 @import "ui/trumps/*.*";