Skip to content

Commit 342d0c3

Browse files
author
Marco Solazzi
committed
Merge branch 'release/4.0.0'
2 parents e27dd32 + 96ee5cb commit 342d0c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1008
-705
lines changed

.eslintrc

Lines changed: 12 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,17 @@
11
{
2-
"env": { // http://eslint.org/docs/user-guide/configuring.html#specifying-environments
3-
"browser": true // browser global variables
2+
"env": {
3+
"browser": false
44
},
5-
"rules": {
6-
/**
7-
* Strict mode
8-
*/
9-
// babel inserts "use strict"; for us
10-
"strict": [2, "never"], // http://eslint.org/docs/rules/strict
11-
12-
/**
13-
* Variables
14-
*/
15-
"no-shadow": 2, // http://eslint.org/docs/rules/no-shadow
16-
"no-shadow-restricted-names": 2, // http://eslint.org/docs/rules/no-shadow-restricted-names
17-
"no-unused-vars": [2, { // http://eslint.org/docs/rules/no-unused-vars
18-
"vars": "local",
19-
"args": "after-used"
20-
}],
21-
"no-use-before-define": 2, // http://eslint.org/docs/rules/no-use-before-define
22-
23-
/**
24-
* Possible errors
25-
*/
26-
"comma-dangle": [2, "never"], // http://eslint.org/docs/rules/comma-dangle
27-
"no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign
28-
"no-console": 1, // http://eslint.org/docs/rules/no-console
29-
"no-debugger": 1, // http://eslint.org/docs/rules/no-debugger
30-
"no-alert": 1, // http://eslint.org/docs/rules/no-alert
31-
"no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition
32-
"no-dupe-keys": 2, // http://eslint.org/docs/rules/no-dupe-keys
33-
"no-duplicate-case": 2, // http://eslint.org/docs/rules/no-duplicate-case
34-
"no-empty": 2, // http://eslint.org/docs/rules/no-empty
35-
"no-ex-assign": 2, // http://eslint.org/docs/rules/no-ex-assign
36-
"no-extra-boolean-cast": 0, // http://eslint.org/docs/rules/no-extra-boolean-cast
37-
"no-extra-semi": 2, // http://eslint.org/docs/rules/no-extra-semi
38-
"no-func-assign": 2, // http://eslint.org/docs/rules/no-func-assign
39-
"no-inner-declarations": 2, // http://eslint.org/docs/rules/no-inner-declarations
40-
"no-invalid-regexp": 2, // http://eslint.org/docs/rules/no-invalid-regexp
41-
"no-irregular-whitespace": 2, // http://eslint.org/docs/rules/no-irregular-whitespace
42-
"no-obj-calls": 2, // http://eslint.org/docs/rules/no-obj-calls
43-
"no-sparse-arrays": 2, // http://eslint.org/docs/rules/no-sparse-arrays
44-
"no-unreachable": 2, // http://eslint.org/docs/rules/no-unreachable
45-
"use-isnan": 2, // http://eslint.org/docs/rules/use-isnan
46-
"block-scoped-var": 2, // http://eslint.org/docs/rules/block-scoped-var
5+
"extends": "airbnb-base",
476

48-
/**
49-
* Best practices
50-
*/
51-
"consistent-return": 2, // http://eslint.org/docs/rules/consistent-return
52-
"curly": [2, "all"], // http://eslint.org/docs/rules/curly
53-
"default-case": 2, // http://eslint.org/docs/rules/default-case
54-
"dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation
55-
"allowKeywords": true
56-
}],
57-
"eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq
58-
"guard-for-in": 2, // http://eslint.org/docs/rules/guard-for-in
59-
"no-caller": 2, // http://eslint.org/docs/rules/no-caller
60-
"no-else-return": 2, // http://eslint.org/docs/rules/no-else-return
61-
"no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null
62-
"no-eval": 2, // http://eslint.org/docs/rules/no-eval
63-
"no-extend-native": 2, // http://eslint.org/docs/rules/no-extend-native
64-
"no-extra-bind": 2, // http://eslint.org/docs/rules/no-extra-bind
65-
"no-fallthrough": 2, // http://eslint.org/docs/rules/no-fallthrough
66-
"no-floating-decimal": 2, // http://eslint.org/docs/rules/no-floating-decimal
67-
"no-implied-eval": 2, // http://eslint.org/docs/rules/no-implied-eval
68-
"no-lone-blocks": 2, // http://eslint.org/docs/rules/no-lone-blocks
69-
"no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func
70-
"no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str
71-
"no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign
72-
"no-new": 2, // http://eslint.org/docs/rules/no-new
73-
"no-new-func": 2, // http://eslint.org/docs/rules/no-new-func
74-
"no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers
75-
"no-octal": 2, // http://eslint.org/docs/rules/no-octal
76-
"no-octal-escape": 2, // http://eslint.org/docs/rules/no-octal-escape
77-
"no-param-reassign": 2, // http://eslint.org/docs/rules/no-param-reassign
78-
"no-proto": 2, // http://eslint.org/docs/rules/no-proto
79-
"no-redeclare": 2, // http://eslint.org/docs/rules/no-redeclare
80-
"no-return-assign": 2, // http://eslint.org/docs/rules/no-return-assign
81-
"no-script-url": 2, // http://eslint.org/docs/rules/no-script-url
82-
"no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare
83-
"no-sequences": 2, // http://eslint.org/docs/rules/no-sequences
84-
"no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal
85-
"no-with": 2, // http://eslint.org/docs/rules/no-with
86-
"radix": 2, // http://eslint.org/docs/rules/radix
87-
"vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top
88-
"wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife
89-
"yoda": 2, // http://eslint.org/docs/rules/yoda
90-
91-
/**
92-
* Style
93-
*/
94-
"indent": [2, 4], // http://eslint.org/docs/rules/indent
95-
"brace-style": [2, // http://eslint.org/docs/rules/brace-style
96-
"1tbs", {
97-
"allowSingleLine": true
98-
}],
99-
"quotes": [
100-
2, "single", "avoid-escape" // http://eslint.org/docs/rules/quotes
101-
],
102-
"camelcase": [2, { // http://eslint.org/docs/rules/camelcase
103-
"properties": "always"
104-
}],
105-
"comma-spacing": [2, { // http://eslint.org/docs/rules/comma-spacing
106-
"before": false,
107-
"after": true
108-
}],
109-
"comma-style": [2, "last"], // http://eslint.org/docs/rules/comma-style
110-
"eol-last": 0, // http://eslint.org/docs/rules/eol-last
111-
"func-names": 1, // http://eslint.org/docs/rules/func-names
112-
"key-spacing": [2, { // http://eslint.org/docs/rules/key-spacing
113-
"beforeColon": false,
114-
"afterColon": true
115-
}],
116-
"new-cap": [2, { // http://eslint.org/docs/rules/new-cap
117-
"newIsCap": true
118-
}],
119-
"no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines
120-
"max": 3
121-
}],
122-
"no-nested-ternary": 2, // http://eslint.org/docs/rules/no-nested-ternary
123-
"no-new-object": 2, // http://eslint.org/docs/rules/no-new-object
124-
"no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func
125-
"no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces
126-
"no-extra-parens": [2, "functions"], // http://eslint.org/docs/rules/no-extra-parens
127-
"no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle
128-
"one-var": [2, {
129-
"var": "always", // Exactly one var declaration per function
130-
"let": "always", // Exactly one let declaration per block
131-
"const": "never" // Exactly one declarator per const declaration per block
132-
}], // http://eslint.org/docs/rules/one-var
133-
"padded-blocks": 0, // http://eslint.org/docs/rules/padded-blocks
134-
"semi": [2, "always"], // http://eslint.org/docs/rules/semi
135-
"semi-spacing": [2, { // http://eslint.org/docs/rules/semi-spacing
136-
"before": false,
137-
"after": true
138-
}],
139-
"space-after-keywords": 2, // http://eslint.org/docs/rules/space-after-keywords
140-
"space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks
141-
"space-before-function-paren": [2, {"anonymous": "always", "named": "never"}], // http://eslint.org/docs/rules/space-before-function-paren
142-
"space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops
143-
"space-return-throw-case": 2, // http://eslint.org/docs/rules/space-return-throw-case
144-
"spaced-comment": 0
7+
"rules": {
8+
"indent": [2, 4],
9+
"no-multiple-empty-lines": [2, { "max": 3 }],
10+
"spaced-comment": 0,
11+
"comma-dangle": [2, "never"],
12+
"eol-last": [1, "never"],
13+
"padded-blocks": [1, { "classes": "always" }],
14+
"max-len": 0,
15+
"arrow-parens": [1, "always"]
14516
}
14617
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,4 @@ www/*
119119
!www/favicon.ico
120120
var/tmp
121121
_tmp
122+
build/gulp-config/*.local.js

.scss-lint.yml

Lines changed: 175 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,182 @@ linters:
2222
enabled: true
2323
class_convention: hyphenated_BEM
2424

25+
IdSelector:
26+
enabled: false
27+
2528
PropertySortOrder:
26-
order: smacss
29+
ignore_unspecified: true
30+
order:
31+
- position
32+
- top
33+
- right
34+
- bottom
35+
- left
36+
- z-index
37+
38+
- display
39+
- opacity
40+
- visibility
41+
- float
42+
- clear
43+
- overflow
44+
- overflow-x
45+
- overflow-y
46+
- clip
47+
- zoom
48+
- flex-direction
49+
- flex-order
50+
- flex-pack
51+
- flex-align
52+
53+
- box-sizing
54+
- width
55+
- min-width
56+
- max-width
57+
- height
58+
- min-height
59+
- max-height
60+
- margin
61+
- margin-top
62+
- margin-right
63+
- margin-bottom
64+
- margin-left
65+
- padding
66+
- padding-top
67+
- padding-right
68+
- padding-bottom
69+
- padding-left
70+
- border
71+
- border-width
72+
- border-style
73+
- border-color
74+
- border-top
75+
- border-top-width
76+
- border-top-style
77+
- border-top-color
78+
- border-right
79+
- border-right-width
80+
- border-right-style
81+
- border-right-color
82+
- border-bottom
83+
- border-bottom-width
84+
- border-bottom-style
85+
- border-bottom-color
86+
- border-left
87+
- border-left-width
88+
- border-left-style
89+
- border-left-color
90+
- border-radius
91+
- border-top-left-radius
92+
- border-top-right-radius
93+
- border-bottom-right-radius
94+
- border-bottom-left-radius
95+
- border-collapse
96+
- border-image
97+
- border-image-source
98+
- border-image-slice
99+
- border-image-width
100+
- border-image-outset
101+
- border-image-repeat
102+
- border-spacing
103+
104+
- table-layout
105+
- empty-cells
106+
- caption-side
107+
- list-style
108+
- list-style-position
109+
- list-style-type
110+
- list-style-image
111+
112+
- background
113+
- background-color
114+
- background-image
115+
- background-repeat
116+
- background-attachment
117+
- background-position
118+
- background-position-x
119+
- background-position-y
120+
- background-clip
121+
- background-origin
122+
- background-size
123+
124+
- color
125+
- outline
126+
- outline-width
127+
- outline-style
128+
- outline-color
129+
- outline-offset
130+
- box-decoration-break
131+
- box-shadow
132+
133+
- font
134+
- font-family
135+
- font-size
136+
- font-weight
137+
- font-style
138+
- font-variant
139+
- font-size-adjust
140+
- font-stretch
141+
- font-effect
142+
- font-emphasize
143+
- font-emphasize-position
144+
- font-emphasize-style
145+
- font-smooth
146+
- line-height
147+
- text-align
148+
- text-align-last
149+
- vertical-align
150+
- white-space
151+
- text-decoration
152+
- text-emphasis
153+
- text-emphasis-color
154+
- text-emphasis-style
155+
- text-emphasis-position
156+
- text-indent
157+
- text-justify
158+
- letter-spacing
159+
- word-spacing
160+
- text-outline
161+
- text-overflow
162+
- text-overflow-ellipsis
163+
- text-overflow-mode
164+
- text-shadow
165+
- text-transform
166+
- text-wrap
167+
- word-wrap
168+
- word-break
169+
- tab-size
170+
- hyphens
171+
172+
- content
173+
- quotes
174+
- counter-reset
175+
- counter-increment
176+
- resize
177+
- cursor
178+
- user-select
179+
- nav-index
180+
- nav-up
181+
- nav-right
182+
- nav-down
183+
- nav-left
184+
- pointer-events
185+
186+
- transform
187+
- transform-origin
188+
- animation
189+
- animation-name
190+
- animation-duration
191+
- animation-play-state
192+
- animation-timing-function
193+
- animation-delay
194+
- animation-iteration-count
195+
- animation-direction
196+
- transition
197+
- transition-delay
198+
- transition-timing-function
199+
- transition-duration
200+
- transition-property
27201

28202
LeadingZero:
29203
style: include_zero

.stylelintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
application/assets/vendors/
2+
node_modules/

0 commit comments

Comments
 (0)