-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 222-masthead
* master: (44 commits) Set up color maps for Decanter and refactor main nav colors to refer to color maps (#420) Move PR template (#416) Fix skiplink target so it doesn't take up space and cause overflow (#415) Release 5.0.1 (#417) Fix CSS grid gaps not displaying on Edge issue and other minor grid related issues (#413) More link fixup (#388) forgot to rebuild .js after final lint fixes (#387) add openNav, closeNav, openSubnav, closeSubnav events (#379) Fix main nav color variants and work with new linting rules (#380) add favicon to style guide (#377) Adjust linters. (#370) update readme.md to match Scott's intro on homepage.md (#371) Update README.md (#369) move the images we need for the styleguide's homepage into kss-assets (#368) Update README.md (#367) Update UPGRADE.md (#363) package.locl.json file is back (#366) Added more to changelog (#364) Update homepage.md (#362) 90 basic webpack (#334) ... # Conflicts: # core/scss/components/index.scss
- Loading branch information
Showing
677 changed files
with
24,969 additions
and
9,415 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,111 @@ | ||
| { | ||
| "extends": "eslint:recommended", | ||
| "env": { | ||
| "browser": true | ||
| extends: "eslint:recommended", | ||
| env: { | ||
| browser: true, | ||
| es6: true | ||
| }, | ||
| "globals": { | ||
| "domready": true | ||
| globals: { | ||
| domready: true | ||
| }, | ||
| "rules": { | ||
| // Errors. | ||
| "array-bracket-spacing": [2, "never"], | ||
| "block-scoped-var": 2, | ||
| "brace-style": [2, "stroustrup", {"allowSingleLine": true}], | ||
| "comma-dangle": [2, "never"], | ||
| "comma-spacing": 2, | ||
| "comma-style": [2, "last"], | ||
| "computed-property-spacing": [2, "never"], | ||
| "curly": [2, "all"], | ||
| "eol-last": 2, | ||
| "eqeqeq": [2, "smart"], | ||
| "guard-for-in": 2, | ||
| "indent": [2, 2, {"SwitchCase": 1}], | ||
| "key-spacing": [2, {"beforeColon": false, "afterColon": true}], | ||
| "keyword-spacing": [2, {"before": true, "after": true}], | ||
| "linebreak-style": [2, "unix"], | ||
| "lines-around-comment": [2, {"beforeBlockComment": true, "afterBlockComment": false}], | ||
| "new-parens": 2, | ||
| "no-array-constructor": 2, | ||
| "no-caller": 2, | ||
| "no-catch-shadow": 2, | ||
| "no-eval": 2, | ||
| "no-extend-native": 2, | ||
| "no-extra-bind": 2, | ||
| "no-extra-parens": [2, "functions"], | ||
| "no-implied-eval": 2, | ||
| "no-iterator": 2, | ||
| "no-label-var": 2, | ||
| "no-labels": 2, | ||
| "no-lone-blocks": 2, | ||
| "no-loop-func": 2, | ||
| "no-multi-spaces": 2, | ||
| "no-multi-str": 2, | ||
| "no-native-reassign": 2, | ||
| "no-nested-ternary": 2, | ||
| "no-new-func": 2, | ||
| "no-new-object": 2, | ||
| "no-new-wrappers": 2, | ||
| "no-octal-escape": 2, | ||
| "no-process-exit": 2, | ||
| "no-proto": 2, | ||
| "no-return-assign": 2, | ||
| "no-script-url": 2, | ||
| "no-sequences": 2, | ||
| "no-shadow-restricted-names": 2, | ||
| "no-spaced-func": 2, | ||
| "no-trailing-spaces": 2, | ||
| "no-undef-init": 2, | ||
| "no-undefined": 2, | ||
| "no-unused-expressions": 2, | ||
| "no-unused-vars": [2, {"vars": "all", "args": "none"}], | ||
| "no-with": 2, | ||
| "object-curly-spacing": [2, "never"], | ||
| "one-var": [2, "never"], | ||
| "quote-props": [2, "consistent-as-needed"], | ||
| "quotes": [2, "single", "avoid-escape"], | ||
| "semi": [2, "always"], | ||
| "semi-spacing": [2, {"before": false, "after": true}], | ||
| "space-before-blocks": [2, "always"], | ||
| "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}], | ||
| "space-in-parens": [2, "never"], | ||
| "space-infix-ops": 2, | ||
| "space-unary-ops": [2, { "words": true, "nonwords": false }], | ||
| "spaced-comment": [2, "always"], | ||
| "strict": [2, "function"], | ||
| "yoda": [2, "never"], | ||
| // Warnings. | ||
| "max-nested-callbacks": [1, 3], | ||
| "valid-jsdoc": [1, { | ||
| "prefer": { | ||
| "returns": "return", | ||
| "property": "prop" | ||
| parserOptions: { | ||
| ecmaVersion: 6, | ||
| sourceType: "module", | ||
| ecmaFeatures: { | ||
| arrowFunctions: true, | ||
| blockBindings: true, | ||
| classes: true, | ||
| defaultParameters: true, | ||
| destructuring: true, | ||
| forOf: true, | ||
| generators: true, | ||
| objectLiteralComputedProperties: true, | ||
| objectLiteralDuplicateProperties: true, | ||
| objectLiteralShorthandMethods: true, | ||
| objectLiteralShorthandProperties: true, | ||
| regexUFlag: true, | ||
| regexYFlag: true, | ||
| restParams: true, | ||
| spread: true, | ||
| superInFunctions: true, | ||
| templateStrings: true, | ||
| unicodeCodePointEscapes: true, | ||
| globalReturn: true | ||
| } | ||
| }, | ||
| rules: { | ||
| max-len: [2, 120, 2, {"ignoreUrls": true}], | ||
| array-bracket-spacing: [2, "never"], | ||
| block-scoped-var: 2, | ||
| brace-style: [2, "stroustrup", {"allowSingleLine": true}], | ||
| comma-dangle: [2, "never"], | ||
| comma-spacing: 2, | ||
| comma-style: [2, "last"], | ||
| computed-property-spacing: [2, "never"], | ||
| curly: [2, "all"], | ||
| eol-last: 2, | ||
| eqeqeq: [2, "smart"], | ||
| guard-for-in: 2, | ||
| indent: [2, 2, {"SwitchCase": 1}], | ||
| key-spacing: [2, {"beforeColon": false, "afterColon": true}], | ||
| keyword-spacing: [2, {"before": true, "after": true}], | ||
| linebreak-style: [2, "unix"], | ||
| lines-around-comment: [2, {"beforeBlockComment": true, "afterBlockComment": false}], | ||
| new-parens: 2, | ||
| no-array-constructor: 2, | ||
| no-caller: 2, | ||
| no-catch-shadow: 2, | ||
| no-eval: 2, | ||
| no-extend-native: 2, | ||
| no-extra-bind: 2, | ||
| no-extra-parens: [2, "functions"], | ||
| no-implied-eval: 2, | ||
| no-iterator: 2, | ||
| no-label-var: 2, | ||
| no-labels: 2, | ||
| no-lone-blocks: 2, | ||
| no-loop-func: 2, | ||
| no-multi-spaces: 2, | ||
| no-multi-str: 2, | ||
| no-native-reassign: 2, | ||
| no-nested-ternary: 2, | ||
| no-new-func: 2, | ||
| no-new-object: 2, | ||
| no-new-wrappers: 2, | ||
| no-octal-escape: 2, | ||
| no-process-exit: 2, | ||
| no-proto: 2, | ||
| no-return-assign: 2, | ||
| no-script-url: 2, | ||
| no-sequences: 2, | ||
| no-shadow-restricted-names: 2, | ||
| no-spaced-func: 2, | ||
| no-trailing-spaces: 2, | ||
| no-undef-init: 2, | ||
| no-undefined: 2, | ||
| no-unused-expressions: 2, | ||
| no-unused-vars: [2, {"vars": "all", "args": "none"}], | ||
| no-with: 2, | ||
| object-curly-spacing: [2, "never"], | ||
| one-var: [2, "never"], | ||
| quote-props: [2, "consistent-as-needed"], | ||
| quotes: [2, "single", "avoid-escape"], | ||
| semi: [2, "always"], | ||
| semi-spacing: [2, {"before": false, "after": true}], | ||
| space-before-blocks: [2, "always"], | ||
| space-before-function-paren: [2, {"anonymous": "always", "named": "never"}], | ||
| space-in-parens: [2, "never"], | ||
| space-infix-ops: 2, | ||
| space-unary-ops: [2, { "words": true, "nonwords": false }], | ||
| spaced-comment: [2, "always"], | ||
| strict: [2, "function"], | ||
| yoda: [2, "never"], | ||
| max-nested-callbacks: [1, 3], | ||
| valid-jsdoc: [1, { | ||
| prefer: { | ||
| returns: "return", | ||
| property: "prop" | ||
| }, | ||
| "requireReturn": false | ||
| requireReturn: false | ||
| }] | ||
| } | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 9.10.1 | ||
| 10.15.1 |
Oops, something went wrong.