Merge pull request #74 from wwwednesday/master

 ESlint config and sass folders structure updates

Author: akella

generators/app/templates/eslintrc

@@ -5,36 +5,12 @@
     "node": true,
     "jquery": true
   },
-  "extends": ["airbnb-base", "prettier"],
   "plugins": [
     "dollar-sign"
   ],
+  "extends": ["airbnb-base", "prettier"],
   "rules": {
-    "no-undef": 1,
-    "no-unused-vars": 1,
-    "eqeqeq": [2, "smart"],
-    "no-floating-decimal": 2,
-    "no-duplicate-imports": 2,
-    "no-else-return": 2,
-    "no-multi-spaces": [2, {
-      "exceptions": {
-        "ImportDeclaration": true,
-        "VariableDeclarator": true
-      }
-    }],
-    "no-multi-str": 2,
-    "camelcase": 1,
-    "eol-last": 1,
-    "indent": [2, 2, {
-      "SwitchCase": 1,
-      "VariableDeclarator": 1
-    }],
-    "quotes": [2, "single", "avoid-escape"],
-    "semi": [2, "always"],
-    "space-before-blocks": 2,
-    "space-before-function-paren": [2, "never"],
-    "constructor-super": 2,
-    "arrow-spacing": 2,
-    "dollar-sign/dollar-sign": [2, "ignoreProperties"]
+    "dollar-sign/dollar-sign": [2, "ignoreProperties"],
+    "no-plusplus": ["error", { "allowForLoopAfterthoughts": true }]
   }
 }

generators/app/templates/src/sass/_common.sass

@@ -1,5 +1,5 @@
 body
-	background: #FFF
-	+css-lock(16, 50, 600, 1000)
+	background: #ff0
+	font-size: 200px
+	// +css-lock(16, 50, 600, 1000)
 	line-height: 1.4
-

generators/app/templates/src/sass/_main.sass

@@ -1,8 +1,12 @@
 // done by riverco.de
-@import helpers/all<% if (sprites.indexOf('iconfont') > -1 ) { %>
+@import helpers/index<% if (sprites.indexOf('iconfont') > -1 ) { %>
 @import generated/iconfont<% } %><% if (sprites.indexOf('svg') > -1 ) { %>
 @import generated/sprite-svg<% } %><% if (sprites.indexOf('png') > -1 ) { %>
 @import generated/sprite-png<% } %>
+@import generated/index
+@import base/index
+@import lib/index
 @import common
-@import layouts
-@import main
+@import components/index
+@import containers/index
+@import pages/index

generators/app/templates/src/sass/app.sass

@@ -0,0 +1,2 @@
+@import reset
+@import typography

generators/app/templates/src/sass/helpers/_reset.sass renamed to generators/app/templates/src/sass/base/_reset.sass

@@ -0,0 +1,10 @@
+.icon-facebook {
+  width: 0.53em;
+  height: 1em;
+  fill: initial;
+}
+.icon-facebook2 {
+  width: 0.53em;
+  height: 1em;
+  fill: initial;
+}

generators/app/templates/src/sass/_layouts.sass renamed to generators/app/templates/src/sass/base/_typography.sass

@@ -0,0 +1 @@
+@import sprite-svg

generators/app/templates/src/sass/base/index.sass

@@ -1,3 +1,3 @@
 @import mixins
 @import helpers
-@import reset
+@import variables

generators/app/templates/src/sass/components/index.sass

@@ -0,0 +1,3 @@
+// @import owl
+// @import slick
+// @import slick-theme