Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 3 additions & 27 deletions generators/app/templates/eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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 }]
}
}
6 changes: 3 additions & 3 deletions generators/app/templates/src/sass/_common.sass
Original file line number Diff line number Diff line change
@@ -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

3 changes: 0 additions & 3 deletions generators/app/templates/src/sass/_main.sass

This file was deleted.

10 changes: 7 additions & 3 deletions generators/app/templates/src/sass/app.sass
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions generators/app/templates/src/sass/base/index.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import reset
@import typography
Empty file.
Empty file.
10 changes: 10 additions & 0 deletions generators/app/templates/src/sass/generated/_sprite-svg.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.icon-facebook {
width: 0.53em;
height: 1em;
fill: initial;
}
.icon-facebook2 {
width: 0.53em;
height: 1em;
fill: initial;
}
1 change: 1 addition & 0 deletions generators/app/templates/src/sass/generated/index.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import sprite-svg
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import mixins
@import helpers
@import reset
@import variables
3 changes: 3 additions & 0 deletions generators/app/templates/src/sass/lib/index.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// @import owl
// @import slick
// @import slick-theme
Empty file.