From e1baf85be2919a57e566699f74c977b7ae41223c Mon Sep 17 00:00:00 2001 From: Michael Maat Date: Mon, 19 Jul 2021 20:23:27 +0200 Subject: [PATCH 1/2] Update SCSS and disable some linting conflicting with prettier --- .prettierrc | 5 + .stylelintrc.json | 59 - gulpfile.js | 2 +- package-lock.json | 2108 +++++++++------------------- package.json | 5 +- scss/components/content.scss | 145 +- scss/components/dialog.scss | 6 +- scss/components/heading-group.scss | 10 +- scss/components/popover.scss | 46 +- scss/components/tag.scss | 11 +- scss/controls/button.scss | 175 ++- scss/controls/checkbox.scss | 115 +- scss/controls/drop-down-menu.scss | 35 +- scss/controls/input-stepper.scss | 24 +- scss/controls/password-input.scss | 42 +- scss/controls/text-input.scss | 31 +- scss/layouts/collection.scss | 2 - scss/layouts/form.scss | 35 +- scss/layouts/layout.scss | 108 +- scss/layouts/menu-view.scss | 6 +- scss/layouts/page.scss | 6 +- scss/reset/focus.scss | 1 - scss/reset/inputs.scss | 4 +- scss/utilities/align.scss | 117 +- scss/utilities/get-svg-uri.scss | 17 +- scss/utilities/hidpi.scss | 3 +- scss/utilities/media.scss | 11 +- scss/variables/box-shadows.scss | 2 +- scss/variables/colors.scss | 12 +- scss/variables/font-families.scss | 9 +- scss/variables/font-weights.scss | 2 +- scss/variables/input.scss | 39 +- scss/variables/sizes.scss | 10 +- scss/vendors/highlight.scss | 269 +++- site/_layouts/default.html | 172 ++- site/docs/_controls/button.md | 12 + 36 files changed, 1610 insertions(+), 2046 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..2cba6fb --- /dev/null +++ b/.prettierrc @@ -0,0 +1,5 @@ +{ + "tabWidth": 2, + "useTabs": true, + "singleQuote": true +} diff --git a/.stylelintrc.json b/.stylelintrc.json index fb26144..53cbcfa 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -22,19 +22,15 @@ "declaration-colon-space-before": "never", "declaration-colon-space-after": "always", "selector-combinator-space-after": "always", - "selector-combinator-space-before": "always", "no-duplicate-selectors": true, "declaration-block-no-duplicate-properties": true, "declaration-empty-line-before": "never", "length-zero-no-unit": true, "value-list-comma-space-before": "never", - "value-list-comma-space-after": "always", "no-eol-whitespace": true, "selector-max-empty-lines": 0, "block-opening-brace-newline-after": "always", - "block-opening-brace-space-before": "always", "block-closing-brace-newline-before": "always", - "block-closing-brace-newline-after": "always", "declaration-block-single-line-max-declarations": 1, "declaration-block-semicolon-newline-before": "never-multi-line", "declaration-block-semicolon-newline-after": "always", @@ -43,64 +39,9 @@ "max-empty-lines": 1, "no-extra-semicolons": true, "no-missing-end-of-source-newline": true, - "rule-empty-line-before": "always", "indentation": "tab", "plugin/declaration-block-no-ignored-properties": true, "selector-pseudo-element-colon-notation": "double", - "scale-unlimited/declaration-strict-value": [ - [ - "top", - "right", - "bottom", - "left", - "margin", - "margin-top", - "margin-right", - "margin-bottom", - "margin-left", - "/padding/", - "/width/", - "/height/", - "border", - "border-top", - "border-right", - "border-bottom", - "border-left", - "border-radius", - "border-width", - "box-shadow", - "/color/", - "font-family", - "font-size", - "line-height", - "opacity" - ], - { - "ignoreKeywords": { - "top": ["0", "auto", "100%", "50%", "100vh"], - "right": ["0", "auto", "100%", "50%", "100vw"], - "bottom": ["0", "auto", "100%", "50%", "100vh"], - "left": ["0", "auto", "100%", "50%", "100vw"], - "margin": ["0"], - "margin-top": ["0"], - "margin-right": ["0", "auto"], - "margin-bottom": ["0"], - "margin-left": ["0", "auto"], - "/padding/": "0", - "/width/": ["100%", "0", "auto", "none", "min-content"], - "/height/": ["100%", "none", "auto", "0", "100vh", "min-content"], - "border": ["none", "0"], - "border-top": ["none", "0"], - "border-right": ["none", "0"], - "border-bottom": ["none", "0"], - "border-left": ["none", "0"], - "border-radius": ["100%", "50%", "0"], - "box-shadow": "none", - "/color/": ["currentColor", "transparent", "inherit", "none"], - "opacity": "0" - } - } - ], "order/order": [ "dollar-variables", "custom-properties", diff --git a/gulpfile.js b/gulpfile.js index 4550d89..bb5d030 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,7 +5,7 @@ const gulp = require('gulp'); const jsonImporter = require('node-sass-json-importer'); const log = require('fancy-log'); const postcss = require('gulp-postcss'); -const sass = require('gulp-sass'); +const sass = require('gulp-sass')(require('sass')); const stylelint = require('stylelint'); const tildeImporter = require('node-sass-tilde-importer'); diff --git a/package-lock.json b/package-lock.json index 563b905..1d584ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,44 +5,53 @@ "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", + "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", "requires": { - "@babel/highlight": "^7.10.4" + "@babel/highlight": "^7.14.5" } }, + "@babel/compat-data": { + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz", + "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==" + }, "@babel/core": { - "version": "7.11.1", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz", - "integrity": "sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==", - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.0", - "@babel/helper-module-transforms": "^7.11.0", - "@babel/helpers": "^7.10.4", - "@babel/parser": "^7.11.1", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.11.0", - "@babel/types": "^7.11.0", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz", + "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.14.5", + "@babel/helper-compilation-targets": "^7.14.5", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helpers": "^7.14.6", + "@babel/parser": "^7.14.6", + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", + "gensync": "^1.0.0-beta.2", "json5": "^2.1.2", - "lodash": "^4.17.19", - "resolve": "^1.3.2", - "semver": "^5.4.1", + "semver": "^6.3.0", "source-map": "^0.5.0" }, "dependencies": { "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", "requires": { "minimist": "^1.2.5" } }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -51,11 +60,11 @@ } }, "@babel/generator": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz", - "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz", + "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==", "requires": { - "@babel/types": "^7.11.0", + "@babel/types": "^7.14.5", "jsesc": "^2.5.1", "source-map": "^0.5.0" }, @@ -67,153 +76,183 @@ } } }, + "@babel/helper-compilation-targets": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", + "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==", + "requires": { + "@babel/compat-data": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "browserslist": "^4.16.6", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, "@babel/helper-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", - "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", + "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", "requires": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-get-function-arity": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-get-function-arity": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", - "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", + "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "^7.14.5" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz", + "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==", + "requires": { + "@babel/types": "^7.14.5" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz", - "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==", + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz", + "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==", "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "^7.14.5" } }, "@babel/helper-module-imports": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", - "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz", + "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==", "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "^7.14.5" } }, "@babel/helper-module-transforms": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz", - "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz", + "integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==", "requires": { - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-simple-access": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/template": "^7.10.4", - "@babel/types": "^7.11.0", - "lodash": "^4.17.19" + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-simple-access": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.5", + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-optimise-call-expression": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", - "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz", + "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==", "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "^7.14.5" } }, "@babel/helper-replace-supers": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", - "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", + "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.10.4", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/helper-simple-access": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", - "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz", + "integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==", "requires": { - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/types": "^7.14.5" } }, "@babel/helper-split-export-declaration": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", - "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", + "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "^7.14.5" } }, "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz", + "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==" + }, + "@babel/helper-validator-option": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", + "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==" }, "@babel/helpers": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", - "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz", + "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==", "requires": { - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/template": "^7.14.5", + "@babel/traverse": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.11.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz", - "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==" + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz", + "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==" }, "@babel/template": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", - "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", + "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/parser": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.14.5", + "@babel/types": "^7.14.5" } }, "@babel/traverse": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz", - "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==", - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.0", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.11.0", - "@babel/types": "^7.11.0", + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz", + "integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.14.5", + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-hoist-variables": "^7.14.5", + "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/parser": "^7.14.7", + "@babel/types": "^7.14.5", "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" + "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz", + "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==", "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", + "@babel/helper-validator-identifier": "^7.14.5", "to-fast-properties": "^2.0.0" } }, @@ -232,28 +271,28 @@ "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" }, "@types/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==", "requires": { "@types/minimatch": "*", "@types/node": "*" } }, "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" }, "@types/node": { - "version": "14.6.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.0.tgz", - "integrity": "sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==" + "version": "16.3.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.3.tgz", + "integrity": "sha512-8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ==" }, "@types/unist": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", - "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", + "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" }, "@types/vfile": { "version": "3.0.2", @@ -273,12 +312,6 @@ "vfile-message": "*" } }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -296,9 +329,9 @@ "dev": true }, "ajv": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", - "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -306,12 +339,6 @@ "uri-js": "^4.2.2" } }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, "ansi-colors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", @@ -379,60 +406,12 @@ "buffer-equal": "^1.0.0" } }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, "archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -574,21 +553,6 @@ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -629,12 +593,6 @@ "integrity": "sha1-dhfBkXQB/Yykooqtzj266Yr+tDI=", "dev": true }, - "async-foreach": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", - "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", - "dev": true - }, "async-limiter": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", @@ -650,12 +608,6 @@ "async-done": "^1.2.2" } }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -682,18 +634,6 @@ } } }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", - "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", - "dev": true - }, "axios": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz", @@ -733,9 +673,9 @@ "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==" }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "base": { "version": "0.11.2", @@ -788,9 +728,9 @@ } }, "base64-arraybuffer": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", - "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", + "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=", "dev": true }, "base64id": { @@ -805,15 +745,6 @@ "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", "dev": true }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", @@ -845,15 +776,6 @@ "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==", "dev": true }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, - "requires": { - "inherits": "~2.0.0" - } - }, "bourbon": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-5.1.0.tgz", @@ -1034,9 +956,9 @@ } }, "browser-sync-client": { - "version": "2.26.12", - "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.26.12.tgz", - "integrity": "sha512-bEBDRkufKxrIfjOsIB1FN9itUEXr2oLtz1AySgSSr80K2AWzmtoYnxtVASx/i40qFrSdeI31pNvdCjHivihLVA==", + "version": "2.27.4", + "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.4.tgz", + "integrity": "sha512-l0krAGZnpLaD+tUYdM25WeS4FP73ZoPeaxlVzOvmtL9uKSlvpmywsnDwa3PJzc3ubmDPAcD74ifJjl6MmVksXw==", "dev": true, "requires": { "etag": "1.8.1", @@ -1046,28 +968,29 @@ } }, "browser-sync-ui": { - "version": "2.26.12", - "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.26.12.tgz", - "integrity": "sha512-PkAJNf/TfCFTCkQUfXplR2Kp/+/lbCWFO9lrgLZsmxIhvMLx2pYZFBbTBIaem8qjXhld9ZcESUC8EdU5VWFJgQ==", + "version": "2.27.4", + "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.4.tgz", + "integrity": "sha512-E58Mb6ycz57Nm393oqVJj4jxuLJH3MhZnY8AV+zd9LsNVGZjrKRNNIw5JPYYguyb37ZjLjq2x4u+38mRv3Sb7g==", "dev": true, "requires": { "async-each-series": "0.1.1", "connect-history-api-fallback": "^1", "immutable": "^3", "server-destroy": "1.0.1", - "socket.io-client": "^2.0.4", + "socket.io-client": "^2.4.0", "stream-throttle": "^0.1.3" } }, "browserslist": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz", - "integrity": "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==", + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", "requires": { - "caniuse-lite": "^1.0.30001111", - "electron-to-chromium": "^1.3.523", - "escalade": "^3.0.2", - "node-releases": "^1.1.60" + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", + "escalade": "^3.1.1", + "node-releases": "^1.1.71" } }, "bs-recipes": { @@ -1116,6 +1039,16 @@ "unset-value": "^1.0.0" } }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, "call-me-maybe": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", @@ -1164,20 +1097,14 @@ } }, "caniuse-lite": { - "version": "1.0.30001116", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001116.tgz", - "integrity": "sha512-f2lcYnmAI5Mst9+g0nkMIznFGsArRmZ0qU+dnq8l91hymdc2J3SFbiPhOJEeDqC1vtE8nc1qNQyklzB8veJefQ==" - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true + "version": "1.0.30001245", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz", + "integrity": "sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==" }, "ccount": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz", - "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", + "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==" }, "chalk": { "version": "2.4.2", @@ -1446,18 +1373,9 @@ "dev": true }, "colorette": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", - "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==" - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" }, "commander": { "version": "2.20.3", @@ -1566,16 +1484,10 @@ "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", "dev": true }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "requires": { "safe-buffer": "~5.1.1" }, @@ -1599,13 +1511,21 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "copy-props": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", - "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz", + "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==", "dev": true, "requires": { - "each-props": "^1.3.0", - "is-plain-object": "^2.0.1" + "each-props": "^1.3.2", + "is-plain-object": "^5.0.0" + }, + "dependencies": { + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true + } } }, "core-util-is": { @@ -1625,16 +1545,6 @@ "parse-json": "^4.0.0" } }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -1653,21 +1563,12 @@ "type": "^1.0.1" } }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "decamelize": { @@ -1765,18 +1666,6 @@ } } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -1809,6 +1698,12 @@ "path-type": "^3.0.0" } }, + "dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true + }, "dom-serializer": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", @@ -1819,14 +1714,14 @@ }, "dependencies": { "domelementtype": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz", - "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" }, "entities": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", - "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" } } }, @@ -1853,9 +1748,9 @@ } }, "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", "requires": { "is-obj": "^2.0.0" } @@ -1924,22 +1819,12 @@ } }, "eazy-logger": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz", - "integrity": "sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=", - "dev": true, - "requires": { - "tfunk": "^3.0.1" - } - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.1.0.tgz", + "integrity": "sha512-/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ==", "dev": true, "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "tfunk": "^4.0.0" } }, "ee-first": { @@ -1949,9 +1834,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.539", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.539.tgz", - "integrity": "sha512-rM0LWDIstdqfaRUADZetNrL6+zd/0NBmavbMEhBXgc2u/CC1d1GaDyN5hho29fFvBiOVFwrSWZkzmNcZnCEDog==" + "version": "1.3.779", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.779.tgz", + "integrity": "sha512-nreave0y/1Qhmo8XtO6C/LpawNyC6U26+q7d814/e+tIqUK073pM+4xW7WUXyqCRa5K4wdxHmNMBAi8ap9nEew==" }, "emoji-regex": { "version": "7.0.3", @@ -1987,6 +1872,12 @@ "ws": "~3.3.1" }, "dependencies": { + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true + }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -2035,33 +1926,50 @@ } }, "engine.io-client": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.3.tgz", - "integrity": "sha512-0NGY+9hioejTEJCaSJZfWZLk4FPI9dN+1H1C4+wj2iuFba47UgZbJzfWs4aNFajnX/qAaYKbe2lLTfEEWzCmcw==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz", + "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==", "dev": true, "requires": { "component-emitter": "~1.3.0", "component-inherit": "0.0.3", - "debug": "~4.1.0", + "debug": "~3.1.0", "engine.io-parser": "~2.2.0", "has-cors": "1.1.0", "indexof": "0.0.1", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "ws": "~6.1.0", - "xmlhttprequest-ssl": "~1.5.4", + "parseqs": "0.0.6", + "parseuri": "0.0.6", + "ws": "~7.4.2", + "xmlhttprequest-ssl": "~1.6.2", "yeast": "0.1.2" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } } }, "engine.io-parser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz", - "integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz", + "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==", "dev": true, "requires": { "after": "0.8.2", "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.5", + "base64-arraybuffer": "0.1.4", "blob": "0.0.5", "has-binary2": "~1.0.2" } @@ -2124,9 +2032,9 @@ } }, "escalade": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz", - "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-html": { "version": "1.0.3", @@ -2279,9 +2187,9 @@ }, "dependencies": { "type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz", - "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz", + "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==", "dev": true } } @@ -2369,12 +2277,6 @@ } } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, "fancy-log": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", @@ -2491,9 +2393,9 @@ } }, "find-parent-dir": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz", - "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=" + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz", + "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==" }, "find-up": { "version": "2.1.0", @@ -2592,9 +2494,9 @@ } }, "follow-redirects": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", - "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz", + "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==", "dev": true }, "for-in": { @@ -2611,23 +2513,6 @@ "for-in": "^1.0.1" } }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", @@ -2679,90 +2564,15 @@ "nan": "^2.12.1" } }, - "fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "gaze": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "dev": true, - "requires": { - "globule": "^1.0.0" - } + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==" + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" }, "get-caller-file": { "version": "1.0.3", @@ -2770,6 +2580,17 @@ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, "get-stdin": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", @@ -2780,19 +2601,10 @@ "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2977,17 +2789,6 @@ "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=" }, - "globule": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz", - "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", - "dev": true, - "requires": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" - } - }, "glogg": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz", @@ -3006,19 +2807,19 @@ } }, "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" }, "gulp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.0.tgz", - "integrity": "sha1-lXZsYB2t5Kd+0+eyttwDiBtZY2Y=", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz", + "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==", "dev": true, "requires": { - "glob-watcher": "^5.0.0", - "gulp-cli": "^2.0.0", - "undertaker": "^1.0.0", + "glob-watcher": "^5.0.3", + "gulp-cli": "^2.2.0", + "undertaker": "^1.2.1", "vinyl-fs": "^3.0.0" }, "dependencies": { @@ -3178,9 +2979,9 @@ } }, "yargs": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz", - "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz", + "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==", "dev": true, "requires": { "camelcase": "^3.0.0", @@ -3195,13 +2996,13 @@ "string-width": "^1.0.2", "which-module": "^1.0.0", "y18n": "^3.2.1", - "yargs-parser": "5.0.0-security.0" + "yargs-parser": "^5.0.1" } }, "yargs-parser": { - "version": "5.0.0-security.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz", - "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz", + "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", "dev": true, "requires": { "camelcase": "^3.0.0", @@ -3224,34 +3025,88 @@ } }, "gulp-sass": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-4.0.2.tgz", - "integrity": "sha512-q8psj4+aDrblJMMtRxihNBdovfzGrXJp1l4JU0Sz4b/Mhsi2DPrKFYCGDwjIWRENs04ELVHxdOJQ7Vs98OFohg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-5.0.0.tgz", + "integrity": "sha512-J0aH0/2N4+2szGCeut0ktGHK0Wg8L9uWivuigrl7xv+nhxozBQRAKLrhnDDaTa3FeUWYtgT8w4RlgdhRy5v16w==", "dev": true, "requires": { - "chalk": "^2.3.0", - "lodash.clonedeep": "^4.3.2", - "node-sass": "^4.8.3", + "chalk": "^4.1.1", + "lodash": "^4.17.20", "plugin-error": "^1.0.1", - "replace-ext": "^1.0.0", - "strip-ansi": "^4.0.0", - "through2": "^2.0.0", - "vinyl-sourcemaps-apply": "^0.2.0" + "replace-ext": "^2.0.0", + "strip-ansi": "^6.0.0", + "transfob": "^1.0.0", + "vinyl-sourcemaps-apply": "^0.2.1" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, - "strip-ansi": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "replace-ext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", + "dev": true + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "has-flag": "^4.0.0" } } } @@ -3265,20 +3120,12 @@ "glogg": "^1.0.0" } }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "dev": true, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "requires": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" + "function-bind": "^1.1.1" } }, "has-ansi": { @@ -3327,15 +3174,9 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", "dev": true }, "has-value": { @@ -3377,9 +3218,9 @@ } }, "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" }, "html-tags": { "version": "2.0.0", @@ -3430,17 +3271,6 @@ "requires-port": "1.x.x" } }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -3513,12 +3343,6 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, - "in-publish": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", - "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", - "dev": true - }, "indent-string": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", @@ -3550,9 +3374,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "interpret": { "version": "1.4.0", @@ -3632,6 +3456,14 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, + "is-core-module": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz", + "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==", + "requires": { + "has": "^1.0.3" + } + }, "is-data-descriptor": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", @@ -3702,12 +3534,6 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, - "is-finite": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", - "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", - "dev": true - }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -3813,12 +3639,6 @@ "resolved": "https://registry.npmjs.org/is-there/-/is-there-4.5.1.tgz", "integrity": "sha512-vIZ7HTXAoRoIwYSsTnxb0sg9L6rth+JOulNcavsbskQkCIWoSM2cjFOWZs4wGziGZER+Xgs/HXiCQZgiL8ppxQ==" }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, "is-unc-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", @@ -3876,38 +3696,20 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "js-base64": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", - "dev": true - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", - "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -3918,12 +3720,6 @@ "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -3935,12 +3731,6 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, "json5": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", @@ -3958,22 +3748,10 @@ "graceful-fs": "^4.1.6" } }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, "just-debounce": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz", - "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz", + "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==", "dev": true }, "kind-of": { @@ -4298,15 +4076,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.isfinite": { "version": "3.3.2", @@ -4336,16 +4108,6 @@ "signal-exit": "^3.0.0" } }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, "make-iterator": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", @@ -4485,18 +4247,18 @@ "dev": true }, "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", "dev": true }, "mime-types": { - "version": "2.1.27", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", - "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", "dev": true, "requires": { - "mime-db": "1.44.0" + "mime-db": "1.48.0" } }, "minimatch": { @@ -4566,10 +4328,11 @@ "dev": true }, "nan": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", - "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", - "dev": true + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "dev": true, + "optional": true }, "nanomatch": { "version": "1.2.13", @@ -4601,273 +4364,10 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, - "node-gyp": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", - "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", - "dev": true, - "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" - }, - "dependencies": { - "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true - } - } - }, "node-releases": { - "version": "1.1.60", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz", - "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==" - }, - "node-sass": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", - "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", - "dev": true, - "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash": "^4.17.15", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.13.2", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "2.2.5", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - } - } + "version": "1.1.73", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", + "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==" }, "node-sass-json-importer": { "version": "4.1.0", @@ -4887,15 +4387,6 @@ "find-parent-dir": "^0.3.0" } }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1" - } - }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -4936,18 +4427,6 @@ "once": "^1.3.2" } }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", @@ -4959,18 +4438,6 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, "object-component": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", @@ -5011,12 +4478,6 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, - "object-path": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz", - "integrity": "sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=", - "dev": true - }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -5026,15 +4487,15 @@ } }, "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" } }, "object.defaults": { @@ -5193,12 +4654,6 @@ } } }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, "os-locale": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", @@ -5208,22 +4663,6 @@ "lcid": "^1.0.0" } }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -5320,22 +4759,16 @@ "dev": true }, "parseqs": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", - "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", - "dev": true, - "requires": { - "better-assert": "~1.0.0" - } + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", + "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==", + "dev": true }, "parseuri": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", - "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", - "dev": true, - "requires": { - "better-assert": "~1.0.0" - } + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", + "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==", + "dev": true }, "parseurl": { "version": "1.3.3", @@ -5364,9 +4797,9 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-root": { "version": "0.1.1", @@ -5398,10 +4831,10 @@ } } }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "dev": true }, "pify": { @@ -5452,9 +4885,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", - "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -5486,9 +4919,9 @@ } }, "postcss-load-config": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz", - "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", + "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { "cosmiconfig": "^5.0.0", @@ -5597,18 +5030,6 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, "pump": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", @@ -5872,24 +5293,15 @@ "dev": true }, "repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", + "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==" }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, "replace-ext": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", @@ -5906,42 +5318,6 @@ "remove-trailing-separator": "^1.1.0" } }, - "request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - } - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5966,10 +5342,11 @@ "integrity": "sha512-aQFi5IxXVegVTfz0hOmXsPSmc8tlPDQOkfatHfPu3Cm6id7UXM4OzXfsaUWJEgV2yrCngsagpIb3wHXPjKAx+Q==" }, "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", "requires": { + "is-core-module": "^2.2.0", "path-parse": "^1.0.6" } }, @@ -6102,160 +5479,112 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, - "sass-graph": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", - "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", + "sass": { + "version": "1.35.2", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.35.2.tgz", + "integrity": "sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==", "dev": true, "requires": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^13.3.2" + "chokidar": ">=3.0.0 <4.0.0" }, "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { - "locate-path": "^3.0.0" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "fill-range": "^7.0.1" } }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "chokidar": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "requires": { - "p-try": "^2.0.0" + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" } }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "p-limit": "^2.0.0" + "to-regex-range": "^5.0.1" } }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "optional": true }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "is-glob": "^4.0.1" } }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true - }, - "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "binary-extensions": "^2.0.0" } }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "picomatch": "^2.2.1" } - } - } - }, - "scss-tokenizer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", - "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "dev": true, - "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "is-number": "^7.0.0" } } } @@ -6604,6 +5933,12 @@ "socket.io-parser": "~3.2.0" }, "dependencies": { + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true + }, "component-emitter": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", @@ -6663,6 +5998,24 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, + "parseqs": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", + "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", + "dev": true, + "requires": { + "better-assert": "~1.0.0" + } + }, + "parseuri": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", + "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", + "dev": true, + "requires": { + "better-assert": "~1.0.0" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -6712,6 +6065,12 @@ "safe-buffer": "~5.1.0", "ultron": "~1.1.0" } + }, + "xmlhttprequest-ssl": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", + "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", + "dev": true } } }, @@ -6722,52 +6081,52 @@ "dev": true }, "socket.io-client": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz", - "integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz", + "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==", "dev": true, "requires": { "backo2": "1.0.2", - "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", - "component-emitter": "1.2.1", - "debug": "~4.1.0", - "engine.io-client": "~3.4.0", + "component-emitter": "~1.3.0", + "debug": "~3.1.0", + "engine.io-client": "~3.5.0", "has-binary2": "~1.0.2", - "has-cors": "1.1.0", "indexof": "0.0.1", - "object-component": "0.0.3", - "parseqs": "0.0.5", - "parseuri": "0.0.5", + "parseqs": "0.0.6", + "parseuri": "0.0.6", "socket.io-parser": "~3.3.0", "to-array": "0.1.4" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } } }, "socket.io-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz", - "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", + "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", "dev": true, "requires": { - "component-emitter": "1.2.1", + "component-emitter": "~1.3.0", "debug": "~3.1.0", "isarray": "2.0.1" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -6809,9 +6168,9 @@ } }, "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, "sparkles": { "version": "1.0.1", @@ -6843,9 +6202,9 @@ } }, "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz", + "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==" }, "specificity": { "version": "0.4.1", @@ -6865,23 +6224,6 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, "stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", @@ -6918,47 +6260,6 @@ "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", "dev": true }, - "stdout-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", - "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", - "dev": true, - "requires": { - "readable-stream": "^2.0.1" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "stream-exhaust": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", @@ -7178,25 +6479,14 @@ "string-width": "^3.0.0" } }, - "tar": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", - "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", - "dev": true, - "requires": { - "block-stream": "*", - "fstream": "^1.0.12", - "inherits": "2" - } - }, "tfunk": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.1.0.tgz", - "integrity": "sha1-OORBT8ZJd9h6/apy+sttKfgve1s=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz", + "integrity": "sha512-eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ==", "dev": true, "requires": { - "chalk": "^1.1.1", - "object-path": "^0.9.0" + "chalk": "^1.1.3", + "dlv": "^1.1.3" }, "dependencies": { "ansi-regex": { @@ -7373,15 +6663,11 @@ "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", "dev": true }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } + "transfob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/transfob/-/transfob-1.0.0.tgz", + "integrity": "sha1-x/wnpbVDCtSGJnrmZtkj90oKsyA=", + "dev": true }, "trim": { "version": "0.0.1", @@ -7394,39 +6680,15 @@ "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=" }, "trim-trailing-lines": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz", - "integrity": "sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz", + "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==" }, "trough": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==" }, - "true-case-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", - "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", - "dev": true, - "requires": { - "glob": "^7.1.2" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, "type": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", @@ -7553,11 +6815,11 @@ } }, "unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz", + "integrity": "sha512-SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA==", "requires": { - "@types/unist": "^2.0.2" + "@types/unist": "^2.0.0" } }, "unist-util-visit": { @@ -7631,9 +6893,9 @@ "dev": true }, "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "requires": { "punycode": "^2.1.0" } @@ -7659,12 +6921,6 @@ "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", "dev": true }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true - }, "v8flags": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", @@ -7689,17 +6945,6 @@ "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", "dev": true }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "vfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz", @@ -7712,9 +6957,9 @@ }, "dependencies": { "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" }, "unist-util-stringify-position": { "version": "1.1.2", @@ -7737,18 +6982,18 @@ "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==" }, "vfile-message": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-3.0.1.tgz", + "integrity": "sha512-gYmSHcZZUEtYpTmaWaFJwsuUD70/rTY4v09COp8TGtOkix6gGxb/a8iTQByIY9ciTk9GwAwIXd/J9OPfM4Bvaw==", "requires": { "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" + "unist-util-stringify-position": "^3.0.0" } }, "vinyl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", - "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", + "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", "dev": true, "requires": { "clone": "^2.1.1", @@ -7873,42 +7118,6 @@ "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "dev": true }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, "window-size": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", @@ -7976,13 +7185,10 @@ } }, "ws": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz", - "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0" - } + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", + "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "dev": true }, "x-is-string": { "version": "0.1.0", @@ -7990,9 +7196,9 @@ "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=" }, "xmlhttprequest-ssl": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", - "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz", + "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==", "dev": true }, "xtend": { @@ -8001,15 +7207,9 @@ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", + "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==", "dev": true }, "yargs": { diff --git a/package.json b/package.json index e68a464..76e7730 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,9 @@ "browser-sync": "2.26.3", "child_process": "1.0.2", "fancy-log": "1.3.3", - "gulp": "4.0.0", + "gulp": "4.0.2", "gulp-postcss": "8.0.0", - "gulp-sass": "4.0.2" + "gulp-sass": "5.0.0", + "sass": "1.35.2" } } diff --git a/scss/components/content.scss b/scss/components/content.scss index d095c56..9cb14a6 100644 --- a/scss/components/content.scss +++ b/scss/components/content.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + $content-table-border-color: $color-ui-30 !default; $content-table-cell-padding-hand-and-smaller: $spacing; @@ -67,123 +69,115 @@ $content-table-cell-padding-lap-and-larger: $spacing * 1.5; } h1 { - .content & { font-weight: bold; line-height: $line-height-40; @include media(0, $range-hand) { - margin-top: $line-height-40 * $font-size-500 / 2; - margin-bottom: $line-height-40 * $font-size-500 / 2; + margin-top: math.div($line-height-40 * $font-size-500, 2); + margin-bottom: math.div($line-height-40 * $font-size-500, 2); font-size: $font-size-500; } @include media($range-lap, false) { - margin-top: $line-height-40 * $font-size-600 / 2; - margin-bottom: $line-height-40 * $font-size-600 / 2; + margin-top: math.div($line-height-40 * $font-size-600, 2); + margin-bottom: math.div($line-height-40 * $font-size-600, 2); font-size: $font-size-600; } } } h2 { - .content & { font-weight: bold; line-height: $line-height-40; @include media(0, $range-hand) { - margin-top: $line-height-40 * $font-size-400 / 2; - margin-bottom: $line-height-40 * $font-size-400 / 2; + margin-top: math.div($line-height-40 * $font-size-400, 2); + margin-bottom: math.div($line-height-40 * $font-size-400, 2); font-size: $font-size-400; } @include media($range-lap, false) { - margin-top: $line-height-40 * $font-size-500 / 2; - margin-bottom: $line-height-40 * $font-size-500 / 2; + margin-top: math.div($line-height-40 * $font-size-500, 2); + margin-bottom: math.div($line-height-40 * $font-size-500, 2); font-size: $font-size-500; } } } h3 { - .content & { font-weight: bold; line-height: $line-height-40; @include media(0, $range-hand) { - margin-top: $line-height-40 * $font-size-300 / 2; - margin-bottom: $line-height-40 * $font-size-300 / 2; + margin-top: math.div($line-height-40 * $font-size-300, 2); + margin-bottom: math.div($line-height-40 * $font-size-300, 2); font-size: $font-size-300; } @include media($range-lap, false) { - margin-top: $line-height-40 * $font-size-400 / 2; - margin-bottom: $line-height-40 * $font-size-400 / 2; + margin-top: math.div($line-height-40 * $font-size-400, 2); + margin-bottom: math.div($line-height-40 * $font-size-400, 2); font-size: $font-size-400; } } } h4 { - .content & { font-weight: bold; line-height: $line-height-40; @include media(0, $range-hand) { - margin-top: $line-height-40 * $font-size-200 / 2; - margin-bottom: $line-height-40 * $font-size-200 / 2; + margin-top: math.div($line-height-40 * $font-size-200, 2); + margin-bottom: math.div($line-height-40 * $font-size-200, 2); font-size: $font-size-200; } @include media($range-lap, false) { - margin-top: $line-height-40 * $font-size-300 / 2; - margin-bottom: $line-height-40 * $font-size-300 / 2; + margin-top: math.div($line-height-40 * $font-size-300, 2); + margin-bottom: math.div($line-height-40 * $font-size-300, 2); font-size: $font-size-300; } } } h5 { - .content & { font-weight: bold; line-height: $line-height-40; @include media(0, $range-hand) { - margin-top: $line-height-40 * $font-size-100 / 2; - margin-bottom: $line-height-40 * $font-size-100 / 2; + margin-top: math.div($line-height-40 * $font-size-100, 2); + margin-bottom: math.div($line-height-40 * $font-size-100, 2); font-size: $font-size-100; } @include media($range-lap, false) { - margin-top: $line-height-40 * $font-size-200 / 2; - margin-bottom: $line-height-40 * $font-size-200 / 2; + margin-top: math.div($line-height-40 * $font-size-200, 2); + margin-bottom: math.div($line-height-40 * $font-size-200, 2); font-size: $font-size-200; } } } h6 { - .content & { font-weight: bold; line-height: $line-height-40; @include media(0, $range-hand) { - margin-top: $line-height-40 * $font-size-90 / 2; - margin-bottom: $line-height-40 * $font-size-90 / 2; + margin-top: math.div($line-height-40 * $font-size-90, 2); + margin-bottom: math.div($line-height-40 * $font-size-90, 2); font-size: $font-size-90; } @include media($range-lap, false) { - margin-top: $line-height-40 * $font-size-100 / 2; - margin-bottom: $line-height-40 * $font-size-100 / 2; + margin-top: math.div($line-height-40 * $font-size-100, 2); + margin-bottom: math.div($line-height-40 * $font-size-100, 2); font-size: $font-size-100; } } } p { - .content & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-100; margin-bottom: $line-height-60 * $font-size-100; @@ -195,7 +189,6 @@ p { } .content--90 & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-90; margin-bottom: $line-height-60 * $font-size-90; @@ -207,7 +200,6 @@ p { } .content--200 & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-200; margin-bottom: $line-height-60 * $font-size-200; @@ -221,7 +213,6 @@ p { ol, ul { - .content & { list-style-position: outside; @@ -234,7 +225,6 @@ ul { } .content--90 & { - @include media(0, $range-hand) { margin-left: $line-height-60 * $font-size-90; } @@ -244,7 +234,6 @@ ul { } .content--200 & { - @include media(0, $range-hand) { margin-left: $line-height-60 * $font-size-200; } @@ -255,23 +244,19 @@ ul { } ol { - .content & { list-style: decimal; } } ul { - .content & { list-style: disc; } } li { - .content & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-100; margin-bottom: $line-height-60 * $font-size-100; @@ -283,7 +268,6 @@ li { } .content--90 & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-90; margin-bottom: $line-height-60 * $font-size-90; @@ -295,7 +279,6 @@ li { } .content--200 & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-200; margin-bottom: $line-height-60 * $font-size-200; @@ -308,30 +291,25 @@ li { } a { - .content & { text-decoration: underline; } } strong { - .content & { font-weight: bold; } } em { - .content & { font-style: italic; } } .highlighter-rouge { - .content & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-100; margin-bottom: $line-height-60 * $font-size-100; @@ -344,7 +322,6 @@ em { } code { - .content & { font-family: $font-family-monospace; @@ -357,7 +334,6 @@ code { } .content--90 & { - @include media(0, $range-hand) { font-size: $font-size-80; } @@ -367,7 +343,6 @@ code { } .content--200 & { - @include media(0, $range-hand) { font-size: $font-size-100; } @@ -378,16 +353,16 @@ code { } .highlight { - .content & { border-radius: $border-radius-100; } } table { - .content & { - border-top: (($spacing / 4) solid $content-table-border-color); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 + border-top: ( + math.div($spacing, 4) solid $content-table-border-color + ); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 @include media(0, $range-hand) { display: block; @@ -395,18 +370,36 @@ table { margin-top: $line-height-60 * $font-size-100; margin-bottom: $line-height-60 * $font-size-100; /* stylelint-disable */ - background: /* Shadow covers */ - linear-gradient(to right, $color-background-light 30%, rgba(255, 255, 255, 0)), - linear-gradient(to right, rgba(255, 255, 255, 0), $color-background-light 70%), + background: /* Shadow covers */ linear-gradient( + to right, + $color-background-light 30%, + rgba(255, 255, 255, 0) + ), + linear-gradient( + to right, + rgba(255, 255, 255, 0), + $color-background-light 70% + ), /* Shadows */ - radial-gradient(farthest-side at 0 50%, rgba($color-shadow, $opacity-20), rgba($color-shadow, 0)), - radial-gradient(farthest-side at 100% 50%, rgba($color-shadow, $opacity-20), rgba($color-shadow, 0)); + radial-gradient( + farthest-side at 0 50%, + rgba($color-shadow, $opacity-20), + rgba($color-shadow, 0) + ), + radial-gradient( + farthest-side at 100% 50%, + rgba($color-shadow, $opacity-20), + rgba($color-shadow, 0) + ); /* stylelint-enable */ background-color: $color-background-light; /* Opera doesn't support this in the shorthand */ background-attachment: local, local, scroll, scroll; background-position: left, right, left, right; - background-size: ($spacing * 5) 100%, ($spacing * 5) 100%, ($spacing * 1.5) 100%, ($spacing * 1.5) 100%; + /* stylelint-disable */ + background-size: ($spacing * 5) 100%, ($spacing * 5) 100%, + ($spacing * 1.5) 100%, ($spacing * 1.5) 100%; + /* stylelint-enable */ background-repeat: no-repeat; } @include media($range-lap, false) { @@ -417,7 +410,6 @@ table { } .content--90 & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-90; margin-bottom: $line-height-60 * $font-size-90; @@ -429,7 +421,6 @@ table { } .content--200 & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-200; margin-bottom: $line-height-60 * $font-size-200; @@ -442,42 +433,46 @@ table { } thead { - .content & { - border-bottom: (($spacing / 4) solid $content-table-border-color); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 + border-bottom: ( + math.div($spacing, 4) solid $content-table-border-color + ); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 } } thead tr { - .content & { - border-bottom: (($spacing / 8) solid $content-table-border-color); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 + border-bottom: ( + math.div($spacing, 8) solid $content-table-border-color + ); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 } } tbody { - .content & { - border-bottom: (($spacing / 4) solid $content-table-border-color); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 + border-bottom: ( + math.div($spacing, 4) solid $content-table-border-color + ); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 } } tbody tr { - .content & { - border-bottom: (($spacing / 8) solid $content-table-border-color); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 + border-bottom: ( + math.div($spacing, 8) solid $content-table-border-color + ); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 } } tfoot { - .content & { - border-bottom: (($spacing / 4) solid $content-table-border-color); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 + border-bottom: ( + math.div($spacing, 4) solid $content-table-border-color + ); // FIX: Temporary solution to fix stylelint, will be fixed in HAR-149 } } th { - .content & { color: $color-heading-100; text-align: left; @@ -494,7 +489,6 @@ th { } td { - .content & { text-align: left; @@ -510,7 +504,6 @@ td { } img { - .content & { display: block; @@ -525,7 +518,6 @@ img { } .content--90 & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-90; margin-bottom: $line-height-60 * $font-size-90; @@ -537,7 +529,6 @@ img { } .content--200 & { - @include media(0, $range-hand) { margin-top: $line-height-60 * $font-size-200; margin-bottom: $line-height-60 * $font-size-200; diff --git a/scss/components/dialog.scss b/scss/components/dialog.scss index e3eedd8..09bf804 100644 --- a/scss/components/dialog.scss +++ b/scss/components/dialog.scss @@ -1,4 +1,6 @@ -$dialog-border-width: ($spacing / 8) !default; +@use 'sass:math'; + +$dialog-border-width: math.div($spacing, 8) !default; $dialog-border-radius: $border-radius-200 !default; $dialog-border-color: $color-secondary !default; @@ -32,7 +34,7 @@ $dialog-error-icon-fill: $color-error-600 !default; @include media(0, $range-hand) { padding: $spacing * 1.5; } - @include media($range-lap,false) { + @include media($range-lap, false) { padding: $spacing * 2; } } diff --git a/scss/components/heading-group.scss b/scss/components/heading-group.scss index aa353e9..4e65965 100644 --- a/scss/components/heading-group.scss +++ b/scss/components/heading-group.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + .heading-group--light { @include font-smoothing; } @@ -88,11 +90,11 @@ font-size: $font-size-90; } @include media($range-lap) { - margin-top: $spacing / 4; + margin-top: math.div($spacing, 4); font-size: $font-size-100; } @include media($range-desk, false) { - margin-top: $spacing / 4; + margin-top: math.div($spacing, 4); font-size: $font-size-100; } @@ -106,11 +108,11 @@ line-height: $line-height-40; @include media(0, $range-hand) { - margin-top: $spacing / 4; + margin-top: math.div($spacing, 4); font-size: $font-size-100; } @include media($range-lap, false) { - margin-top: $spacing / 2; + margin-top: math.div($spacing, 2); font-size: $font-size-200; } diff --git a/scss/components/popover.scss b/scss/components/popover.scss index f4380b0..0fa24ab 100644 --- a/scss/components/popover.scss +++ b/scss/components/popover.scss @@ -44,9 +44,7 @@ $popover-z-index-lap-and-larger: 600 !default; align-items: center; @include media($range-lap, false) { - .popover--arrow & { - &::before, &::after { position: absolute; @@ -78,11 +76,12 @@ $popover-z-index-lap-and-larger: 600 !default; } .popover--arrow.popover--left-bottom-aligned-body & { - &::before { top: auto; right: auto; - bottom: (($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px); + bottom: ( + ($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px + ); left: $popover-arrow-horizontal-position; border-top-color: transparent; border-bottom-color: rgba($color-ui-100, 0.075); @@ -99,11 +98,12 @@ $popover-z-index-lap-and-larger: 600 !default; } .popover--arrow.popover--center-bottom-aligned-body & { - &::before { top: auto; right: auto; - bottom: (($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px); + bottom: ( + ($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px + ); left: 50%; border-top-color: transparent; border-bottom-color: rgba($color-ui-100, 0.075); @@ -122,11 +122,12 @@ $popover-z-index-lap-and-larger: 600 !default; } .popover--arrow.popover--right-bottom-aligned-body & { - &::before { top: auto; right: $popover-arrow-horizontal-position; - bottom: (($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px); + bottom: ( + ($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px + ); left: auto; border-top-color: transparent; border-bottom-color: rgba($color-ui-100, 0.075); @@ -143,9 +144,10 @@ $popover-z-index-lap-and-larger: 600 !default; } .popover--arrow.popover--left-top-aligned-body & { - &::before { - top: (($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px); + top: ( + ($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px + ); right: auto; bottom: auto; left: $popover-arrow-horizontal-position; @@ -164,9 +166,10 @@ $popover-z-index-lap-and-larger: 600 !default; } .popover--arrow.popover--center-top-aligned-body & { - &::before { - top: (($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px); + top: ( + ($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px + ); right: auto; bottom: auto; left: 50%; @@ -187,9 +190,10 @@ $popover-z-index-lap-and-larger: 600 !default; } .popover--arrow.popover--right-top-aligned-body & { - &::before { - top: (($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px); + top: ( + ($popover-arrow-size * -1) + $popover-arrow-vertical-position + 1px + ); right: $popover-arrow-horizontal-position; bottom: auto; left: auto; @@ -208,7 +212,6 @@ $popover-z-index-lap-and-larger: 600 !default; } .popover--arrow.popover--center-aligned-arrow & { - &::before { left: 50%; transform: translate(-50%, 0); @@ -291,7 +294,9 @@ $popover-z-index-lap-and-larger: 600 !default; .popover--left-bottom-aligned-body.popover--arrow & { @include media($range-lap, false) { - top: calc(100% + #{$popover-arrow-size + ($popover-arrow-vertical-position * -1)}); + top: calc( + 100% + #{$popover-arrow-size + ($popover-arrow-vertical-position * -1)} + ); } } @@ -307,7 +312,9 @@ $popover-z-index-lap-and-larger: 600 !default; .popover--center-bottom-aligned-body.popover--arrow & { @include media($range-lap, false) { - top: calc(100% + #{$popover-arrow-size + ($popover-arrow-vertical-position * -1)}); + top: calc( + 100% + #{$popover-arrow-size + ($popover-arrow-vertical-position * -1)} + ); } } @@ -323,7 +330,9 @@ $popover-z-index-lap-and-larger: 600 !default; .popover--right-bottom-aligned-body.popover--arrow & { @include media($range-lap, false) { - top: calc(100% + #{$popover-arrow-size + ($popover-arrow-vertical-position * -1)}); + top: calc( + 100% + #{$popover-arrow-size + ($popover-arrow-vertical-position * -1)} + ); } } @@ -391,7 +400,6 @@ $popover-z-index-lap-and-larger: 600 !default; } @keyframes popoverBodyShowLapAndHigher { - 0% { display: none; opacity: 0; diff --git a/scss/components/tag.scss b/scss/components/tag.scss index 86d7603..d8260ff 100644 --- a/scss/components/tag.scss +++ b/scss/components/tag.scss @@ -1,7 +1,10 @@ +@use 'sass:math'; + .tag { display: inline-block; padding: ($spacing * 0.5) ($spacing); - border-radius: ($font-size-100 * $line-height-20 / 2) + ($spacing * 0.5); // NOTE: Half the height of the tag. + border-radius: math.div(($font-size-100 * $line-height-20), 2) + + ($spacing * 0.5); // NOTE: Half the height of the tag. background-color: $color-ui; color: $color-text-light; vertical-align: top; @@ -12,13 +15,15 @@ .tag--90 { padding: ($spacing * 0.25) ($spacing * 0.75); - border-radius: ($font-size-80 * $line-height-20 / 2) + ($spacing * 0.25); // NOTE: Half the height of the tag. + border-radius: math.div(($font-size-80 * $line-height-20), 2) + + ($spacing * 0.25); // NOTE: Half the height of the tag. font-size: $font-size-80; } .tag--80 { padding: ($spacing * 0.25) ($spacing * 0.75); - border-radius: ($font-size-70 * $line-height-20 / 2) + ($spacing * 0.25); // NOTE: Half the height of the tag. + border-radius: math.div(($font-size-70 * $line-height-20), 2) + + ($spacing * 0.25); // NOTE: Half the height of the tag. font-size: $font-size-70; } diff --git a/scss/controls/button.scss b/scss/controls/button.scss index 3671cd7..e2832f1 100644 --- a/scss/controls/button.scss +++ b/scss/controls/button.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + $button-outset: 0 !default; $button-font-size: $font-size-100 !default; @@ -6,19 +8,24 @@ $button-color: $color-text-light !default; $button-background-color: $color-ui !default; $button-hover-color: $color-text-light !default; $button-hover-background-color: $color-ui-200 !default; -$button-focus-box-shadow: inset 0 0 0 ($spacing / 4) $color-secondary-400 !default; +$button-focus-box-shadow: inset 0 0 0 math.div($spacing, 4) $color-secondary-400 !default; $button-active-color: $color-text-light !default; $button-active-background-color: $color-ui-400 !default; -$button-outset-box-shadow: 0 $button-outset 0 0 shade($button-background-color, 25%) !default; +$button-outset-box-shadow: 0 $button-outset 0 0 + shade($button-background-color, 25%) !default; $button-disabled-opacity: 0.35 !default; .button { @include font-smoothing; display: inline-flex; align-items: center; - padding-top: floor(($control-size-100 - ($button-font-size * $button-line-height)) / 2); // NOTE: Floor function is added to the padding to ensure the min-height of the button does not exceed the control-size + padding-top: floor( + math.div(($control-size-100 - ($button-font-size * $button-line-height)), 2) + ); // NOTE: Floor function is added to the padding to ensure the min-height of the button does not exceed the control-size padding-right: $spacing * 3; - padding-bottom: floor(($control-size-100 - ($button-font-size * $button-line-height)) / 2); // NOTE: Floor function is added to the padding to ensure the min-height of the button does not exceed the control-size + padding-bottom: floor( + math.div(($control-size-100 - ($button-font-size * $button-line-height)), 2) + ); // NOTE: Floor function is added to the padding to ensure the min-height of the button does not exceed the control-size padding-left: $spacing * 3; min-height: $control-size-100; border-radius: $border-radius-100; @@ -45,8 +52,7 @@ $button-disabled-opacity: 0.35 !default; &.is-focused:not(:hover):not(.is-hovered):not(:active):not(.is-active) { @if ($button-outset) { box-shadow: $button-focus-box-shadow, $button-outset-box-shadow; - } - @else { + } @else { box-shadow: $button-focus-box-shadow; } } @@ -73,13 +79,15 @@ $button-disabled-opacity: 0.35 !default; // Color variations $button-primary-color: $color-text-light !default; $button-primary-background-color: $color-primary-100 !default; -$button-primary-box-shadow: 0 ($spacing / 4) 0 0 $color-primary-400 !default; +$button-primary-box-shadow: 0 math.div($spacing, 4) 0 0 $color-primary-400 !default; $button-primary-hover-color: $color-text-light !default; $button-primary-hover-background-color: $color-primary-300 !default; -$button-primary-focus-box-shadow: inset 0 0 0 ($spacing / 4) $color-primary-500 !default; +$button-primary-focus-box-shadow: inset 0 0 0 math.div($spacing, 4) + $color-primary-500 !default; $button-primary-active-color: $color-text-light !default; $button-primary-active-background-color: $color-primary-400 !default; -$button-primary-outset-box-shadow: 0 $button-outset 0 0 shade($button-primary-background-color, 25%) !default; +$button-primary-outset-box-shadow: 0 $button-outset 0 0 + shade($button-primary-background-color, 25%) !default; .button--primary { background-color: $button-primary-background-color; @@ -97,9 +105,9 @@ $button-primary-outset-box-shadow: 0 $button-outset 0 0 shade($button-primary-ba &:focus:not(:hover):not(.is-hovered):not(:active):not(.is-active), &.is-focused:not(:hover):not(.is-hovered):not(:active):not(.is-active) { @if ($button-outset) { - box-shadow: $button-primary-focus-box-shadow, $button-primary-outset-box-shadow; - } - @else { + box-shadow: $button-primary-focus-box-shadow, + $button-primary-outset-box-shadow; + } @else { box-shadow: $button-primary-focus-box-shadow; } } @@ -113,13 +121,15 @@ $button-primary-outset-box-shadow: 0 $button-outset 0 0 shade($button-primary-ba $button-secondary-color: $color-text-light !default; $button-secondary-background-color: $color-secondary-100 !default; -$button-secondary-box-shadow: 0 ($spacing / 4) 0 0 $color-secondary-400 !default; +$button-secondary-box-shadow: 0 math.div($spacing, 4) 0 0 $color-secondary-400 !default; $button-secondary-hover-color: $color-text-light !default; $button-secondary-hover-background-color: $color-secondary-200 !default; -$button-secondary-focus-box-shadow: inset 0 0 0 ($spacing / 4) $color-secondary-400 !default; +$button-secondary-focus-box-shadow: inset 0 0 0 math.div($spacing, 4) + $color-secondary-400 !default; $button-secondary-active-color: $color-text-light !default; $button-secondary-active-background-color: $color-secondary-300 !default; -$button-secondary-outset-box-shadow: 0 $button-outset 0 0 shade($button-secondary-background-color, 25%) !default; +$button-secondary-outset-box-shadow: 0 $button-outset 0 0 + shade($button-secondary-background-color, 25%) !default; .button--secondary { background-color: $button-secondary-background-color; @@ -137,9 +147,9 @@ $button-secondary-outset-box-shadow: 0 $button-outset 0 0 shade($button-secondar &:focus:not(:hover):not(.is-hovered):not(:active):not(.is-active), &.is-focused:not(:hover):not(.is-hovered):not(:active):not(.is-active) { @if ($button-outset) { - box-shadow: $button-secondary-focus-box-shadow, $button-secondary-outset-box-shadow; - } - @else { + box-shadow: $button-secondary-focus-box-shadow, + $button-secondary-outset-box-shadow; + } @else { box-shadow: $button-secondary-focus-box-shadow; } } @@ -155,10 +165,12 @@ $button-tertiary-color: $color-text-light !default; $button-tertiary-background-color: $color-tertiary-100 !default; $button-tertiary-hover-color: $color-text-light !default; $button-tertiary-hover-background-color: $color-tertiary-200 !default; -$button-tertiary-focus-box-shadow: inset 0 0 0 ($spacing / 4) $color-tertiary-400 !default; +$button-tertiary-focus-box-shadow: inset 0 0 0 math.div($spacing, 4) + $color-tertiary-400 !default; $button-tertiary-active-color: $color-text-light !default; $button-tertiary-active-background-color: $color-tertiary-300 !default; -$button-tertiary-outset-box-shadow: 0 $button-outset 0 0 shade($button-tertiary-background-color, 25%) !default; +$button-tertiary-outset-box-shadow: 0 $button-outset 0 0 + shade($button-tertiary-background-color, 25%) !default; .button--tertiary { background-color: $button-tertiary-background-color; @@ -176,9 +188,9 @@ $button-tertiary-outset-box-shadow: 0 $button-outset 0 0 shade($button-tertiary- &:focus:not(:hover):not(.is-hovered):not(:active):not(.is-active), &.is-focused:not(:hover):not(.is-hovered):not(:active):not(.is-active) { @if $button-outset { - box-shadow: $button-tertiary-focus-box-shadow, $button-tertiary-outset-box-shadow; - } - @else { + box-shadow: $button-tertiary-focus-box-shadow, + $button-tertiary-outset-box-shadow; + } @else { box-shadow: $button-tertiary-focus-box-shadow; } } @@ -191,19 +203,31 @@ $button-tertiary-outset-box-shadow: 0 $button-outset 0 0 shade($button-tertiary- } // Outline versions -$button-outline-border-width: ($spacing / 4) !default; -$button-outline-box-shadow: inset 0 0 0 $button-outline-border-width $button-background-color !default; -$button-outline-hover-box-shadow: inset 0 0 0 $button-outline-border-width $button-hover-background-color !default; -$button-outline-active-box-shadow: inset 0 0 0 $button-outline-border-width $button-active-background-color !default; -$button-outline-primary-box-shadow: inset 0 0 0 $button-outline-border-width $button-primary-background-color !default; -$button-outline-primary-hover-box-shadow: inset 0 0 0 $button-outline-border-width $button-primary-hover-background-color !default; -$button-outline-primary-active-box-shadow: inset 0 0 0 $button-outline-border-width $button-primary-active-background-color !default; -$button-outline-secondary-box-shadow: inset 0 0 0 $button-outline-border-width $button-secondary-background-color !default; -$button-outline-secondary-hover-box-shadow: inset 0 0 0 $button-outline-border-width $button-secondary-hover-background-color !default; -$button-outline-secondary-active-box-shadow: inset 0 0 0 $button-outline-border-width $button-secondary-active-background-color !default; -$button-outline-tertiary-box-shadow: inset 0 0 0 $button-outline-border-width $button-tertiary-background-color !default; -$button-outline-tertiary-hover-box-shadow: inset 0 0 0 $button-outline-border-width $button-tertiary-hover-background-color !default; -$button-outline-tertiary-active-box-shadow: inset 0 0 0 $button-outline-border-width $button-tertiary-active-background-color !default; +$button-outline-border-width: math.div($spacing, 4) !default; +$button-outline-box-shadow: inset 0 0 0 $button-outline-border-width + $button-background-color !default; +$button-outline-hover-box-shadow: inset 0 0 0 $button-outline-border-width + $button-hover-background-color !default; +$button-outline-active-box-shadow: inset 0 0 0 $button-outline-border-width + $button-active-background-color !default; +$button-outline-primary-box-shadow: inset 0 0 0 $button-outline-border-width + $button-primary-background-color !default; +$button-outline-primary-hover-box-shadow: inset 0 0 0 + $button-outline-border-width $button-primary-hover-background-color !default; +$button-outline-primary-active-box-shadow: inset 0 0 0 + $button-outline-border-width $button-primary-active-background-color !default; +$button-outline-secondary-box-shadow: inset 0 0 0 $button-outline-border-width + $button-secondary-background-color !default; +$button-outline-secondary-hover-box-shadow: inset 0 0 0 + $button-outline-border-width $button-secondary-hover-background-color !default; +$button-outline-secondary-active-box-shadow: inset 0 0 0 + $button-outline-border-width $button-secondary-active-background-color !default; +$button-outline-tertiary-box-shadow: inset 0 0 0 $button-outline-border-width + $button-tertiary-background-color !default; +$button-outline-tertiary-hover-box-shadow: inset 0 0 0 + $button-outline-border-width $button-tertiary-hover-background-color !default; +$button-outline-tertiary-active-box-shadow: inset 0 0 0 + $button-outline-border-width $button-tertiary-active-background-color !default; .button--outline { background-color: transparent; @@ -247,7 +271,8 @@ $button-outline-tertiary-active-box-shadow: inset 0 0 0 $button-outline-border-w &:focus:not(:hover):not(.is-hovered):not(:active):not(.is-active), &.is-focused:not(:hover):not(.is-hovered):not(:active):not(.is-active) { - box-shadow: $button-tertiary-focus-box-shadow, $button-outline-tertiary-box-shadow; + box-shadow: $button-tertiary-focus-box-shadow, + $button-outline-tertiary-box-shadow; } &:active, @@ -269,7 +294,8 @@ $button-outline-tertiary-active-box-shadow: inset 0 0 0 $button-outline-border-w &:focus:not(:hover):not(.is-hovered):not(:active):not(.is-active), &.is-focused:not(:hover):not(.is-hovered):not(:active):not(.is-active) { - box-shadow: $button-primary-focus-box-shadow, $button-outline-primary-box-shadow; + box-shadow: $button-primary-focus-box-shadow, + $button-outline-primary-box-shadow; } &:active, @@ -291,7 +317,8 @@ $button-outline-tertiary-active-box-shadow: inset 0 0 0 $button-outline-border-w &:focus:not(:hover):not(.is-hovered):not(:active):not(.is-active), &.is-focused:not(:hover):not(.is-hovered):not(:active):not(.is-active) { - box-shadow: $button-secondary-focus-box-shadow, $button-outline-secondary-box-shadow; + box-shadow: $button-secondary-focus-box-shadow, + $button-outline-secondary-box-shadow; } &:active, @@ -311,45 +338,95 @@ $button-90-font-size: $font-size-90 !default; $button-200-font-size: $font-size-200 !default; .button--60 { - padding-top: floor(($control-size-60 - ($button-60-font-size * $button-line-height)) / 2); + padding-top: floor( + math.div( + ($control-size-60 - ($button-60-font-size * $button-line-height)), + 2 + ) + ); padding-right: $spacing * 1.5; - padding-bottom: floor(($control-size-60 - ($button-60-font-size * $button-line-height)) / 2); + padding-bottom: floor( + math.div( + ($control-size-60 - ($button-60-font-size * $button-line-height)), + 2 + ) + ); padding-left: $spacing * 1.5; min-height: $control-size-60; font-size: $button-60-font-size; } .button--70 { - padding-top: floor(($control-size-70 - ($button-70-font-size * $button-line-height)) / 2); + padding-top: floor( + math.div( + ($control-size-70 - ($button-70-font-size * $button-line-height)), + 2 + ) + ); padding-right: $spacing * 2; - padding-bottom: floor(($control-size-70 - ($button-70-font-size * $button-line-height)) / 2); + padding-bottom: floor( + math.div( + ($control-size-70 - ($button-70-font-size * $button-line-height)), + 2 + ) + ); padding-left: $spacing * 2; min-height: $control-size-70; font-size: $button-70-font-size; } .button--80 { - padding-top: floor(($control-size-80 - ($button-80-font-size * $button-line-height)) / 2); + padding-top: floor( + math.div( + ($control-size-80 - ($button-80-font-size * $button-line-height)), + 2 + ) + ); padding-right: $spacing * 2; - padding-bottom: floor(($control-size-80 - ($button-80-font-size * $button-line-height)) / 2); + padding-bottom: floor( + math.div( + ($control-size-80 - ($button-80-font-size * $button-line-height)), + 2 + ) + ); padding-left: $spacing * 2; min-height: $control-size-80; font-size: $button-80-font-size; } .button--90 { - padding-top: floor(($control-size-90 - ($button-90-font-size * $button-line-height)) / 2); + padding-top: floor( + math.div( + ($control-size-90 - ($button-90-font-size * $button-line-height)), + 2 + ) + ); padding-right: $spacing * 2.5; - padding-bottom: floor(($control-size-90 - ($button-90-font-size * $button-line-height)) / 2); + padding-bottom: floor( + math.div( + ($control-size-90 - ($button-90-font-size * $button-line-height)), + 2 + ) + ); padding-left: $spacing * 2.5; min-height: $control-size-90; font-size: $button-90-font-size; } .button--200 { - padding-top: floor(($control-size-200 - ($button-200-font-size * $button-line-height)) / 2); + padding-top: floor( + math.div( + ($control-size-200 - ($button-200-font-size * $button-line-height)), + 2 + ) + ); padding-right: $spacing * 4; - padding-bottom: floor(($control-size-200 - ($button-200-font-size * $button-line-height)) / 2); + padding-bottom: floor( + math.div( + ($control-size-200 - ($button-200-font-size * $button-line-height)), + 2 + ) + ); padding-left: $spacing * 4; min-height: $control-size-200; font-size: $button-200-font-size; diff --git a/scss/controls/checkbox.scss b/scss/controls/checkbox.scss index 02ad865..dfb9272 100644 --- a/scss/controls/checkbox.scss +++ b/scss/controls/checkbox.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + $checkbox-input-size: $spacing * 2.5 !default; $checkbox-90-input-size: $spacing * 2 !default; $checkbox-input-color: $color-ui-300 !default; @@ -9,9 +11,15 @@ $checkbox-input-label-spacing: $spacing !default; position: relative; display: block; margin: 0; - padding-top: (($control-size-100 - ($font-size-200 * $line-height-60)) / 2); + padding-top: math.div( + ($control-size-100 - ($font-size-200 * $line-height-60)), + 2 + ); padding-right: 0; - padding-bottom: (($control-size-100 - ($font-size-200 * $line-height-60)) / 2); + padding-bottom: math.div( + ($control-size-100 - ($font-size-200 * $line-height-60)), + 2 + ); padding-left: $checkbox-input-size + $checkbox-input-label-spacing; min-height: $control-size-100; max-width: $text-width-100; @@ -26,7 +34,7 @@ label.checkbox { } .checkbox--colored { - padding-right: (($control-size-100 - $checkbox-input-size) / 2); + padding-right: math.div(($control-size-100 - $checkbox-input-size), 2); padding-left: $control-size-100; border-radius: $border-radius-100; background-color: $color-ui-20; @@ -42,14 +50,20 @@ label.checkbox { } .checkbox--90 { - padding-top: (($control-size-90 - ($font-size-100 * $line-height-60)) / 2); - padding-bottom: (($control-size-90 - ($font-size-100 * $line-height-60)) / 2); + padding-top: math.div( + ($control-size-90 - ($font-size-100 * $line-height-60)), + 2 + ); + padding-bottom: math.div( + ($control-size-90 - ($font-size-100 * $line-height-60)), + 2 + ); padding-left: $checkbox-90-input-size + $checkbox-input-label-spacing; min-height: $control-size-90; font-size: $font-size-100; &.checkbox--colored { - padding-right: (($control-size-90 - $checkbox-90-input-size) / 2); + padding-right: math.div(($control-size-90 - $checkbox-90-input-size), 2); padding-left: $control-size-90; } } @@ -65,33 +79,62 @@ label.checkbox { } .checkbox--padded-90 { - padding-top: (($control-size-90 - ($font-size-200 * $line-height-60)) / 2); - padding-bottom: (($control-size-90 - ($font-size-200 * $line-height-60)) / 2); + padding-top: math.div( + ($control-size-90 - ($font-size-200 * $line-height-60)), + 2 + ); + padding-bottom: math.div( + ($control-size-90 - ($font-size-200 * $line-height-60)), + 2 + ); min-height: $control-size-90; &.checkbox--90 { - padding-top: (($control-size-90 - ($font-size-100 * $line-height-60)) / 2); - padding-bottom: (($control-size-90 - ($font-size-100 * $line-height-60)) / 2); + padding-top: math.div( + ($control-size-90 - ($font-size-100 * $line-height-60)), + 2 + ); + padding-bottom: math.div( + ($control-size-90 - ($font-size-100 * $line-height-60)), + 2 + ); } } .checkbox--padded-100 { - &.checkbox--90 { - padding-top: (($control-size-100 - ($font-size-100 * $line-height-60)) / 2); - padding-bottom: (($control-size-100 - ($font-size-100 * $line-height-60)) / 2); + padding-top: math.div( + ($control-size-100 - ($font-size-100 * $line-height-60)), + 2 + ); + padding-bottom: math.div( + ($control-size-100 - ($font-size-100 * $line-height-60)), + 2 + ); min-height: $control-size-100; } } .checkbox--padded-200 { - padding-top: (($control-size-200 - ($font-size-200 * $line-height-60)) / 2); - padding-bottom: (($control-size-200 - ($font-size-200 * $line-height-60)) / 2); + padding-top: math.div( + ($control-size-200 - ($font-size-200 * $line-height-60)), + 2 + ); + padding-bottom: math.div( + ($control-size-200 - ($font-size-200 * $line-height-60)), + 2 + ); min-height: $control-size-200; &.checkbox--90 { - padding-top: (($control-size-200 - ($font-size-100 * $line-height-60)) / 2); - padding-bottom: (($control-size-200 - ($font-size-100 * $line-height-60)) / 2); + padding-top: math.div( + ($control-size-200 - ($font-size-100 * $line-height-60)), + 2 + ); + padding-bottom: math.div( + ($control-size-200 - ($font-size-100 * $line-height-60)), + 2 + ); min-height: $control-size-200; } } @@ -110,7 +153,7 @@ label.checkbox { &:first-of-type::before { position: absolute; - top: (($control-size-100 - $checkbox-input-size) / 2); + top: math.div(($control-size-100 - $checkbox-input-size), 2); left: 0; display: block; box-sizing: border-box; @@ -124,49 +167,55 @@ label.checkbox { content: ''; .checkbox--colored & { - left: (($control-size-100 - $checkbox-input-size) / 2); + left: math.div(($control-size-100 - $checkbox-input-size), 2); } .checkbox--90 & { - top: (($control-size-90 - $checkbox-90-input-size) / 2); + top: math.div(($control-size-90 - $checkbox-90-input-size), 2); width: $checkbox-90-input-size; height: $checkbox-90-input-size; } .checkbox--colored.checkbox--90 & { - left: (($control-size-90 - $checkbox-90-input-size) / 2); + left: math.div(($control-size-90 - $checkbox-90-input-size), 2); } .checkbox--padded-0 & { - top: ((($font-size-200 * $line-height-60) - $checkbox-input-size) / 2); + top: math.div( + (($font-size-200 * $line-height-60) - $checkbox-input-size), + 2 + ); } .checkbox--padded-0.checkbox--90 & { - top: ((($font-size-100 * $line-height-60) - $checkbox-90-input-size) / 2); + top: math.div( + (($font-size-100 * $line-height-60) - $checkbox-90-input-size), + 2 + ); } .checkbox--padded-90 & { - top: (($control-size-90 - $checkbox-input-size) / 2); + top: math.div(($control-size-90 - $checkbox-input-size), 2); } .checkbox--padded-90.checkbox--90 & { - top: (($control-size-90 - $checkbox-90-input-size) / 2); + top: math.div(($control-size-90 - $checkbox-90-input-size), 2); } .checkbox--padded-100 & { - top: (($control-size-100 - $checkbox-input-size) / 2); + top: math.div(($control-size-100 - $checkbox-input-size), 2); } .checkbox--padded-100.checkbox--90 & { - top: (($control-size-100 - $checkbox-90-input-size) / 2); + top: math.div(($control-size-100 - $checkbox-90-input-size), 2); } .checkbox--padded-200 & { - top: (($control-size-200 - $checkbox-input-size) / 2); + top: math.div(($control-size-200 - $checkbox-input-size), 2); } .checkbox--padded-200.checkbox--90 & { - top: (($control-size-200 - $checkbox-90-input-size) / 2); + top: math.div(($control-size-200 - $checkbox-90-input-size), 2); } input:checked ~ & { @@ -176,8 +225,12 @@ label.checkbox { background-repeat: no-repeat; .checkbox--90 & { - background-image: url(get-svg-uri($icon-check-bold, $checkbox-input-color)); - background-size: ($checkbox-90-input-size - 6px) ($checkbox-90-input-size - 6px); + background-image: url(get-svg-uri( + $icon-check-bold, + $checkbox-input-color + )); + background-size: ($checkbox-90-input-size - 6px) + ($checkbox-90-input-size - 6px); } } diff --git a/scss/controls/drop-down-menu.scss b/scss/controls/drop-down-menu.scss index 25ac68e..f7b5f18 100644 --- a/scss/controls/drop-down-menu.scss +++ b/scss/controls/drop-down-menu.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + $drop-down-menu-icon: $icon-chevron-down !default; .drop-down-menu { @@ -26,7 +28,6 @@ $drop-down-menu-icon: $icon-chevron-down !default; } .drop-down-menu--90 { - &::after { width: $control-size-90; height: $icon-size-90; @@ -93,7 +94,8 @@ $drop-down-menu-icon: $icon-chevron-down !default; .drop-down-menu.is-valid &, .drop-down-menu.is-invalid & { - padding-right: ($control-size-100 * 2) - (($control-size-100 - $icon-size-100) / 2); + padding-right: ($control-size-100 * 2) - + math.div(($control-size-100 - $icon-size-100), 2); background-position: right $control-size-100 center; background-size: $icon-size-100; background-repeat: no-repeat; @@ -102,7 +104,10 @@ $drop-down-menu-icon: $icon-chevron-down !default; .drop-down-menu.is-valid & { border: $input-is-valid-border; background-color: $input-is-valid-background-color; - background-image: url(get-svg-uri($input-is-valid-icon, $input-is-valid-icon-color)); + background-image: url(get-svg-uri( + $input-is-valid-icon, + $input-is-valid-icon-color + )); box-shadow: $input-is-valid-box-shadow; &:focus { @@ -115,7 +120,10 @@ $drop-down-menu-icon: $icon-chevron-down !default; .drop-down-menu.is-invalid & { border: $input-is-invalid-border; background-color: $input-is-invalid-background-color; - background-image: url(get-svg-uri($input-is-invalid-icon, $input-is-invalid-icon-color)); + background-image: url(get-svg-uri( + $input-is-invalid-icon, + $input-is-invalid-icon-color + )); box-shadow: $input-is-invalid-box-shadow; &:focus { @@ -126,9 +134,15 @@ $drop-down-menu-icon: $icon-chevron-down !default; } .drop-down-menu--90 & { - padding-top: (($control-size-90 - ($input-line-height * $input-font-size)) / 2); + padding-top: math.div( + ($control-size-90 - ($input-line-height * $input-font-size)), + 2 + ); padding-right: $control-size-90; - padding-bottom: (($control-size-90 - ($input-line-height * $input-font-size)) / 2); + padding-bottom: math.div( + ($control-size-90 - ($input-line-height * $input-font-size)), + 2 + ); padding-left: $spacing; height: $control-size-90; font-size: $font-size-100; @@ -136,7 +150,8 @@ $drop-down-menu-icon: $icon-chevron-down !default; .drop-down-menu--90.is-valid &, .drop-down-menu--90.is-invalid & { - padding-right: ($control-size-90 * 2) - (($control-size-90 - $icon-size-90) / 2); + padding-right: ($control-size-90 * 2) - + math.div(($control-size-90 - $icon-size-90), 2); background-position: right $control-size-90 center; background-size: $icon-size-90; } @@ -145,12 +160,14 @@ $drop-down-menu-icon: $icon-chevron-down !default; padding-right: $spacing * 1.5; border: $input-autofill-border; background-color: $input-autofill-background-color; - box-shadow: $input-autofill-box-shadow, $input-autofill-box-shadow-background; + box-shadow: $input-autofill-box-shadow, + $input-autofill-box-shadow-background; &:focus { border: $input-autofill-focus-border; background-color: $input-autofill-focus-background-color; - box-shadow: $input-autofill-focus-box-shadow, $input-autofill-focus-box-shadow-background; + box-shadow: $input-autofill-focus-box-shadow, + $input-autofill-focus-box-shadow-background; } } diff --git a/scss/controls/input-stepper.scss b/scss/controls/input-stepper.scss index 2208d88..41a2073 100644 --- a/scss/controls/input-stepper.scss +++ b/scss/controls/input-stepper.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + $input-stepper-button-background-color: $color-ui-80 !default; .input-stepper { @@ -26,9 +28,15 @@ $input-stepper-button-background-color: $color-ui-80 !default; .input-stepper__input { order: 2; - padding-top: (($control-size-100 - ($line-height-20 * $font-size-200)) / 2); + padding-top: math.div( + ($control-size-100 - ($line-height-20 * $font-size-200)), + 2 + ); padding-right: $spacing; - padding-bottom: (($control-size-100 - ($line-height-20 * $font-size-200)) / 2); + padding-bottom: math.div( + ($control-size-100 - ($line-height-20 * $font-size-200)), + 2 + ); padding-left: $spacing; width: $control-size-200; height: $control-size-100; @@ -49,7 +57,16 @@ $input-stepper-button-background-color: $color-ui-80 !default; } .input-stepper.is-loading & { - background-image: linear-gradient(-45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.1) 50%, rgba(0, 0, 0, 0.1) 75%, transparent 75%, transparent); + background-image: linear-gradient( + -45deg, + rgba(0, 0, 0, 0.1) 25%, + transparent 25%, + transparent 50%, + rgba(0, 0, 0, 0.1) 50%, + rgba(0, 0, 0, 0.1) 75%, + transparent 75%, + transparent + ); background-size: 50px 50px; background-repeat: repeat; opacity: $opacity-100; // NOTE: reset disabled styling. @@ -138,7 +155,6 @@ $input-stepper-button-background-color: $color-ui-80 !default; } @keyframes InputStepperIndeterminateProgress { - 0% { background-position: 0 0; } diff --git a/scss/controls/password-input.scss b/scss/controls/password-input.scss index 4246b36..1b5760a 100644 --- a/scss/controls/password-input.scss +++ b/scss/controls/password-input.scss @@ -1,5 +1,11 @@ +@use 'sass:math'; + $password-input-z-index: 100 !default; -$password-input-input-margin: if($input-focus-box-shadow-inset, ($input-border-width + $input-focus-box-shadow-spread), $input-border-width) !default; +$password-input-input-margin: if( + $input-focus-box-shadow-inset, + ($input-border-width + $input-focus-box-shadow-spread), + $input-border-width +) !default; $password-input-webkit-credentials-auto-fill-button-toggle: true !default; .password-input { @@ -33,7 +39,6 @@ input[type='password'].password-input__input { appearance: none; @if not($password-input-webkit-credentials-auto-fill-button-toggle) { - &::-webkit-credentials-auto-fill-button { visibility: hidden; pointer-events: none; @@ -56,17 +61,24 @@ input[type='password'].password-input__input { .password-input.is-valid &, .password-input.is-invalid & { padding-right: $control-size-100; - background-position: right (($control-size-100 - $icon-size-100) / 2) center; + background-position: right math.div(($control-size-100 - $icon-size-100), 2) + center; background-size: $icon-size-100 $icon-size-100; background-repeat: no-repeat; } .password-input.is-valid & { - background-image: url(get-svg-uri($input-is-valid-icon, $input-is-valid-icon-color)); + background-image: url(get-svg-uri( + $input-is-valid-icon, + $input-is-valid-icon-color + )); } .password-input.is-invalid & { - background-image: url(get-svg-uri($input-is-invalid-icon, $input-is-invalid-icon-color)); + background-image: url(get-svg-uri( + $input-is-invalid-icon, + $input-is-invalid-icon-color + )); } &:-webkit-autofill { @@ -158,38 +170,46 @@ input[type='password'].password-input__input { .password-input__input:-webkit-autofill ~ & { border: $input-autofill-border; background-color: $input-autofill-background-color; - box-shadow: $input-autofill-box-shadow, $input-autofill-box-shadow-background; + box-shadow: $input-autofill-box-shadow, + $input-autofill-box-shadow-background; } .password-input__input:-webkit-autofill:focus ~ & { border: $input-autofill-focus-border; background-color: $input-autofill-focus-background-color; - box-shadow: $input-autofill-focus-box-shadow, $input-autofill-focus-box-shadow-background; + box-shadow: $input-autofill-focus-box-shadow, + $input-autofill-focus-box-shadow-background; } .password-input.is-valid .password-input__input:-webkit-autofill ~ & { border: $input-autofill-is-valid-border; background-color: $input-autofill-is-valid-background-color; - box-shadow: $input-autofill-is-valid-box-shadow, $input-autofill-is-valid-box-shadow-background; + box-shadow: $input-autofill-is-valid-box-shadow, + $input-autofill-is-valid-box-shadow-background; } .password-input.is-valid .password-input__input:-webkit-autofill:focus ~ & { border: $input-autofill-is-valid-focus-border; background-color: $input-autofill-is-valid-focus-background-color; - box-shadow: $input-autofill-is-valid-focus-box-shadow, $input-autofill-is-valid-focus-box-shadow-background; + box-shadow: $input-autofill-is-valid-focus-box-shadow, + $input-autofill-is-valid-focus-box-shadow-background; } .password-input.is-invalid .password-input__input:-webkit-autofill ~ & { border: $input-autofill-is-invalid-border; background-color: $input-autofill-is-invalid-background-color; - box-shadow: $input-autofill-is-invalid-box-shadow, $input-autofill-is-invalid-box-shadow-background; + box-shadow: $input-autofill-is-invalid-box-shadow, + $input-autofill-is-invalid-box-shadow-background; } + /* prettier-ignore */ .password-input.is-invalid .password-input__input:-webkit-autofill:focus ~ & { border: $input-autofill-is-invalid-focus-border; background-color: $input-autofill-is-invalid-focus-background-color; - box-shadow: $input-autofill-is-invalid-focus-box-shadow, $input-autofill-is-invalid-focus-box-shadow-background; + box-shadow: $input-autofill-is-invalid-focus-box-shadow, + $input-autofill-is-invalid-focus-box-shadow-background; } + /* prettier-enable */ } .password-input__input:disabled ~ & { diff --git a/scss/controls/text-input.scss b/scss/controls/text-input.scss index ae00803..20746eb 100644 --- a/scss/controls/text-input.scss +++ b/scss/controls/text-input.scss @@ -1,9 +1,17 @@ +@use 'sass:math'; + .text-input { position: relative; display: block; - padding-top: (($control-size-100 - ($input-line-height * $input-font-size)) / 2); + padding-top: math.div( + ($control-size-100 - ($input-line-height * $input-font-size)), + 2 + ); padding-right: $spacing * 1.5; - padding-bottom: (($control-size-100 - ($input-line-height * $input-font-size)) / 2); + padding-bottom: math.div( + ($control-size-100 - ($input-line-height * $input-font-size)), + 2 + ); padding-left: $spacing * 1.5; width: 100%; height: $control-size-100; @@ -30,7 +38,8 @@ &.is-valid, &.is-invalid { padding-right: $control-size-100; - background-position: right (($control-size-100 - $icon-size-100) / 2) center; + background-position: right math.div(($control-size-100 - $icon-size-100), 2) + center; background-size: $icon-size-100 $icon-size-100; background-repeat: no-repeat; } @@ -38,7 +47,10 @@ &.is-valid { border: $input-is-valid-border; background-color: $input-is-valid-background-color; - background-image: url(get-svg-uri($input-is-valid-icon, $input-is-valid-icon-color)); + background-image: url(get-svg-uri( + $input-is-valid-icon, + $input-is-valid-icon-color + )); box-shadow: $input-is-valid-box-shadow; &:focus { @@ -51,7 +63,10 @@ &.is-invalid { border: $input-is-invalid-border; background-color: $input-is-invalid-background-color; - background-image: url(get-svg-uri($input-is-invalid-icon, $input-is-invalid-icon-color)); + background-image: url(get-svg-uri( + $input-is-invalid-icon, + $input-is-invalid-icon-color + )); box-shadow: $input-is-invalid-box-shadow; &:focus { @@ -70,12 +85,14 @@ padding-right: $spacing * 1.5; border: $input-autofill-border; background-color: $input-autofill-background-color; - box-shadow: $input-autofill-box-shadow, $input-autofill-box-shadow-background; + box-shadow: $input-autofill-box-shadow, + $input-autofill-box-shadow-background; &:focus { border: $input-autofill-focus-border; background-color: $input-autofill-focus-background-color; - box-shadow: $input-autofill-focus-box-shadow, $input-autofill-focus-box-shadow-background; + box-shadow: $input-autofill-focus-box-shadow, + $input-autofill-focus-box-shadow-background; } } } diff --git a/scss/layouts/collection.scss b/scss/layouts/collection.scss index f99228c..e42a90e 100644 --- a/scss/layouts/collection.scss +++ b/scss/layouts/collection.scss @@ -11,7 +11,6 @@ } .collection__item { - .collection--list > &:not(:last-child) { @include media(0, $range-hand) { margin-bottom: $spacing; @@ -22,7 +21,6 @@ } .collection--grid-one-whole-till-one-third > & { - @include media(0, $range-hand-m) { margin: $spacing * 1; width: calc(100% - #{$spacing * 2}); diff --git a/scss/layouts/form.scss b/scss/layouts/form.scss index e5540be..c31fe15 100644 --- a/scss/layouts/form.scss +++ b/scss/layouts/form.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + $form-z-index: 0 !default; $form-field-header-width: 36%; $form-field-main-width: 64%; @@ -29,7 +31,7 @@ $form-control-max-width: $spacing * 60; max-width: $text-width-200; @include media(0, $range-hand) { - margin-top: $spacing / 4; + margin-top: math.div($spacing, 4); font-size: $font-size-100; } @include media($range-lap, false) { @@ -39,7 +41,6 @@ $form-control-max-width: $spacing * 60; } .form__section { - &:not(:first-child) { border-top: 1px dashed $color-ui-100; @@ -127,7 +128,6 @@ $form-control-max-width: $spacing * 60; } .form--90 & { - &:not(:first-child) { margin-top: $spacing * 1.25; } @@ -137,7 +137,7 @@ $form-control-max-width: $spacing * 60; .form__fieldset-feedback-text { position: relative; margin-top: $spacing * -1; - padding: ($spacing / 2) ($spacing * 2.5); + padding: math.div($spacing, 2) ($spacing * 2.5); background-color: $color-error; color: $color-text-light; font-size: $font-size-90; @@ -170,13 +170,14 @@ $form-control-max-width: $spacing * 60; } } -.form__field.is-hidden { // NOTE: is-hidden styling is seperated from main form__field-label styling due to stylelint settings which doesn't accept .is-hidden to come after modifier styles +.form__field.is-hidden { + // NOTE: is-hidden styling is seperated from main form__field-label styling due to stylelint settings which doesn't accept .is-hidden to come after modifier styles display: none; } .form__field-header { display: block; // NOTE: Set block for when field-header is a label element. - margin-bottom: $spacing / 8; + margin-bottom: math.div($spacing, 8); .form--right-aligned-labels &, .form--left-aligned-labels & { @@ -205,7 +206,7 @@ $form-control-max-width: $spacing * 60; .form--top-aligned-labels & { @include media($range-lap, false) { display: block; - margin-bottom: $spacing / 8; + margin-bottom: math.div($spacing, 8); padding-right: 0; min-width: auto; width: auto; @@ -239,7 +240,8 @@ $form-control-max-width: $spacing * 60; } } -.form__field-label.is-hidden { // NOTE: is-hidden styling is seperated from main form__field-label styling due to stylelint settings which doesn't accept .is-hidden to come after modifier styles +.form__field-label.is-hidden { + // NOTE: is-hidden styling is seperated from main form__field-label styling due to stylelint settings which doesn't accept .is-hidden to come after modifier styles display: none; } @@ -258,9 +260,7 @@ $form-control-max-width: $spacing * 60; .form--right-aligned-labels &, .form--left-aligned-labels & { - @include media($range-lap, false) { - &::before { content: none; } @@ -272,9 +272,7 @@ $form-control-max-width: $spacing * 60; } .form--top-aligned-labels & { - @include media($range-lap, false) { - &::before { content: ' ('; } @@ -287,7 +285,6 @@ $form-control-max-width: $spacing * 60; } .form__field-main { - .form--right-aligned-labels &, .form--left-aligned-labels & { @include media($range-lap, false) { @@ -328,9 +325,9 @@ $form-control-max-width: $spacing * 60; .form__input-feedback-text { position: relative; display: block; - margin-top: $spacing / 2; + margin-top: math.div($spacing, 2); margin-right: 0; - margin-bottom: $spacing / 4; + margin-bottom: math.div($spacing, 4); max-width: $text-width-200; color: $color-error; line-height: $line-height-60; @@ -349,9 +346,9 @@ $form-control-max-width: $spacing * 60; .form__input-helper-text { display: block; - margin-top: $spacing / 2; + margin-top: math.div($spacing, 2); margin-right: 0; - margin-bottom: $spacing / 4; + margin-bottom: math.div($spacing, 4); max-width: $text-width-200; color: $color-text-70; line-height: $line-height-60; @@ -371,7 +368,9 @@ $form-control-max-width: $spacing * 60; .form--left-aligned-labels & { @include media($range-lap, false) { margin-left: calc(#{$form-field-header-width} - #{$spacing * 1}); - padding-left: calc(#{$form-section-header-min-width} - #{$form-field-header-width}); + padding-left: calc( + #{$form-section-header-min-width} - #{$form-field-header-width} + ); max-width: calc(#{$form-control-max-width} + #{$spacing * 2}); width: calc(#{$form-field-main-width} + #{$spacing * 2}); } diff --git a/scss/layouts/layout.scss b/scss/layouts/layout.scss index 3452947..8b6836a 100644 --- a/scss/layouts/layout.scss +++ b/scss/layouts/layout.scss @@ -31,38 +31,38 @@ $layout-spacing-variations: ( palm-and-smaller: $spacing, hand: $spacing, lap: $spacing, - desk-and-larger: $spacing + desk-and-larger: $spacing, ), 70: ( palm-and-smaller: $spacing, hand: $spacing * 1.25, lap: $spacing * 1.5, - desk-and-larger: $spacing * 1.75 + desk-and-larger: $spacing * 1.75, ), 80: ( palm-and-smaller: $spacing * 1.5, hand: $spacing * 1.5, lap: $spacing * 2, - desk-and-larger: $spacing * 2.5 + desk-and-larger: $spacing * 2.5, ), 90: ( palm-and-smaller: $spacing * 1.5, hand: $spacing * 2, lap: $spacing * 3, - desk-and-larger: $spacing * 4 + desk-and-larger: $spacing * 4, ), 200: ( palm-and-smaller: $spacing * 2, hand: $spacing * 4, lap: $spacing * 6, - desk-and-larger: $spacing * 8 + desk-and-larger: $spacing * 8, ), 300: ( palm-and-smaller: $spacing * 2, hand: $spacing * 5, lap: $spacing * 8, - desk-and-larger: $spacing * 11 - ) + desk-and-larger: $spacing * 11, + ), ); // Generates media queries with the provided spacing properties @@ -122,35 +122,39 @@ $layout-spacing-variations: ( } .layout__section--spacing-0 { - > :not(:first-child) { margin-top: 0; } } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__section--spacing-#{$layout-spacing-variation-city-block} { - > :not(:first-child) { - @include layout-get-ranges('margin-top', $layout-spacing-variation-ranges); + @include layout-get-ranges( + 'margin-top', + $layout-spacing-variation-ranges + ); } } } .layout__section--spaced-0 { - &:not(:first-child) { margin-top: 0; } } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__section--spaced-#{$layout-spacing-variation-city-block} { - &:not(:first-child) { - @include layout-get-ranges('margin-top', $layout-spacing-variation-ranges); + @include layout-get-ranges( + 'margin-top', + $layout-spacing-variation-ranges + ); } } } @@ -334,8 +338,9 @@ $layout-spacing-variations: ( padding: 0; } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__inner--padded-#{$layout-spacing-variation-city-block} { @include layout-get-ranges('padding', $layout-spacing-variation-ranges); } @@ -346,10 +351,14 @@ $layout-spacing-variations: ( padding-bottom: 0; } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__inner--padded-top-bottom-#{$layout-spacing-variation-city-block} { - @include layout-get-ranges(('padding-top', 'padding-bottom'), $layout-spacing-variation-ranges); + @include layout-get-ranges( + ('padding-top', 'padding-bottom'), + $layout-spacing-variation-ranges + ); } } @@ -358,10 +367,14 @@ $layout-spacing-variations: ( padding-left: 0; } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__inner--padded-left-right-#{$layout-spacing-variation-city-block} { - @include layout-get-ranges(('padding-right', 'padding-left'), $layout-spacing-variation-ranges); + @include layout-get-ranges( + ('padding-right', 'padding-left'), + $layout-spacing-variation-ranges + ); } } @@ -369,8 +382,9 @@ $layout-spacing-variations: ( padding-top: 0; } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__inner--padded-top-#{$layout-spacing-variation-city-block} { @include layout-get-ranges('padding-top', $layout-spacing-variation-ranges); } @@ -380,10 +394,14 @@ $layout-spacing-variations: ( padding-right: 0; } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__inner--padded-right-#{$layout-spacing-variation-city-block} { - @include layout-get-ranges('padding-right', $layout-spacing-variation-ranges); + @include layout-get-ranges( + 'padding-right', + $layout-spacing-variation-ranges + ); } } @@ -391,10 +409,14 @@ $layout-spacing-variations: ( padding-bottom: 0; } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__inner--padded-bottom-#{$layout-spacing-variation-city-block} { - @include layout-get-ranges('padding-bottom', $layout-spacing-variation-ranges); + @include layout-get-ranges( + 'padding-bottom', + $layout-spacing-variation-ranges + ); } } @@ -402,10 +424,14 @@ $layout-spacing-variations: ( padding-left: 0; } -@each $layout-spacing-variation-city-block, $layout-spacing-variation-ranges in $layout-spacing-variations { - +@each $layout-spacing-variation-city-block, + $layout-spacing-variation-ranges in $layout-spacing-variations +{ .layout__inner--padded-left-#{$layout-spacing-variation-city-block} { - @include layout-get-ranges('padding-left', $layout-spacing-variation-ranges); + @include layout-get-ranges( + 'padding-left', + $layout-spacing-variation-ranges + ); } } @@ -529,17 +555,21 @@ $layout-spacing-variations: ( flex-basis: $spacing * 35; @include media(0, $range-hand) { + /* prettier-ignore */ min-width: calc(#{$layout-column-one-third-percentage} - #{$layout-column-spacing-hand-and-smaller * 2}); } @include media($range-lap, false) { + /* prettier-ignore */ min-width: calc(#{$layout-column-one-third-percentage} - #{$layout-column-spacing-lap-and-larger * 2}); } .layout__columns--spacing-90 > & { @include media(0, $range-hand) { - min-width: calc(#{$layout-column-one-third-percentage} - #{$layout-column-spacing-90-hand-and-smaller * 2}); + /* prettier-ignore */ + min-width: calc(#{$layout-column-one-third-percentage} - #{$layout-column-spacing-90-hand-and-smaller *2}); } @include media($range-lap, false) { + /* prettier-ignore */ min-width: calc(#{$layout-column-one-third-percentage} - #{$layout-column-spacing-90-lap-and-larger * 2}); } } @@ -554,17 +584,21 @@ $layout-spacing-variations: ( flex-grow: 2; @include media(0, $range-hand) { + /* prettier-ignore */ min-width: calc(#{$layout-column-two-thirds-percentage} - #{$layout-column-spacing-hand-and-smaller * 2}); } @include media($range-lap, false) { + /* prettier-ignore */ min-width: calc(#{$layout-column-two-thirds-percentage} - #{$layout-column-spacing-lap-and-larger * 2}); } .layout__columns--spacing-90 > & { @include media(0, $range-hand) { + /* prettier-ignore */ min-width: calc(#{$layout-column-two-thirds-percentage} - #{$layout-column-spacing-90-hand-and-smaller * 2}); } @include media($range-lap, false) { + /* prettier-ignore */ min-width: calc(#{$layout-column-two-thirds-percentage} - #{$layout-column-spacing-90-lap-and-larger * 2}); } } diff --git a/scss/layouts/menu-view.scss b/scss/layouts/menu-view.scss index 5596aa2..669ad0e 100644 --- a/scss/layouts/menu-view.scss +++ b/scss/layouts/menu-view.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + .menu-view { position: relative; display: flex; @@ -39,7 +41,7 @@ .menu-view__status-bar { @include ellipsis($display: block); - padding: (($spacing / 8) $spacing); + padding: math.div($spacing, 8) $spacing; background-color: $color-background-colored; color: $color-text-light; text-align: center; @@ -61,7 +63,6 @@ } .menu-view__toggle { - @include media(0, $range-lap) { margin: $spacing * 2; } @@ -72,7 +73,6 @@ } .menu-view__show-action { - .menu-view__menu-status:checked ~ .menu-view__sidebar & { display: none; } diff --git a/scss/layouts/page.scss b/scss/layouts/page.scss index 8148069..ae6e393 100644 --- a/scss/layouts/page.scss +++ b/scss/layouts/page.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + // For IE11 we use 'tables' to fix a render bug with sticky bottom bar .page { @@ -18,7 +20,7 @@ @include is-ie-10-or-11 { display: table-row; - height: $spacing / 8; + height: math.div($spacing, 8); } } @@ -44,6 +46,6 @@ @include is-ie-10-or-11 { display: table-row; - height: $spacing / 8; + height: math.div($spacing, 8); } } diff --git a/scss/reset/focus.scss b/scss/reset/focus.scss index 44eabfb..064cb5c 100644 --- a/scss/reset/focus.scss +++ b/scss/reset/focus.scss @@ -15,7 +15,6 @@ textarea:focus { a:focus, button:focus { - &:active, &:hover { box-shadow: none; diff --git a/scss/reset/inputs.scss b/scss/reset/inputs.scss index 0bf3523..9257e8f 100644 --- a/scss/reset/inputs.scss +++ b/scss/reset/inputs.scss @@ -24,8 +24,8 @@ select { display: none; // NOTE: Remove the cross from input fields in IE } -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { +input[type='number']::-webkit-inner-spin-button, +input[type='number']::-webkit-outer-spin-button { margin: 0; // NOTE: Apparently some margin are still there even though it's hidden -webkit-appearance: none; // NOTE: Remove 'spinner' controls in numberic input fields on WebKit browsers. Used because 'display: none;' will crash Chrome on hover. } diff --git a/scss/utilities/align.scss b/scss/utilities/align.scss index a071d1d..72143c8 100644 --- a/scss/utilities/align.scss +++ b/scss/utilities/align.scss @@ -1,7 +1,10 @@ -@mixin align($method: absolute, $horizontal: center, $vertical: center, $parent: null) { - +@mixin align( + $method: absolute, + $horizontal: center, + $vertical: center, + $parent: null +) { @if $method == 'absolute' { - @if $parent { @at-root #{$parent} { position: relative; @@ -14,138 +17,98 @@ transform: translate(-50%, -50%); left: 50%; top: 50%; - } - - @else if $horizontal == 'center' { + } @else if $horizontal == 'center' { transform: translateX(-50%); left: 50%; - } - - @else if $vertical == 'center' { + } @else if $vertical == 'center' { transform: translateY(-50%); top: 50%; } @if $horizontal == 'left' { left: 0; - } - - @else if $horizontal == 'right' { + } @else if $horizontal == 'right' { right: 0; } @if $vertical == 'top' { top: 0; - } - - @else if $vertical == 'bottom' { + } @else if $vertical == 'bottom' { bottom: 0; } } @if $method == 'fixed' { - position: fixed; @if $horizontal == 'center' and $vertical == 'center' { transform: translate(-50%, -50%); left: 50%; top: 50%; - } - - @else if $horizontal == 'center' { + } @else if $horizontal == 'center' { transform: translateX(-50%); left: 50%; - } - - @else if $vertical == 'center' { + } @else if $vertical == 'center' { transform: translateY(-50%); top: 50%; } @if $horizontal == 'left' { left: 0; - } - - @else if $horizontal == 'right' { + } @else if $horizontal == 'right' { right: 0; } @if $vertical == 'top' { top: 0; - } - - @else if $vertical == 'bottom' { + } @else if $vertical == 'bottom' { bottom: 0; } } @if $method == 'flex' { - @if $parent { @at-root #{$parent} { display: flex; @if $horizontal == 'left' { justify-content: flex-start; - } - - @else if $horizontal == 'center' { + } @else if $horizontal == 'center' { justify-content: center; - } - - @else if $horizontal == 'right' { + } @else if $horizontal == 'right' { justify-content: flex-end; } @if $vertical == 'top' { align-items: flex-start; - } - - @else if $vertical == 'center' { + } @else if $vertical == 'center' { align-items: center; - } - - @else if $vertical == 'bottom' { + } @else if $vertical == 'bottom' { align-items: flex-end; } } - } - - @else { - + } @else { display: flex; @if $horizontal == 'left' { justify-content: flex-start; - } - - @else if $horizontal == 'center' { + } @else if $horizontal == 'center' { justify-content: center; - } - - @else if $horizontal == 'right' { + } @else if $horizontal == 'right' { justify-content: flex-end; } @if $vertical == 'top' { align-items: flex-start; - } - - @else if $vertical == 'center' { + } @else if $vertical == 'center' { align-items: center; - } - - @else if $vertical == 'bottom' { + } @else if $vertical == 'bottom' { align-items: flex-end; } - } - } @if $method == 'table' { - @if $parent { @at-root #{$parent} { display: table; @@ -156,28 +119,19 @@ @if $horizontal == 'left' { text-align: left; - } - - @else if $horizontal == 'center' { + } @else if $horizontal == 'center' { text-align: center; - } - - @else if $horizontal == 'right' { + } @else if $horizontal == 'right' { text-align: right; } @if $vertical == 'top' { vertical-align: top; - } - - @else if $vertical == 'center' { + } @else if $vertical == 'center' { vertical-align: middle; - } - - @else if $vertical == 'bottom' { + } @else if $vertical == 'bottom' { vertical-align: bottom; } - } @if $method == 'margin' { @@ -186,30 +140,21 @@ @if $horizontal == 'left' { margin-left: 0; margin-right: auto; - } - - @else if $horizontal == 'center' { + } @else if $horizontal == 'center' { margin-left: auto; margin-right: auto; - } - - @else if $horizontal == 'right' { + } @else if $horizontal == 'right' { margin-left: auto; margin-right: 0; } } @if $method == 'text' { - @if $horizontal == 'left' { text-align: left; - } - - @else if $horizontal == 'center' { + } @else if $horizontal == 'center' { text-align: center; - } - - @else if $horizontal == 'right' { + } @else if $horizontal == 'right' { text-align: right; } } diff --git a/scss/utilities/get-svg-uri.scss b/scss/utilities/get-svg-uri.scss index e91337c..47acd0d 100644 --- a/scss/utilities/get-svg-uri.scss +++ b/scss/utilities/get-svg-uri.scss @@ -2,7 +2,12 @@ @function str-replace($string, $search, $replace: '') { $index: str-index($string, $search); @if $index { - @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace); + @return str-slice($string, 1, $index - 1) + $replace + + str-replace( + str-slice($string, $index + str-length($search)), + $search, + $replace + ); } @return $string; } @@ -10,11 +15,11 @@ // Thanks to Kevin Weber for his svg-encode function (https://codepen.io/kevinweber/pen/dXWoRw) @function svg-encode($svg) { $encoding-reference: ( - ('<','%3C'), - ('>','%3E'), - ('"','\''), - ('#','%23'), - ('&','%26') + ('<', '%3C'), + ('>', '%3E'), + ('"', "'"), + ('#', '%23'), + ('&', '%26') ); @each $char, $encoded in $encoding-reference { $svg: str-replace($svg, $char, $encoded); diff --git a/scss/utilities/hidpi.scss b/scss/utilities/hidpi.scss index 1d41fc8..2fa83a2 100644 --- a/scss/utilities/hidpi.scss +++ b/scss/utilities/hidpi.scss @@ -1,6 +1,7 @@ // NOTE: Makes sure on laptops with 1.25 resolution, the higher quality image is loaded. @mixin hidpi($ratio: 1.25) { - @media only screen and (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { + @media only screen and (-webkit-min-device-pixel-ratio: 2), + (min-resolution: 192dpi) { @content; } } diff --git a/scss/utilities/media.scss b/scss/utilities/media.scss index db30bea..960e44b 100755 --- a/scss/utilities/media.scss +++ b/scss/utilities/media.scss @@ -9,7 +9,12 @@ $min-width: $media-1-start; $max-width: if($media-2 == null, $media-1-end, $media-2-end); - @if ($min-width == 0 and $max-width == false) or $min-width == false or $max-width == 0 { + @if ($min-width == 0 and $max-width == false) or + $min-width == + false or + $max-width == + 0 + { @error "Ranges can't start with 'false', end with '0' or start with '0' and end with false in the same query"; } @@ -25,7 +30,9 @@ @error "The end of your second range can't be lower than the end of the first range"; } - @if ($orientation and ($orientation != landscape and $orientation != portrait)) { + @if ( + $orientation and ($orientation != landscape and $orientation != portrait) + ) { @error "Orientation value must be landscape or portrait"; } diff --git a/scss/variables/box-shadows.scss b/scss/variables/box-shadows.scss index 2ddb547..5bd17d4 100644 --- a/scss/variables/box-shadows.scss +++ b/scss/variables/box-shadows.scss @@ -2,7 +2,7 @@ $box-shadow: 0 2px 5px rgba($color-shadow, 0.24) !default; $box-shadow-90: 0 1px 3px rgba($color-shadow, 0.26) !default; $box-shadow-100: $box-shadow !default; $box-shadow-200: 0 4px 8px rgba($color-shadow, 0.22) !default; -$box-shadow-300: 0 6px 12px rgba($color-shadow, 0.20) !default; +$box-shadow-300: 0 6px 12px rgba($color-shadow, 0.2) !default; $box-shadow-400: 0 9px 20px rgba($color-shadow, 0.18) !default; $box-shadow-500: 0 18px 32px rgba($color-shadow, 0.16) !default; diff --git a/scss/variables/colors.scss b/scss/variables/colors.scss index 7b1a560..9ea595c 100644 --- a/scss/variables/colors.scss +++ b/scss/variables/colors.scss @@ -5,12 +5,12 @@ // Only use descriptive colors to define functional colors in this document. $color-harbour-black: #000000; $color-harbour-white: #ffffff; -$color-harbour-grey: #65778B; -$color-harbour-yellow: #EFB756; -$color-harbour-purple: #8C5383; -$color-harbour-blue: #3185FC; -$color-harbour-red: #E24D3F; -$color-harbour-green: #729B79; +$color-harbour-grey: #65778b; +$color-harbour-yellow: #efb756; +$color-harbour-purple: #8c5383; +$color-harbour-blue: #3185fc; +$color-harbour-red: #e24d3f; +$color-harbour-green: #729b79; // ## Functional colors // Always use a descriptive color to define a functional color. Always use the right functional color even when two (or more) functional colors have the same descriptive color (e.g. $color-heading and $color-primary). This will help when you want to target a specific color. diff --git a/scss/variables/font-families.scss b/scss/variables/font-families.scss index 1a23a61..04295e7 100755 --- a/scss/variables/font-families.scss +++ b/scss/variables/font-families.scss @@ -1,4 +1,7 @@ -$font-family-sans-serif: '-apple-system', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Helvetica Neue', 'Arial', sans-serif !default; +$font-family-sans-serif: '-apple-system', BlinkMacSystemFont, 'Segoe UI', + 'Roboto', 'Oxygen', 'Ubuntu', 'Helvetica Neue', 'Arial', sans-serif !default; $font-family-serif: 'Georgia', 'Times', serif !default; -$font-family-monospace: 'SFMono-Regular', 'Consolas', 'Liberation Mono', 'Menlo', 'Courier', monospace !default; -$font-family-display: '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Helvetica Neue', 'Arial', sans-serif!default; +$font-family-monospace: 'SFMono-Regular', 'Consolas', 'Liberation Mono', 'Menlo', + 'Courier', monospace !default; +$font-family-display: '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', + 'Roboto', 'Oxygen', 'Ubuntu', 'Helvetica Neue', 'Arial', sans-serif !default; diff --git a/scss/variables/font-weights.scss b/scss/variables/font-weights.scss index 7dfa4bf..7a5f093 100644 --- a/scss/variables/font-weights.scss +++ b/scss/variables/font-weights.scss @@ -6,4 +6,4 @@ $font-weight-200: 700 !default; // NOTE: Medium $font-weight-300: 700 !default; // NOTE: Semi Bold/Demi Bold $font-weight-400: 700 !default; // NOTE: Bold $font-weight-500: 700 !default; // NOTE: Extra Bold/Ultra Bold -$font-weight-600: 700 !default; // NOTE: Black/Heavy \ No newline at end of file +$font-weight-600: 700 !default; // NOTE: Black/Heavy diff --git a/scss/variables/input.scss b/scss/variables/input.scss index d24a488..d0adce0 100644 --- a/scss/variables/input.scss +++ b/scss/variables/input.scss @@ -15,43 +15,60 @@ $input-font-size: $font-size-200 !default; $input-line-height: $line-height-40 !default; $input-focus-border: $input-border-width solid $color-focus !default; $input-focus-background-color: $color-background-light !default; -$input-focus-box-shadow: $input-focus-box-shadow-inset $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; +$input-focus-box-shadow: $input-focus-box-shadow-inset + $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y + $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; $input-is-valid-border: $input-border-width solid $color-ui !default; $input-is-valid-background-color: $color-background-light !default; $input-is-valid-box-shadow: none !default; $input-is-valid-focus-border: $input-border-width solid $color-focus !default; $input-is-valid-focus-background-color: $color-background-light !default; -$input-is-valid-focus-box-shadow: $input-focus-box-shadow-inset $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; +$input-is-valid-focus-box-shadow: $input-focus-box-shadow-inset + $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y + $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; $input-is-invalid-border: $input-border-width solid $color-error !default; $input-is-invalid-background-color: $color-error-10 !default; $input-is-invalid-box-shadow: none !default; $input-is-invalid-focus-border: $input-border-width solid $color-focus !default; $input-is-invalid-focus-background-color: $color-error-10 !default; -$input-is-invalid-focus-box-shadow: $input-focus-box-shadow-inset $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; +$input-is-invalid-focus-box-shadow: $input-focus-box-shadow-inset + $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y + $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; $input-autofill-border: $input-border-width solid $color-tertiary-100 !default; $input-autofill-background-color: $color-tertiary-10 !important !default; $input-autofill-box-shadow: 0 0 0 0 transparent !default; $input-autofill-box-shadow-background: inset 0 0 0 1000px $color-tertiary-10 !default; $input-autofill-focus-border: $input-border-width solid $color-focus !default; $input-autofill-focus-background-color: $color-tertiary-10 !important !default; -$input-autofill-focus-box-shadow: $input-focus-box-shadow-inset $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; -$input-autofill-focus-box-shadow-background: inset 0 0 0 1000px $color-tertiary-10 !default; +$input-autofill-focus-box-shadow: $input-focus-box-shadow-inset + $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y + $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; +$input-autofill-focus-box-shadow-background: inset 0 0 0 1000px + $color-tertiary-10 !default; $input-autofill-is-valid-border: $input-border-width solid $color-tertiary-100 !default; $input-autofill-is-valid-background-color: $color-tertiary-10 !important !default; $input-autofill-is-valid-box-shadow: 0 0 0 0 transparent !default; -$input-autofill-is-valid-box-shadow-background: inset 0 0 0 1000px $color-tertiary-10 !default; +$input-autofill-is-valid-box-shadow-background: inset 0 0 0 1000px + $color-tertiary-10 !default; $input-autofill-is-valid-focus-border: $input-border-width solid $color-focus !default; $input-autofill-is-valid-focus-background-color: $color-tertiary-10 !important !default; -$input-autofill-is-valid-focus-box-shadow: $input-focus-box-shadow-inset $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; -$input-autofill-is-valid-focus-box-shadow-background: inset 0 0 0 1000px $color-tertiary-10 !default; +$input-autofill-is-valid-focus-box-shadow: $input-focus-box-shadow-inset + $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y + $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; +$input-autofill-is-valid-focus-box-shadow-background: inset 0 0 0 1000px + $color-tertiary-10 !default; $input-autofill-is-invalid-border: $input-border-width solid $color-error !default; $input-autofill-is-invalid-background-color: $color-error-10 !important !default; $input-autofill-is-invalid-box-shadow: 0 0 0 0 transparent !default; -$input-autofill-is-invalid-box-shadow-background: inset 0 0 0 1000px $color-error-10 !default; +$input-autofill-is-invalid-box-shadow-background: inset 0 0 0 1000px + $color-error-10 !default; $input-autofill-is-invalid-focus-border: $input-border-width solid $color-focus !default; $input-autofill-is-invalid-focus-background-color: $color-error-10 !default; -$input-autofill-is-invalid-focus-box-shadow: $input-focus-box-shadow-inset $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; -$input-autofill-is-invalid-focus-box-shadow-background: inset 0 0 0 1000px $color-error-10 !default; +$input-autofill-is-invalid-focus-box-shadow: $input-focus-box-shadow-inset + $input-focus-box-shadow-offset-x $input-focus-box-shadow-offset-y + $input-focus-box-shadow-blur $input-focus-box-shadow-spread $color-focus !default; +$input-autofill-is-invalid-focus-box-shadow-background: inset 0 0 0 1000px + $color-error-10 !default; $input-is-valid-icon: $icon-check !default; $input-is-valid-icon-color: $color-success !default; diff --git a/scss/variables/sizes.scss b/scss/variables/sizes.scss index 3bf8e37..7914500 100644 --- a/scss/variables/sizes.scss +++ b/scss/variables/sizes.scss @@ -1,3 +1,5 @@ +@use 'sass:math'; + $spacing: 8px; $golden-ratio-70: 23.6% !default; @@ -6,11 +8,11 @@ $golden-ratio-90: 50% !default; $golden-ratio-100: 61.8% !default; $golden-ratio-200: 161.8% !default; -$aspect-ratio-portrait: 100% / 2 * 3 !default; -$aspect-ratio-landscape: 100% / 3 * 2 !default; +$aspect-ratio-portrait: math.div(100%, 2) * 3 !default; +$aspect-ratio-landscape: math.div(100%, 3) * 2 !default; $aspect-ratio-square: 100% !default; -$aspect-ratio-wide: 100% / 16 * 9 !default; -$aspect-ratio-ultra-wide: 100% / 239 * 100 !default; +$aspect-ratio-wide: math.div(100%, 16) * 9 !default; +$aspect-ratio-ultra-wide: math.div(100%, 239) * 100 !default; $control-size-40: $spacing * 2 !default; $control-size-50: $spacing * 2.5 !default; diff --git a/scss/vendors/highlight.scss b/scss/vendors/highlight.scss index b531468..fbd9af9 100644 --- a/scss/vendors/highlight.scss +++ b/scss/vendors/highlight.scss @@ -1,65 +1,210 @@ // Thanks to demisx: https://gist.github.com/demisx/8408522 -.highlight { background: #ffffff; } -.highlight .c { color: #999988; font-style: italic } /* Comment */ -.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ -.highlight .k { font-weight: bold } /* Keyword */ -.highlight .o { font-weight: bold } /* Operator */ -.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */ -.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */ -.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */ -.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */ -.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ -.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */ -.highlight .ge { font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #aa0000 } /* Generic.Error */ -.highlight .gh { color: #999999 } /* Generic.Heading */ -.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ -.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */ -.highlight .go { color: #888888 } /* Generic.Output */ -.highlight .gp { color: #555555 } /* Generic.Prompt */ -.highlight .gs { font-weight: bold } /* Generic.Strong */ -.highlight .gu { color: #aaaaaa } /* Generic.Subheading */ -.highlight .gt { color: #aa0000 } /* Generic.Traceback */ -.highlight .kc { font-weight: bold } /* Keyword.Constant */ -.highlight .kd { font-weight: bold } /* Keyword.Declaration */ -.highlight .kp { font-weight: bold } /* Keyword.Pseudo */ -.highlight .kr { font-weight: bold } /* Keyword.Reserved */ -.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */ -.highlight .m { color: #009999 } /* Literal.Number */ -.highlight .s { color: #d14 } /* Literal.String */ -.highlight .na { color: #008080 } /* Name.Attribute */ -.highlight .nb { color: #0086B3 } /* Name.Builtin */ -.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */ -.highlight .no { color: #008080 } /* Name.Constant */ -.highlight .ni { color: #800080 } /* Name.Entity */ -.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */ -.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */ -.highlight .nn { color: #555555 } /* Name.Namespace */ -.highlight .nt { color: #000080 } /* Name.Tag */ -.highlight .nv { color: #008080 } /* Name.Variable */ -.highlight .ow { font-weight: bold } /* Operator.Word */ -.highlight .w { color: #bbbbbb } /* Text.Whitespace */ -.highlight .mf { color: #009999 } /* Literal.Number.Float */ -.highlight .mh { color: #009999 } /* Literal.Number.Hex */ -.highlight .mi { color: #009999 } /* Literal.Number.Integer */ -.highlight .mo { color: #009999 } /* Literal.Number.Oct */ -.highlight .sb { color: #d14 } /* Literal.String.Backtick */ -.highlight .sc { color: #d14 } /* Literal.String.Char */ -.highlight .sd { color: #d14 } /* Literal.String.Doc */ -.highlight .s2 { color: #d14 } /* Literal.String.Double */ -.highlight .se { color: #d14 } /* Literal.String.Escape */ -.highlight .sh { color: #d14 } /* Literal.String.Heredoc */ -.highlight .si { color: #d14 } /* Literal.String.Interpol */ -.highlight .sx { color: #d14 } /* Literal.String.Other */ -.highlight .sr { color: #009926 } /* Literal.String.Regex */ -.highlight .s1 { color: #d14 } /* Literal.String.Single */ -.highlight .ss { color: #990073 } /* Literal.String.Symbol */ -.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */ -.highlight .vc { color: #008080 } /* Name.Variable.Class */ -.highlight .vg { color: #008080 } /* Name.Variable.Global */ -.highlight .vi { color: #008080 } /* Name.Variable.Instance */ -.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */ +.highlight { + background: #ffffff; +} +.highlight .c { + color: #999988; + font-style: italic; +} /* Comment */ +.highlight .err { + color: #a61717; + background-color: #e3d2d2; +} /* Error */ +.highlight .k { + font-weight: bold; +} /* Keyword */ +.highlight .o { + font-weight: bold; +} /* Operator */ +.highlight .cm { + color: #999988; + font-style: italic; +} /* Comment.Multiline */ +.highlight .cp { + color: #999999; + font-weight: bold; +} /* Comment.Preproc */ +.highlight .c1 { + color: #999988; + font-style: italic; +} /* Comment.Single */ +.highlight .cs { + color: #999999; + font-weight: bold; + font-style: italic; +} /* Comment.Special */ +.highlight .gd { + color: #000000; + background-color: #ffdddd; +} /* Generic.Deleted */ +.highlight .gd .x { + color: #000000; + background-color: #ffaaaa; +} /* Generic.Deleted.Specific */ +.highlight .ge { + font-style: italic; +} /* Generic.Emph */ +.highlight .gr { + color: #aa0000; +} /* Generic.Error */ +.highlight .gh { + color: #999999; +} /* Generic.Heading */ +.highlight .gi { + color: #000000; + background-color: #ddffdd; +} /* Generic.Inserted */ +.highlight .gi .x { + color: #000000; + background-color: #aaffaa; +} /* Generic.Inserted.Specific */ +.highlight .go { + color: #888888; +} /* Generic.Output */ +.highlight .gp { + color: #555555; +} /* Generic.Prompt */ +.highlight .gs { + font-weight: bold; +} /* Generic.Strong */ +.highlight .gu { + color: #aaaaaa; +} /* Generic.Subheading */ +.highlight .gt { + color: #aa0000; +} /* Generic.Traceback */ +.highlight .kc { + font-weight: bold; +} /* Keyword.Constant */ +.highlight .kd { + font-weight: bold; +} /* Keyword.Declaration */ +.highlight .kp { + font-weight: bold; +} /* Keyword.Pseudo */ +.highlight .kr { + font-weight: bold; +} /* Keyword.Reserved */ +.highlight .kt { + color: #445588; + font-weight: bold; +} /* Keyword.Type */ +.highlight .m { + color: #009999; +} /* Literal.Number */ +.highlight .s { + color: #d14; +} /* Literal.String */ +.highlight .na { + color: #008080; +} /* Name.Attribute */ +.highlight .nb { + color: #0086b3; +} /* Name.Builtin */ +.highlight .nc { + color: #445588; + font-weight: bold; +} /* Name.Class */ +.highlight .no { + color: #008080; +} /* Name.Constant */ +.highlight .ni { + color: #800080; +} /* Name.Entity */ +.highlight .ne { + color: #990000; + font-weight: bold; +} /* Name.Exception */ +.highlight .nf { + color: #990000; + font-weight: bold; +} /* Name.Function */ +.highlight .nn { + color: #555555; +} /* Name.Namespace */ +.highlight .nt { + color: #000080; +} /* Name.Tag */ +.highlight .nv { + color: #008080; +} /* Name.Variable */ +.highlight .ow { + font-weight: bold; +} /* Operator.Word */ +.highlight .w { + color: #bbbbbb; +} /* Text.Whitespace */ +.highlight .mf { + color: #009999; +} /* Literal.Number.Float */ +.highlight .mh { + color: #009999; +} /* Literal.Number.Hex */ +.highlight .mi { + color: #009999; +} /* Literal.Number.Integer */ +.highlight .mo { + color: #009999; +} /* Literal.Number.Oct */ +.highlight .sb { + color: #d14; +} /* Literal.String.Backtick */ +.highlight .sc { + color: #d14; +} /* Literal.String.Char */ +.highlight .sd { + color: #d14; +} /* Literal.String.Doc */ +.highlight .s2 { + color: #d14; +} /* Literal.String.Double */ +.highlight .se { + color: #d14; +} /* Literal.String.Escape */ +.highlight .sh { + color: #d14; +} /* Literal.String.Heredoc */ +.highlight .si { + color: #d14; +} /* Literal.String.Interpol */ +.highlight .sx { + color: #d14; +} /* Literal.String.Other */ +.highlight .sr { + color: #009926; +} /* Literal.String.Regex */ +.highlight .s1 { + color: #d14; +} /* Literal.String.Single */ +.highlight .ss { + color: #990073; +} /* Literal.String.Symbol */ +.highlight .bp { + color: #999999; +} /* Name.Builtin.Pseudo */ +.highlight .vc { + color: #008080; +} /* Name.Variable.Class */ +.highlight .vg { + color: #008080; +} /* Name.Variable.Global */ +.highlight .vi { + color: #008080; +} /* Name.Variable.Instance */ +.highlight .il { + color: #009999; +} /* Literal.Number.Integer.Long */ -.post > .highlight .lineno { color: #ccc; display:inline-block; padding: 0 5px; border-right:1px solid #ccc; } -.post > .highlight pre code { display: block; white-space: pre; overflow-x: auto; word-wrap: normal; } +.post > .highlight .lineno { + color: #ccc; + display: inline-block; + padding: 0 5px; + border-right: 1px solid #ccc; +} +.post > .highlight pre code { + display: block; + white-space: pre; + overflow-x: auto; + word-wrap: normal; +} diff --git a/site/_layouts/default.html b/site/_layouts/default.html index 04ea683..acf95e4 100644 --- a/site/_layouts/default.html +++ b/site/_layouts/default.html @@ -1,70 +1,81 @@ - + - - - Harbour Styleguide{%- if page.title -%} · {{ page.title }}{% endif %} - + + + + Harbour Styleguide{%- if page.title -%} · {{ page.title }}{% + endif %} + + - +
{{ site.packageVersion }} · {{ site.branchName }}
- -
- {% for collection in site.collections %} - {% if collection.label != 'posts' %} -
-
-
-

{{ collection.label | capitalize }}

-
-
+ {% for collection in site.collections %} {% if collection.label != + 'posts' %} +
+
+
+

+ {{ collection.label | capitalize }} +

-
-
- {% for collection-item in collection.docs %} - {% if page.url == collection-item.url %} - - {{ collection-item.title }} - - {% endfor %} -
-
- {% endif %} - {% endfor %} +
+
+
+
+ {% for collection-item in collection.docs %} {% if page.url == + collection-item.url %} + + {{ collection-item.title }} + + {% endfor %} +
+
+ {% endif %} {% endfor %}
@@ -74,16 +85,20 @@

{{ collection.label | capitalize }}

-
+

{{ page.title }}

-
- {{ content }} -
+
{{ content }}
@@ -92,14 +107,35 @@

{{ page.title }}

-
-

When I'm not surfing or sailing, I am to be found at the harbour working on my boat.

+
+

+ When I'm not surfing or sailing, I am to be found at the + harbour working on my boat. +

-
+
-
+

Build on {{ site.time | date: "%-d %B %Y %R"}}

@@ -110,19 +146,23 @@

{{ page.title }}