From fd71e2e2e19379d7ceb00929920f1cb145605e07 Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Mon, 31 Jan 2022 23:31:44 +0100 Subject: [PATCH 01/25] brb --- .../com_media/scss/components/_layout.scss | 4 +- .../scss/components/_media-infobar.scss | 8 +- .../scss/components/_media-tree.scss | 4 +- build/media_source/system/scss/_icomoon.scss | 4 +- .../system/scss/fields/switcher.scss | 4 +- .../system/scss/joomla-fontawesome.scss | 1 + .../administrator/atum/scss/_variables.scss | 1 + .../scss/vendor/awesomplete/awesomplete.scss | 2 +- .../atum/scss/vendor/choicesjs/choices.scss | 2 +- .../vendor/fontawesome-free/fontawesome.scss | 1 + .../joomla-custom-elements/joomla-alert.scss | 2 +- .../scss/vendor/minicolors/minicolors.scss | 2 +- .../cassiopeia/scss/blocks/_back-to-top.scss | 2 +- .../site/cassiopeia/scss/blocks/_footer.scss | 2 +- .../site/cassiopeia/scss/blocks/_global.scss | 2 +- .../site/cassiopeia/scss/blocks/_header.scss | 6 +- .../site/cassiopeia/scss/blocks/_layout.scss | 2 +- .../cassiopeia/scss/blocks/_modifiers.scss | 6 +- .../scss/tools/variables/_variables.scss | 1 + .../site/cassiopeia/scss/vendor/_chosen.scss | 2 +- .../scss/vendor/metismenu/_metismenu.scss | 6 +- installation/template/scss/template.scss | 1 + package-lock.json | 264 +++++++++++------- package.json | 3 +- 24 files changed, 197 insertions(+), 135 deletions(-) diff --git a/build/media_source/com_media/scss/components/_layout.scss b/build/media_source/com_media/scss/components/_layout.scss index 3fd746c20825d..7358995d175af 100644 --- a/build/media_source/com_media/scss/components/_layout.scss +++ b/build/media_source/com_media/scss/components/_layout.scss @@ -27,8 +27,8 @@ position: relative; width: 100%; min-height: 1px; - padding-right: ($col-gutter-width / 2); - padding-left: ($col-gutter-width / 2); + padding-right: $col-gutter-width * .5; + padding-left: $col-gutter-width * .5; } @media (min-width: var(--breakpoint-md)) { diff --git a/build/media_source/com_media/scss/components/_media-infobar.scss b/build/media_source/com_media/scss/components/_media-infobar.scss index 45d798d989ece..b2ceced65cee2 100644 --- a/build/media_source/com_media/scss/components/_media-infobar.scss +++ b/build/media_source/com_media/scss/components/_media-infobar.scss @@ -27,16 +27,16 @@ $fa-css-prefix: fa; dl { display: flex; flex-wrap: wrap; - margin-right: -($col-gutter-width / 2); - margin-left: -($col-gutter-width / 2); + margin-right: -($col-gutter-width * .5); + margin-left: -($col-gutter-width * .5); } dt, dd { position: relative; direction: ltr; width: 100%; min-height: 1px; - padding-right: ($col-gutter-width / 2); - padding-left: ($col-gutter-width / 2); + padding-right: ($col-gutter-width * .5); + padding-left: ($col-gutter-width * .5); [dir=rtl] & { text-align: end; } diff --git a/build/media_source/com_media/scss/components/_media-tree.scss b/build/media_source/com_media/scss/components/_media-tree.scss index 8ad38bde922a9..3e297d579acaa 100644 --- a/build/media_source/com_media/scss/components/_media-tree.scss +++ b/build/media_source/com_media/scss/components/_media-tree.scss @@ -41,7 +41,7 @@ ul.media-tree { display: block; &::before { position: absolute; - top: ($sidebar-tree-line-height / 2); + top: $sidebar-tree-line-height * .5; left: 0; width: 10px; height: 1px; @@ -61,7 +61,7 @@ ul.media-tree { } &:last-child { &::after { - height: ($sidebar-tree-line-height / 2); + height: $sidebar-tree-line-height * .5; } } li { diff --git a/build/media_source/system/scss/_icomoon.scss b/build/media_source/system/scss/_icomoon.scss index a17e6afd40c33..16a6d6c0abfaf 100644 --- a/build/media_source/system/scss/_icomoon.scss +++ b/build/media_source/system/scss/_icomoon.scss @@ -289,7 +289,7 @@ $jicons: ( minus-circle : $fa-var-minus-circle, minus-sign : $fa-var-minus, minus : $fa-var-minus, - mobile : $fa-var-mobile, + // mobile : $fa-var-mobile, move : $fa-var-arrows-alt, music : $fa-var-music, new-tab-2 : $fa-var-external-link-square-alt, @@ -403,7 +403,7 @@ $jicons: ( support : $fa-var-life-ring, switch : $fa-var-power-off, sync : $fa-var-sync, - tablet : $fa-var-tablet, + // tablet : $fa-var-tablet, tachometer-alt : $fa-var-tachometer-alt, tag-2 : $fa-var-tag, tag : $fa-var-tag, diff --git a/build/media_source/system/scss/fields/switcher.scss b/build/media_source/system/scss/fields/switcher.scss index 1ae0e8949c49b..3535e2ccc1f26 100644 --- a/build/media_source/system/scss/fields/switcher.scss +++ b/build/media_source/system/scss/fields/switcher.scss @@ -75,12 +75,12 @@ $switcher-height: 28px; .switcher .toggle-inside { position: absolute; left: 0; - width: ($switcher-width - 6) / 2; + width: ($switcher-width - 6) * .5; height: $switcher-height; background: #fff; transition: .4s ease all; } .switcher input ~ input:checked ~ .toggle-outside .toggle-inside { - left: ($switcher-width / 2) - 1; + left: ($switcher-width * .5) - 1; } diff --git a/build/media_source/system/scss/joomla-fontawesome.scss b/build/media_source/system/scss/joomla-fontawesome.scss index f94624aaffa4f..fb0bf45f76d73 100644 --- a/build/media_source/system/scss/joomla-fontawesome.scss +++ b/build/media_source/system/scss/joomla-fontawesome.scss @@ -1,6 +1,7 @@ // Override the font path $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts" !default; $fa-font-display: block !default; +$fa-fw-width: 20em * .0625; // Font Awesome 5 Free @import "../../../../media/vendor/fontawesome-free/scss/fontawesome"; diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 350388df4893d..522fe6d99a6cf 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -147,6 +147,7 @@ $jicon-css-prefix: icon !default; $fa-css-prefix: fa !default; $fa-font-path: "../../../../media/vendor/fontawesome-free/webfonts"; $roboto-font-path: "../../../../../media/vendor/roboto-fontface/fonts"; +$fa-fw-width: (20em * .0625); // Font weights $thin-weight: 100; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss b/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss index 6b7fa9355a4a6..639aa912dcd8d 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss @@ -1,5 +1,5 @@ // Awesomplete -@import "../../../../../../../../node_modules/awesomplete/awesomplete"; +@import "../../../../../../../../media/vendor/awesomplete/css/awesomplete"; .awesomplete { display: block; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss index 7471b30062fb7..e85ab222ef51c 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss @@ -7,7 +7,7 @@ @import "../../../../../../../../media/vendor/bootstrap/scss/mixins"; // choices.js -@import "../../../../../../../../node_modules/choices.js/src/styles/choices"; +@import "../../../../../../../../media/vendor/choicesjs/scss/choices"; .choices { border: 0; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss index 9df0b7a94aac4..4a8d1bb92c49d 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss @@ -1,6 +1,7 @@ // Override the font path $fa-css-prefix: fa; $fa-font-path: "../../../../../../vendor/fontawesome-free/webfonts" !default; +$fa-fw-width: (20em * .0625); // Font Awesome 5 Free @import "../../../../../../../../media/vendor/fontawesome-free/scss/fontawesome"; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss index 4be15b80f168d..6efacccc73dde 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss @@ -1,5 +1,5 @@ @import "../../variables"; -@import "../../../../../../../../node_modules/joomla-ui-custom-elements/dist/css/joomla-alert"; +@import "../../../../../../../../media/vendor/joomla-custom-elements/css/joomla-alert"; // The following is a restyle for the system alerts diff --git a/build/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss b/build/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss index 86af4780f9b8d..27ec546848da4 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss @@ -1,5 +1,5 @@ // Minicolours -@import "../../../../../../../../node_modules/@claviska/jquery-minicolors/jquery.minicolors"; +@import "../../../../../../../../media/vendor/minicolors/css/jquery.minicolors"; .minicolors-theme-bootstrap { diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_back-to-top.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_back-to-top.scss index e624d34a891aa..ae6727d1856ec 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_back-to-top.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_back-to-top.scss @@ -7,7 +7,7 @@ inset-inline-end: 1rem; bottom: 1rem; z-index: 10000; - padding: $cassiopeia-grid-gutter/2; + padding: $cassiopeia-grid-gutter * .5; color: var(--cassiopeia-color-primary, $standard-color-primary); pointer-events: all; background-color: var(--white, $white); diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss index 5f3ed1a468d41..afb614a9b91f1 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss @@ -9,7 +9,7 @@ .grid-child { align-items: center; justify-content: space-between; - padding: 2.5rem ($cassiopeia-grid-gutter/2); + padding: 2.5rem ($cassiopeia-grid-gutter * .5); } a { diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss index 0b539b2b08df0..85b9533e5e6b9 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss @@ -84,7 +84,7 @@ a { .btn-group { margin-bottom: $cassiopeia-grid-gutter; > input { - padding: $cassiopeia-grid-gutter/2; + padding: $cassiopeia-grid-gutter * .5; border: 1px solid $gray-400; @include border-start-radius($border-radius); @include border-end-radius(0); diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss index fbbe719484417..938f3807a59f7 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss @@ -12,12 +12,12 @@ } .grid-child { - padding: ($cassiopeia-grid-gutter / 2); + padding: $cassiopeia-grid-gutter * .5; } nav { padding: 0; - margin-top: $cassiopeia-grid-gutter / 2; + margin-top: $cassiopeia-grid-gutter * .5; } .site-description { @@ -210,7 +210,7 @@ } .container-search { - margin-top: $cassiopeia-grid-gutter / 2; + margin-top: $cassiopeia-grid-gutter * .5; } .mod-finder { diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss index 4ab33cf9d11d9..ca9419b0cf57c 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss @@ -32,7 +32,7 @@ position: relative; > * { flex: 1; - margin: ($cassiopeia-grid-gutter / 2) 0; + margin: ($cassiopeia-grid-gutter * .5) 0; } @include media-breakpoint-down(lg) { diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss index fa4d7e919c5cd..3c0c6640a6652 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss @@ -85,9 +85,9 @@ flex-wrap: wrap; width: 100%; padding: 0; - margin-right: -($cassiopeia-grid-gutter / 2); + margin-right: -($cassiopeia-grid-gutter * .5); margin-bottom: $cassiopeia-grid-gutter; - margin-left: -($cassiopeia-grid-gutter / 2); + margin-left: -($cassiopeia-grid-gutter * .5); @include media-breakpoint-up(lg) { &.columns-2 { @@ -113,7 +113,7 @@ .blog-item { display: flex; flex-direction: column; - padding: 0 ($cassiopeia-grid-gutter / 2) $cassiopeia-grid-gutter; + padding: 0 ($cassiopeia-grid-gutter * .5) $cassiopeia-grid-gutter; overflow: hidden; .boxed & { diff --git a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss index 4a10b9b082d8f..674623a4093a4 100644 --- a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss +++ b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss @@ -148,6 +148,7 @@ $cassiopeia-grid-gutter: $grid-gutter-width; // Components $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; +$fa-fw-width: 20em * .0625; // Treeselect $treeselect-line-height: 2.2rem; diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss index c12777482d940..328b99c3627a0 100644 --- a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss +++ b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss @@ -97,7 +97,7 @@ $chosen-select-padding-y: $form-select-padding-y + .21; &::before { position: absolute; top: 6px; - right: ($chosen-multi-close-width / 4); + right: ($chosen-multi-close-width * .25); font-size: $font-size-base; color: $white; content: "\00d7"; diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss b/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss index 24f0485a9648e..1ec186413409d 100644 --- a/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss +++ b/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss @@ -30,7 +30,7 @@ display: flex; flex-wrap: wrap; align-items: center; - padding: ($cassiopeia-grid-gutter/2) $cassiopeia-grid-gutter; + padding: ($cassiopeia-grid-gutter * .5) $cassiopeia-grid-gutter; font-size: 1.1rem; line-height: 1.5; @@ -138,8 +138,8 @@ position: relative; top: 0; flex-basis: calc(100% + #{$cassiopeia-grid-gutter}); - margin-top: ($cassiopeia-grid-gutter/2); - margin-bottom: ($cassiopeia-grid-gutter/-2); + margin-top: ($cassiopeia-grid-gutter * .5); + margin-bottom: ($cassiopeia-grid-gutter * .5); background-color: hsla(0, 0%, 0%, .03); box-shadow: none; } diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 26b7f93f96416..71aae56c11b08 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -3,6 +3,7 @@ $jicon-css-prefix: icon; $fa-css-prefix: fa; $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; +$fa-fw-width: 20em * .0625; // Font Awesome @import "../../../build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome"; diff --git a/package-lock.json b/package-lock.json index 3386825dd2d75..fec8faa94c9cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "GPL-2.0-or-later", "dependencies": { "@claviska/jquery-minicolors": "^2.3.6", - "@fortawesome/fontawesome-free": "^5.15.4", + "@fortawesome/fontawesome-free": "^6.0.0-beta3", "@popperjs/core": "^2.11.0", "@webcomponents/webcomponentsjs": "^2.6.0", "accessibility": "^3.0.14", @@ -79,6 +79,7 @@ "rollup-plugin-vue": "^6.0.0", "sass": "^1.45.0", "selenium-standalone": "^8.0.8", + "semver": "^7.3.5", "stylelint": "^14.1.0", "stylelint-config-standard": "^24.0.0", "stylelint-order": "^5.0.0", @@ -141,6 +142,15 @@ "url": "https://opencollective.com/babel" } }, + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/generator": { "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz", @@ -198,6 +208,15 @@ "@babel/core": "^7.0.0" } }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/helper-create-class-features-plugin": { "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.7.tgz", @@ -254,6 +273,15 @@ "@babel/core": "^7.4.0-0" } }, + "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/helper-environment-visitor": { "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz", @@ -1568,6 +1596,15 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/preset-env/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/preset-modules": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", @@ -1699,9 +1736,9 @@ } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "5.15.4", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz", - "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==", + "version": "6.0.0-beta3", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0-beta3.tgz", + "integrity": "sha512-4SqOuhC8tSLeQvbW1nDmq6T7+8vdSgHy/w7PRwCFzMQCbKuYFIir/3UuWsV1QblX1lt7SGlSgwbaCv9XhRt8HA==", "hasInstallScript": true, "engines": { "node": ">=6" @@ -2351,6 +2388,15 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/babel-plugin-polyfill-corejs3": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz", @@ -3628,6 +3674,15 @@ "eslint-plugin-import": "^2.25.2" } }, + "node_modules/eslint-config-airbnb-base/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/eslint-import-resolver-node": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", @@ -3742,20 +3797,6 @@ "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/eslint-plugin-vue/node_modules/semver": { - "version": "7.3.5", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint-scope": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz", @@ -3896,20 +3937,6 @@ "node": ">=8" } }, - "node_modules/eslint/node_modules/semver": { - "version": "7.3.5", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/eslint/node_modules/supports-color": { "version": "7.2.0", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -5026,6 +5053,15 @@ "node": ">=8" } }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/istanbul-lib-report": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", @@ -5504,6 +5540,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/map-obj": { "version": "4.2.1", "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==", @@ -5735,20 +5780,6 @@ "node": ">=8" } }, - "node_modules/meow/node_modules/semver": { - "version": "7.3.5", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/meow/node_modules/type-fest": { "version": "0.18.1", "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", @@ -7204,11 +7235,18 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, "bin": { "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/setprototypeof": { @@ -8245,21 +8283,6 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/vue-eslint-parser/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/vuex": { "version": "4.0.2", "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==", @@ -8497,6 +8520,14 @@ "json5": "^2.1.2", "semver": "^6.3.0", "source-map": "^0.5.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "@babel/generator": { @@ -8539,6 +8570,14 @@ "@babel/helper-validator-option": "^7.16.7", "browserslist": "^4.17.5", "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==", + "dev": true + } } }, "@babel/helper-create-class-features-plugin": { @@ -8580,6 +8619,14 @@ "lodash.debounce": "^4.0.8", "resolve": "^1.14.2", "semver": "^6.1.2" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "@babel/helper-environment-visitor": { @@ -9477,6 +9524,14 @@ "babel-plugin-polyfill-regenerator": "^0.3.0", "core-js-compat": "^3.19.1", "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==", + "dev": true + } } }, "@babel/preset-modules": { @@ -9580,9 +9635,9 @@ } }, "@fortawesome/fontawesome-free": { - "version": "5.15.4", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz", - "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==" + "version": "6.0.0-beta3", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0-beta3.tgz", + "integrity": "sha512-4SqOuhC8tSLeQvbW1nDmq6T7+8vdSgHy/w7PRwCFzMQCbKuYFIir/3UuWsV1QblX1lt7SGlSgwbaCv9XhRt8HA==" }, "@humanwhocodes/config-array": { "version": "0.9.2", @@ -10094,6 +10149,14 @@ "@babel/compat-data": "^7.13.11", "@babel/helper-define-polyfill-provider": "^0.3.0", "semver": "^6.1.1" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "babel-plugin-polyfill-corejs3": { @@ -11112,14 +11175,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "semver": { - "version": "7.3.5", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, "supports-color": { "version": "7.2.0", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", @@ -11140,6 +11195,14 @@ "object.assign": "^4.1.2", "object.entries": "^1.1.5", "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==", + "dev": true + } } }, "eslint-import-resolver-node": { @@ -11242,16 +11305,6 @@ "natural-compare": "^1.4.0", "semver": "^7.3.5", "vue-eslint-parser": "^8.0.1" - }, - "dependencies": { - "semver": { - "version": "7.3.5", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - } } }, "eslint-scope": { @@ -12080,6 +12133,14 @@ "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.0.0", "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==", + "dev": true + } } }, "istanbul-lib-report": { @@ -12471,6 +12532,14 @@ "dev": true, "requires": { "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "map-obj": { @@ -12644,14 +12713,6 @@ } } }, - "semver": { - "version": "7.3.5", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, "type-fest": { "version": "0.18.1", "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", @@ -13654,9 +13715,13 @@ } }, "semver": { - "version": "6.3.0", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } }, "setprototypeof": { "version": "1.1.1", @@ -14453,15 +14518,6 @@ "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } - }, - "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } } } }, diff --git a/package.json b/package.json index 7f8b9ac58c41a..cd114404316a8 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ ], "dependencies": { "@claviska/jquery-minicolors": "^2.3.6", - "@fortawesome/fontawesome-free": "^5.15.4", + "@fortawesome/fontawesome-free": "^6.0.0-beta3", "@popperjs/core": "^2.11.0", "@webcomponents/webcomponentsjs": "^2.6.0", "accessibility": "^3.0.14", @@ -100,6 +100,7 @@ "rollup-plugin-vue": "^6.0.0", "sass": "^1.45.0", "selenium-standalone": "^8.0.8", + "semver": "^7.3.5", "stylelint": "^14.1.0", "stylelint-config-standard": "^24.0.0", "stylelint-order": "^5.0.0", From 1537b8c00eaedba8830c71b293b38c4fd6dde740 Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Mon, 31 Jan 2022 23:49:07 +0100 Subject: [PATCH 02/25] pfff --- build/build-modules-js/settings.json | 5 +- .../vendor/choicesjs/scss/base.scss | 191 ++++++++++ .../vendor/choicesjs/scss/choices.scss | 357 ++++++++++++++++++ 3 files changed, 549 insertions(+), 4 deletions(-) create mode 100644 build/media_source/vendor/choicesjs/scss/base.scss create mode 100644 build/media_source/vendor/choicesjs/scss/choices.scss diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json index a09f7ece76a35..ad3455d9693a2 100644 --- a/build/build-modules-js/settings.json +++ b/build/build-modules-js/settings.json @@ -256,10 +256,7 @@ "public/assets/styles/choices.css": "css/choices.css", "public/assets/styles/choices.min.css": "css/choices.min.css" }, - "filesExtra": { - "src/styles/base.scss": "scss/base.scss", - "src/styles/choices.scss": "scss/choices.scss" - }, + "comment": "filesExtra = src/styles/base.scss:scss/base.scss, src/styles/choices.scss:scss/choices.scss", "provideAssets": [ { "name": "choicesjs", diff --git a/build/media_source/vendor/choicesjs/scss/base.scss b/build/media_source/vendor/choicesjs/scss/base.scss new file mode 100644 index 0000000000000..9ea14419b969d --- /dev/null +++ b/build/media_source/vendor/choicesjs/scss/base.scss @@ -0,0 +1,191 @@ +/*============================================= += Generic styling = +=============================================*/ + +$global-guttering: 24px; +$global-font-size-h1: 32px; +$global-font-size-h2: 24px; +$global-font-size-h3: 20px; +$global-font-size-h4: 18px; +$global-font-size-h5: 16px; +$global-font-size-h6: 14px; + +* { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +*, +*:before, +*:after { + box-sizing: border-box; +} + +html, +body { + position: relative; + margin: 0; + width: 100%; + height: 100%; +} + +body { + font-family: 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; + font-size: 16px; + line-height: 1.4; + color: #ffffff; + background-color: #333; + overflow-x: hidden; +} + +label { + display: block; + margin-bottom: 8px; + font-size: 14px; + font-weight: 500; + cursor: pointer; +} + +p { + margin-top: 0; +} + +hr { + display: block; + margin: $global-guttering * 1.25 0; + border: 0; + border-bottom: 1px solid #eaeaea; + height: 1px; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + margin-top: 0; + margin-bottom: $global-guttering * .5; + font-weight: 400; + line-height: 1.2; +} + +a, +a:visited, +a:focus { + color: #ffffff; + text-decoration: none; + font-weight: 600; +} + +.form-control { + display: block; + width: 100%; + background-color: #f9f9f9; + padding: 12px; + border: 1px solid #ddd; + border-radius: 2.5px; + font-size: 14px; + -webkit-appearance: none; + appearance: none; + margin-bottom: $global-guttering; +} + +h1, +.h1 { + font-size: $global-font-size-h1; +} + +h2, +.h2 { + font-size: $global-font-size-h2; +} + +h3, +.h3 { + font-size: $global-font-size-h3; +} + +h4, +.h4 { + font-size: $global-font-size-h4; +} + +h5, +.h5 { + font-size: $global-font-size-h5; +} + +h6, +.h6 { + font-size: $global-font-size-h6; +} + +p { + margin-bottom: 8px; +} + +label + p { + margin-top: -4px; +} + +.container { + display: block; + margin: auto; + max-width: 40em; + padding: $global-guttering * 2; + @media (max-width: 620px) { + padding: 0; + } +} + +.section { + background-color: #ffffff; + padding: $global-guttering; + color: #333; + a, + a:visited, + a:focus { + color: #00bcd4; + } +} + +.logo { + display: block; + margin-bottom: $global-guttering * .5; +} + +.logo__img { + width: 100%; + height: auto; + display: inline-block; + max-width: 100%; + vertical-align: top; + padding: $global-guttering * .5 0; +} + +.visible-ie { + display: none; +} + +.push-bottom { + margin-bottom: $global-guttering; +} + +.zero-bottom { + margin-bottom: 0; +} + +.zero-top { + margin-top: 0; +} + +.text-center { + text-align: center; +} + +[data-test-hook] { + margin-bottom: $global-guttering; +} + +/*===== End of Section comment block ======*/ diff --git a/build/media_source/vendor/choicesjs/scss/choices.scss b/build/media_source/vendor/choicesjs/scss/choices.scss new file mode 100644 index 0000000000000..05f89047419ff --- /dev/null +++ b/build/media_source/vendor/choicesjs/scss/choices.scss @@ -0,0 +1,357 @@ +/*=============================== += Choices = +===============================*/ + +$choices-selector: 'choices' !default; +$choices-font-size-lg: 16px !default; +$choices-font-size-md: 14px !default; +$choices-font-size-sm: 12px !default; +$choices-guttering: 24px !default; +$choices-border-radius: 2.5px !default; +$choices-border-radius-item: 20px !default; +$choices-bg-color: #f9f9f9 !default; +$choices-bg-color-disabled: #eaeaea !default; +$choices-bg-color-dropdown: #ffffff !default; +$choices-text-color: #333333 !default; +$choices-keyline-color: #dddddd !default; +$choices-primary-color: #00bcd4 !default; +$choices-disabled-color: #eaeaea !default; +$choices-highlight-color: $choices-primary-color !default; +$choices-button-dimension: 8px !default; +$choices-button-offset: 8px !default; +$choices-icon-cross: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjEiIGhlaWdodD0iMjEiIHZpZXdCb3g9IjAgMCAyMSAyMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBmaWxsPSIjRkZGIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0yLjU5Mi4wNDRsMTguMzY0IDE4LjM2NC0yLjU0OCAyLjU0OEwuMDQ0IDIuNTkyeiIvPjxwYXRoIGQ9Ik0wIDE4LjM2NEwxOC4zNjQgMGwyLjU0OCAyLjU0OEwyLjU0OCAyMC45MTJ6Ii8+PC9nPjwvc3ZnPg==) !default; +$choices-icon-cross-inverse: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjEiIGhlaWdodD0iMjEiIHZpZXdCb3g9IjAgMCAyMSAyMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBmaWxsPSIjMDAwIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0yLjU5Mi4wNDRsMTguMzY0IDE4LjM2NC0yLjU0OCAyLjU0OEwuMDQ0IDIuNTkyeiIvPjxwYXRoIGQ9Ik0wIDE4LjM2NEwxOC4zNjQgMGwyLjU0OCAyLjU0OEwyLjU0OCAyMC45MTJ6Ii8+PC9nPjwvc3ZnPg==) !default; + +.#{$choices-selector} { + position: relative; + margin-bottom: $choices-guttering; + font-size: $choices-font-size-lg; + &:focus { + outline: none; + } + &:last-child { + margin-bottom: 0; + } + &.is-disabled { + .#{$choices-selector}__inner, + .#{$choices-selector}__input { + background-color: $choices-bg-color-disabled; + cursor: not-allowed; + user-select: none; + } + .#{$choices-selector}__item { + cursor: not-allowed; + } + } + + [hidden] { + display: none !important; + } +} + +.#{$choices-selector}[data-type*='select-one'] { + cursor: pointer; + .#{$choices-selector}__inner { + padding-bottom: 7.5px; + } + .#{$choices-selector}__input { + display: block; + width: 100%; + padding: 10px; + border-bottom: 1px solid $choices-keyline-color; + background-color: #ffffff; + margin: 0; + } + .#{$choices-selector}__button { + background-image: $choices-icon-cross-inverse; + padding: 0; + background-size: 8px; + position: absolute; + top: 50%; + right: 0; + margin-top: -10px; + margin-right: 25px; + height: 20px; + width: 20px; + border-radius: 10em; + opacity: 0.5; + &:hover, + &:focus { + opacity: 1; + } + &:focus { + box-shadow: 0px 0px 0px 2px $choices-highlight-color; + } + } + .#{$choices-selector}__item[data-value=''] .#{$choices-selector}__button { + display: none; + } + &:after { + content: ''; + height: 0; + width: 0; + border-style: solid; + border-color: $choices-text-color transparent transparent transparent; + border-width: 5px; + position: absolute; + right: 11.5px; + top: 50%; + margin-top: -2.5px; + pointer-events: none; + } + &.is-open:after { + border-color: transparent transparent $choices-text-color transparent; + margin-top: -7.5px; + } + &[dir='rtl'] { + &:after { + left: 11.5px; + right: auto; + } + .#{$choices-selector}__button { + right: auto; + left: 0; + margin-left: 25px; + margin-right: 0; + } + } +} + +.#{$choices-selector}[data-type*='select-multiple'], +.#{$choices-selector}[data-type*='text'] { + .#{$choices-selector}__inner { + cursor: text; + } + .#{$choices-selector}__button { + position: relative; + display: inline-block; + margin-top: 0; + // Joomla changes + margin-right: -$choices-button-offset * .5; + // End of Joomla changes + margin-bottom: 0; + margin-left: $choices-button-offset; + padding-left: $choices-button-offset * 2; + border-left: 1px solid darken($choices-primary-color, 10%); + background-image: $choices-icon-cross; + background-size: $choices-button-dimension; + width: $choices-button-dimension; + line-height: 1; + opacity: 0.75; + border-radius: 0; + &:hover, + &:focus { + opacity: 1; + } + } +} + +.#{$choices-selector}__inner { + display: inline-block; + vertical-align: top; + width: 100%; + background-color: $choices-bg-color; + padding: 7.5px 7.5px 3.75px; + border: 1px solid $choices-keyline-color; + border-radius: $choices-border-radius; + font-size: $choices-font-size-md; + min-height: 44px; + overflow: hidden; + .is-focused &, + .is-open & { + border-color: darken($choices-keyline-color, 15%); + } + .is-open & { + border-radius: $choices-border-radius $choices-border-radius 0 0; + } + .is-flipped.is-open & { + border-radius: 0 0 $choices-border-radius $choices-border-radius; + } +} + +.#{$choices-selector}__list { + margin: 0; + padding-left: 0; + list-style: none; +} + +.#{$choices-selector}__list--single { + display: inline-block; + padding: 4px 16px 4px 4px; + width: 100%; + [dir='rtl'] & { + padding-right: 4px; + padding-left: 16px; + } + .#{$choices-selector}__item { + width: 100%; + } +} + +.#{$choices-selector}__list--multiple { + display: inline; + .#{$choices-selector}__item { + display: inline-block; + vertical-align: middle; + border-radius: $choices-border-radius-item; + padding: 4px 10px; + font-size: $choices-font-size-sm; + font-weight: 500; + margin-right: 3.75px; + margin-bottom: 3.75px; + background-color: $choices-primary-color; + border: 1px solid darken($choices-primary-color, 5%); + color: #ffffff; + word-break: break-all; + box-sizing: border-box; + &[data-deletable] { + padding-right: 5px; + } + [dir='rtl'] & { + margin-right: 0; + margin-left: 3.75px; + } + &.is-highlighted { + background-color: darken($choices-primary-color, 5%); + border: 1px solid darken($choices-primary-color, 10%); + } + .is-disabled & { + background-color: darken($choices-disabled-color, 25%); + border: 1px solid darken($choices-disabled-color, 35%); + } + } +} + +.#{$choices-selector}__list--dropdown { + visibility: hidden; + z-index: 1; + position: absolute; + width: 100%; + background-color: $choices-bg-color-dropdown; + border: 1px solid $choices-keyline-color; + top: 100%; + margin-top: -1px; + border-bottom-left-radius: $choices-border-radius; + border-bottom-right-radius: $choices-border-radius; + overflow: hidden; + word-break: break-all; + will-change: visibility; + &.is-active { + visibility: visible; + } + .is-open & { + border-color: darken($choices-keyline-color, 15%); + } + .is-flipped & { + top: auto; + bottom: 100%; + margin-top: 0; + margin-bottom: -1px; + border-radius: 0.25rem 0.25rem 0 0; + } + .#{$choices-selector}__list { + position: relative; + max-height: 300px; + overflow: auto; + -webkit-overflow-scrolling: touch; + will-change: scroll-position; + } + .#{$choices-selector}__item { + position: relative; + padding: 10px; + font-size: $choices-font-size-md; + [dir='rtl'] & { + text-align: right; + } + } + .#{$choices-selector}__item--selectable { + @media (min-width: 640px) { + padding-right: 100px; + &:after { + content: attr(data-select-text); + font-size: $choices-font-size-sm; + opacity: 0; + position: absolute; + right: 10px; + top: 50%; + transform: translateY(-50%); + } + [dir='rtl'] & { + text-align: right; + padding-left: 100px; + padding-right: 10px; + &:after { + right: auto; + left: 10px; + } + } + } + &.is-highlighted { + background-color: mix(#000000, #ffffff, 5%); + &:after { + opacity: 0.5; + } + } + } +} + +.#{$choices-selector}__item { + cursor: default; +} + +.#{$choices-selector}__item--selectable { + cursor: pointer; +} + +.#{$choices-selector}__item--disabled { + cursor: not-allowed; + user-select: none; + opacity: 0.5; +} + +.#{$choices-selector}__heading { + font-weight: 600; + font-size: $choices-font-size-sm; + padding: 10px; + border-bottom: 1px solid lighten($choices-keyline-color, 10%); + color: lighten(#333, 30%); +} + +.#{$choices-selector}__button { + text-indent: -9999px; + -webkit-appearance: none; + appearance: none; + border: 0; + background-color: transparent; + background-repeat: no-repeat; + background-position: center; + cursor: pointer; + &:focus { + outline: none; + } +} + +.#{$choices-selector}__input { + display: inline-block; + vertical-align: baseline; + background-color: $choices-bg-color; + font-size: $choices-font-size-md; + margin-bottom: 5px; + border: 0; + border-radius: 0; + max-width: 100%; + padding: 4px 0 4px 2px; + &:focus { + outline: 0; + } + [dir='rtl'] & { + padding-right: 2px; + padding-left: 0; + } +} + +.#{$choices-selector}__placeholder { + opacity: 0.5; +} + +/*===== End of Choices ======*/ From cc50aa4eb82f9a145fab3ac72d8158bed1b53a43 Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Mon, 31 Jan 2022 23:58:11 +0100 Subject: [PATCH 03/25] stfu --- build/media_source/vendor/choicesjs/scss/base.scss | 2 ++ build/media_source/vendor/choicesjs/scss/choices.scss | 2 ++ 2 files changed, 4 insertions(+) diff --git a/build/media_source/vendor/choicesjs/scss/base.scss b/build/media_source/vendor/choicesjs/scss/base.scss index 9ea14419b969d..5084d75fc2daa 100644 --- a/build/media_source/vendor/choicesjs/scss/base.scss +++ b/build/media_source/vendor/choicesjs/scss/base.scss @@ -1,3 +1,4 @@ +/* stylelint-disable */ /*============================================= = Generic styling = =============================================*/ @@ -189,3 +190,4 @@ label + p { } /*===== End of Section comment block ======*/ +/* stylelint-enable */ diff --git a/build/media_source/vendor/choicesjs/scss/choices.scss b/build/media_source/vendor/choicesjs/scss/choices.scss index 05f89047419ff..81559d1fd0085 100644 --- a/build/media_source/vendor/choicesjs/scss/choices.scss +++ b/build/media_source/vendor/choicesjs/scss/choices.scss @@ -1,3 +1,4 @@ +/* stylelint-disable */ /*=============================== = Choices = ===============================*/ @@ -355,3 +356,4 @@ $choices-icon-cross-inverse: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjEiI } /*===== End of Choices ======*/ +/* stylelint-enable */ From 99b0dd14d5ac4e7e57fddcf6f456ac907eb48a86 Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Tue, 1 Feb 2022 00:09:19 +0100 Subject: [PATCH 04/25] enable the buttons again --- build/media_source/system/scss/_icomoon.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/system/scss/_icomoon.scss b/build/media_source/system/scss/_icomoon.scss index 16a6d6c0abfaf..3a4c29d42e5af 100644 --- a/build/media_source/system/scss/_icomoon.scss +++ b/build/media_source/system/scss/_icomoon.scss @@ -289,7 +289,7 @@ $jicons: ( minus-circle : $fa-var-minus-circle, minus-sign : $fa-var-minus, minus : $fa-var-minus, - // mobile : $fa-var-mobile, + mobile : $fa-var-mobile-screen-button, move : $fa-var-arrows-alt, music : $fa-var-music, new-tab-2 : $fa-var-external-link-square-alt, @@ -403,7 +403,7 @@ $jicons: ( support : $fa-var-life-ring, switch : $fa-var-power-off, sync : $fa-var-sync, - // tablet : $fa-var-tablet, + tablet : $fa-var-tablet-button, tachometer-alt : $fa-var-tachometer-alt, tag-2 : $fa-var-tag, tag : $fa-var-tag, From c7c76dab1b83f1a4cd79b1722bab262cbd3011c6 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:45:07 +0100 Subject: [PATCH 05/25] Update settings.json --- build/build-modules-js/settings.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json index ad3455d9693a2..e4df62c36be42 100644 --- a/build/build-modules-js/settings.json +++ b/build/build-modules-js/settings.json @@ -256,7 +256,10 @@ "public/assets/styles/choices.css": "css/choices.css", "public/assets/styles/choices.min.css": "css/choices.min.css" }, - "comment": "filesExtra = src/styles/base.scss:scss/base.scss, src/styles/choices.scss:scss/choices.scss", + "filesExtra": { + "src/styles/base.scss": "scss/base.scss", + "src/styles/choices.scss": "scss/choices.scss" + }, "provideAssets": [ { "name": "choicesjs", From b2d74a23fac2ccf8cfe01acf2538d8384a84cb2b Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:45:36 +0100 Subject: [PATCH 06/25] Delete base.scss --- .../vendor/choicesjs/scss/base.scss | 193 ------------------ 1 file changed, 193 deletions(-) delete mode 100644 build/media_source/vendor/choicesjs/scss/base.scss diff --git a/build/media_source/vendor/choicesjs/scss/base.scss b/build/media_source/vendor/choicesjs/scss/base.scss deleted file mode 100644 index 5084d75fc2daa..0000000000000 --- a/build/media_source/vendor/choicesjs/scss/base.scss +++ /dev/null @@ -1,193 +0,0 @@ -/* stylelint-disable */ -/*============================================= -= Generic styling = -=============================================*/ - -$global-guttering: 24px; -$global-font-size-h1: 32px; -$global-font-size-h2: 24px; -$global-font-size-h3: 20px; -$global-font-size-h4: 18px; -$global-font-size-h5: 16px; -$global-font-size-h6: 14px; - -* { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -*, -*:before, -*:after { - box-sizing: border-box; -} - -html, -body { - position: relative; - margin: 0; - width: 100%; - height: 100%; -} - -body { - font-family: 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; - font-size: 16px; - line-height: 1.4; - color: #ffffff; - background-color: #333; - overflow-x: hidden; -} - -label { - display: block; - margin-bottom: 8px; - font-size: 14px; - font-weight: 500; - cursor: pointer; -} - -p { - margin-top: 0; -} - -hr { - display: block; - margin: $global-guttering * 1.25 0; - border: 0; - border-bottom: 1px solid #eaeaea; - height: 1px; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin-top: 0; - margin-bottom: $global-guttering * .5; - font-weight: 400; - line-height: 1.2; -} - -a, -a:visited, -a:focus { - color: #ffffff; - text-decoration: none; - font-weight: 600; -} - -.form-control { - display: block; - width: 100%; - background-color: #f9f9f9; - padding: 12px; - border: 1px solid #ddd; - border-radius: 2.5px; - font-size: 14px; - -webkit-appearance: none; - appearance: none; - margin-bottom: $global-guttering; -} - -h1, -.h1 { - font-size: $global-font-size-h1; -} - -h2, -.h2 { - font-size: $global-font-size-h2; -} - -h3, -.h3 { - font-size: $global-font-size-h3; -} - -h4, -.h4 { - font-size: $global-font-size-h4; -} - -h5, -.h5 { - font-size: $global-font-size-h5; -} - -h6, -.h6 { - font-size: $global-font-size-h6; -} - -p { - margin-bottom: 8px; -} - -label + p { - margin-top: -4px; -} - -.container { - display: block; - margin: auto; - max-width: 40em; - padding: $global-guttering * 2; - @media (max-width: 620px) { - padding: 0; - } -} - -.section { - background-color: #ffffff; - padding: $global-guttering; - color: #333; - a, - a:visited, - a:focus { - color: #00bcd4; - } -} - -.logo { - display: block; - margin-bottom: $global-guttering * .5; -} - -.logo__img { - width: 100%; - height: auto; - display: inline-block; - max-width: 100%; - vertical-align: top; - padding: $global-guttering * .5 0; -} - -.visible-ie { - display: none; -} - -.push-bottom { - margin-bottom: $global-guttering; -} - -.zero-bottom { - margin-bottom: 0; -} - -.zero-top { - margin-top: 0; -} - -.text-center { - text-align: center; -} - -[data-test-hook] { - margin-bottom: $global-guttering; -} - -/*===== End of Section comment block ======*/ -/* stylelint-enable */ From 9ec387a7de6364cc3429e2365a1c3d00bef92a1b Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:45:57 +0100 Subject: [PATCH 07/25] Delete choices.scss --- .../vendor/choicesjs/scss/choices.scss | 359 ------------------ 1 file changed, 359 deletions(-) delete mode 100644 build/media_source/vendor/choicesjs/scss/choices.scss diff --git a/build/media_source/vendor/choicesjs/scss/choices.scss b/build/media_source/vendor/choicesjs/scss/choices.scss deleted file mode 100644 index 81559d1fd0085..0000000000000 --- a/build/media_source/vendor/choicesjs/scss/choices.scss +++ /dev/null @@ -1,359 +0,0 @@ -/* stylelint-disable */ -/*=============================== -= Choices = -===============================*/ - -$choices-selector: 'choices' !default; -$choices-font-size-lg: 16px !default; -$choices-font-size-md: 14px !default; -$choices-font-size-sm: 12px !default; -$choices-guttering: 24px !default; -$choices-border-radius: 2.5px !default; -$choices-border-radius-item: 20px !default; -$choices-bg-color: #f9f9f9 !default; -$choices-bg-color-disabled: #eaeaea !default; -$choices-bg-color-dropdown: #ffffff !default; -$choices-text-color: #333333 !default; -$choices-keyline-color: #dddddd !default; -$choices-primary-color: #00bcd4 !default; -$choices-disabled-color: #eaeaea !default; -$choices-highlight-color: $choices-primary-color !default; -$choices-button-dimension: 8px !default; -$choices-button-offset: 8px !default; -$choices-icon-cross: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjEiIGhlaWdodD0iMjEiIHZpZXdCb3g9IjAgMCAyMSAyMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBmaWxsPSIjRkZGIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0yLjU5Mi4wNDRsMTguMzY0IDE4LjM2NC0yLjU0OCAyLjU0OEwuMDQ0IDIuNTkyeiIvPjxwYXRoIGQ9Ik0wIDE4LjM2NEwxOC4zNjQgMGwyLjU0OCAyLjU0OEwyLjU0OCAyMC45MTJ6Ii8+PC9nPjwvc3ZnPg==) !default; -$choices-icon-cross-inverse: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjEiIGhlaWdodD0iMjEiIHZpZXdCb3g9IjAgMCAyMSAyMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBmaWxsPSIjMDAwIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Ik0yLjU5Mi4wNDRsMTguMzY0IDE4LjM2NC0yLjU0OCAyLjU0OEwuMDQ0IDIuNTkyeiIvPjxwYXRoIGQ9Ik0wIDE4LjM2NEwxOC4zNjQgMGwyLjU0OCAyLjU0OEwyLjU0OCAyMC45MTJ6Ii8+PC9nPjwvc3ZnPg==) !default; - -.#{$choices-selector} { - position: relative; - margin-bottom: $choices-guttering; - font-size: $choices-font-size-lg; - &:focus { - outline: none; - } - &:last-child { - margin-bottom: 0; - } - &.is-disabled { - .#{$choices-selector}__inner, - .#{$choices-selector}__input { - background-color: $choices-bg-color-disabled; - cursor: not-allowed; - user-select: none; - } - .#{$choices-selector}__item { - cursor: not-allowed; - } - } - - [hidden] { - display: none !important; - } -} - -.#{$choices-selector}[data-type*='select-one'] { - cursor: pointer; - .#{$choices-selector}__inner { - padding-bottom: 7.5px; - } - .#{$choices-selector}__input { - display: block; - width: 100%; - padding: 10px; - border-bottom: 1px solid $choices-keyline-color; - background-color: #ffffff; - margin: 0; - } - .#{$choices-selector}__button { - background-image: $choices-icon-cross-inverse; - padding: 0; - background-size: 8px; - position: absolute; - top: 50%; - right: 0; - margin-top: -10px; - margin-right: 25px; - height: 20px; - width: 20px; - border-radius: 10em; - opacity: 0.5; - &:hover, - &:focus { - opacity: 1; - } - &:focus { - box-shadow: 0px 0px 0px 2px $choices-highlight-color; - } - } - .#{$choices-selector}__item[data-value=''] .#{$choices-selector}__button { - display: none; - } - &:after { - content: ''; - height: 0; - width: 0; - border-style: solid; - border-color: $choices-text-color transparent transparent transparent; - border-width: 5px; - position: absolute; - right: 11.5px; - top: 50%; - margin-top: -2.5px; - pointer-events: none; - } - &.is-open:after { - border-color: transparent transparent $choices-text-color transparent; - margin-top: -7.5px; - } - &[dir='rtl'] { - &:after { - left: 11.5px; - right: auto; - } - .#{$choices-selector}__button { - right: auto; - left: 0; - margin-left: 25px; - margin-right: 0; - } - } -} - -.#{$choices-selector}[data-type*='select-multiple'], -.#{$choices-selector}[data-type*='text'] { - .#{$choices-selector}__inner { - cursor: text; - } - .#{$choices-selector}__button { - position: relative; - display: inline-block; - margin-top: 0; - // Joomla changes - margin-right: -$choices-button-offset * .5; - // End of Joomla changes - margin-bottom: 0; - margin-left: $choices-button-offset; - padding-left: $choices-button-offset * 2; - border-left: 1px solid darken($choices-primary-color, 10%); - background-image: $choices-icon-cross; - background-size: $choices-button-dimension; - width: $choices-button-dimension; - line-height: 1; - opacity: 0.75; - border-radius: 0; - &:hover, - &:focus { - opacity: 1; - } - } -} - -.#{$choices-selector}__inner { - display: inline-block; - vertical-align: top; - width: 100%; - background-color: $choices-bg-color; - padding: 7.5px 7.5px 3.75px; - border: 1px solid $choices-keyline-color; - border-radius: $choices-border-radius; - font-size: $choices-font-size-md; - min-height: 44px; - overflow: hidden; - .is-focused &, - .is-open & { - border-color: darken($choices-keyline-color, 15%); - } - .is-open & { - border-radius: $choices-border-radius $choices-border-radius 0 0; - } - .is-flipped.is-open & { - border-radius: 0 0 $choices-border-radius $choices-border-radius; - } -} - -.#{$choices-selector}__list { - margin: 0; - padding-left: 0; - list-style: none; -} - -.#{$choices-selector}__list--single { - display: inline-block; - padding: 4px 16px 4px 4px; - width: 100%; - [dir='rtl'] & { - padding-right: 4px; - padding-left: 16px; - } - .#{$choices-selector}__item { - width: 100%; - } -} - -.#{$choices-selector}__list--multiple { - display: inline; - .#{$choices-selector}__item { - display: inline-block; - vertical-align: middle; - border-radius: $choices-border-radius-item; - padding: 4px 10px; - font-size: $choices-font-size-sm; - font-weight: 500; - margin-right: 3.75px; - margin-bottom: 3.75px; - background-color: $choices-primary-color; - border: 1px solid darken($choices-primary-color, 5%); - color: #ffffff; - word-break: break-all; - box-sizing: border-box; - &[data-deletable] { - padding-right: 5px; - } - [dir='rtl'] & { - margin-right: 0; - margin-left: 3.75px; - } - &.is-highlighted { - background-color: darken($choices-primary-color, 5%); - border: 1px solid darken($choices-primary-color, 10%); - } - .is-disabled & { - background-color: darken($choices-disabled-color, 25%); - border: 1px solid darken($choices-disabled-color, 35%); - } - } -} - -.#{$choices-selector}__list--dropdown { - visibility: hidden; - z-index: 1; - position: absolute; - width: 100%; - background-color: $choices-bg-color-dropdown; - border: 1px solid $choices-keyline-color; - top: 100%; - margin-top: -1px; - border-bottom-left-radius: $choices-border-radius; - border-bottom-right-radius: $choices-border-radius; - overflow: hidden; - word-break: break-all; - will-change: visibility; - &.is-active { - visibility: visible; - } - .is-open & { - border-color: darken($choices-keyline-color, 15%); - } - .is-flipped & { - top: auto; - bottom: 100%; - margin-top: 0; - margin-bottom: -1px; - border-radius: 0.25rem 0.25rem 0 0; - } - .#{$choices-selector}__list { - position: relative; - max-height: 300px; - overflow: auto; - -webkit-overflow-scrolling: touch; - will-change: scroll-position; - } - .#{$choices-selector}__item { - position: relative; - padding: 10px; - font-size: $choices-font-size-md; - [dir='rtl'] & { - text-align: right; - } - } - .#{$choices-selector}__item--selectable { - @media (min-width: 640px) { - padding-right: 100px; - &:after { - content: attr(data-select-text); - font-size: $choices-font-size-sm; - opacity: 0; - position: absolute; - right: 10px; - top: 50%; - transform: translateY(-50%); - } - [dir='rtl'] & { - text-align: right; - padding-left: 100px; - padding-right: 10px; - &:after { - right: auto; - left: 10px; - } - } - } - &.is-highlighted { - background-color: mix(#000000, #ffffff, 5%); - &:after { - opacity: 0.5; - } - } - } -} - -.#{$choices-selector}__item { - cursor: default; -} - -.#{$choices-selector}__item--selectable { - cursor: pointer; -} - -.#{$choices-selector}__item--disabled { - cursor: not-allowed; - user-select: none; - opacity: 0.5; -} - -.#{$choices-selector}__heading { - font-weight: 600; - font-size: $choices-font-size-sm; - padding: 10px; - border-bottom: 1px solid lighten($choices-keyline-color, 10%); - color: lighten(#333, 30%); -} - -.#{$choices-selector}__button { - text-indent: -9999px; - -webkit-appearance: none; - appearance: none; - border: 0; - background-color: transparent; - background-repeat: no-repeat; - background-position: center; - cursor: pointer; - &:focus { - outline: none; - } -} - -.#{$choices-selector}__input { - display: inline-block; - vertical-align: baseline; - background-color: $choices-bg-color; - font-size: $choices-font-size-md; - margin-bottom: 5px; - border: 0; - border-radius: 0; - max-width: 100%; - padding: 4px 0 4px 2px; - &:focus { - outline: 0; - } - [dir='rtl'] & { - padding-right: 2px; - padding-left: 0; - } -} - -.#{$choices-selector}__placeholder { - opacity: 0.5; -} - -/*===== End of Choices ======*/ -/* stylelint-enable */ From 2cbc0f36f981c49d57ffaa2e5c9ed89a782ef632 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:46:31 +0100 Subject: [PATCH 08/25] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cd114404316a8..1ae9aaa9ce7b8 100644 --- a/package.json +++ b/package.json @@ -32,13 +32,13 @@ ], "dependencies": { "@claviska/jquery-minicolors": "^2.3.6", - "@fortawesome/fontawesome-free": "^6.0.0-beta3", + "@fortawesome/fontawesome-free": "^6.0.0", "@popperjs/core": "^2.11.0", "@webcomponents/webcomponentsjs": "^2.6.0", "accessibility": "^3.0.14", "awesomplete": "^1.1.5", "bootstrap": "^5.1.3", - "choices.js": "^9.0.1", + "choices.js": "^10.0.0", "chosen-js": "^1.8.7", "codemirror": "^5.64.0", "cropperjs": "^1.5.12", From c97ea0cc2008dd492896b4a72f8de42acf35a4e1 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:47:59 +0100 Subject: [PATCH 09/25] Update template.scss --- installation/template/scss/template.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 71aae56c11b08..26b7f93f96416 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -3,7 +3,6 @@ $jicon-css-prefix: icon; $fa-css-prefix: fa; $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; -$fa-fw-width: 20em * .0625; // Font Awesome @import "../../../build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome"; From d323e56bbce08fc733247a16619ff890c13570db Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:48:40 +0100 Subject: [PATCH 10/25] Update _variables.scss --- .../site/cassiopeia/scss/tools/variables/_variables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss index 674623a4093a4..4a10b9b082d8f 100644 --- a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss +++ b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss @@ -148,7 +148,6 @@ $cassiopeia-grid-gutter: $grid-gutter-width; // Components $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; -$fa-fw-width: 20em * .0625; // Treeselect $treeselect-line-height: 2.2rem; From 322a2ecc85bcabc07392e84f6a4c1c1da01bc06d Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:49:13 +0100 Subject: [PATCH 11/25] Update fontawesome.scss --- .../atum/scss/vendor/fontawesome-free/fontawesome.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss index 4a8d1bb92c49d..9df0b7a94aac4 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss @@ -1,7 +1,6 @@ // Override the font path $fa-css-prefix: fa; $fa-font-path: "../../../../../../vendor/fontawesome-free/webfonts" !default; -$fa-fw-width: (20em * .0625); // Font Awesome 5 Free @import "../../../../../../../../media/vendor/fontawesome-free/scss/fontawesome"; From 635c3c302b41c0b986af81823364309aaf73687e Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:49:41 +0100 Subject: [PATCH 12/25] Update joomla-fontawesome.scss --- build/media_source/system/scss/joomla-fontawesome.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/build/media_source/system/scss/joomla-fontawesome.scss b/build/media_source/system/scss/joomla-fontawesome.scss index fb0bf45f76d73..f94624aaffa4f 100644 --- a/build/media_source/system/scss/joomla-fontawesome.scss +++ b/build/media_source/system/scss/joomla-fontawesome.scss @@ -1,7 +1,6 @@ // Override the font path $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts" !default; $fa-font-display: block !default; -$fa-fw-width: 20em * .0625; // Font Awesome 5 Free @import "../../../../media/vendor/fontawesome-free/scss/fontawesome"; From 1c8353564af97cc887bbd0ea839340135aa39a40 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:50:15 +0100 Subject: [PATCH 13/25] Update _variables.scss --- .../templates/administrator/atum/scss/_variables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/build/media_source/templates/administrator/atum/scss/_variables.scss index 522fe6d99a6cf..350388df4893d 100644 --- a/build/media_source/templates/administrator/atum/scss/_variables.scss +++ b/build/media_source/templates/administrator/atum/scss/_variables.scss @@ -147,7 +147,6 @@ $jicon-css-prefix: icon !default; $fa-css-prefix: fa !default; $fa-font-path: "../../../../media/vendor/fontawesome-free/webfonts"; $roboto-font-path: "../../../../../media/vendor/roboto-fontface/fonts"; -$fa-fw-width: (20em * .0625); // Font weights $thin-weight: 100; From ae9ca993ccf133b02ce1806b4961ec2e6797e8b6 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:51:33 +0100 Subject: [PATCH 14/25] Update settings.json --- build/build-modules-js/settings.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json index e4df62c36be42..a09f7ece76a35 100644 --- a/build/build-modules-js/settings.json +++ b/build/build-modules-js/settings.json @@ -257,9 +257,9 @@ "public/assets/styles/choices.min.css": "css/choices.min.css" }, "filesExtra": { - "src/styles/base.scss": "scss/base.scss", - "src/styles/choices.scss": "scss/choices.scss" - }, + "src/styles/base.scss": "scss/base.scss", + "src/styles/choices.scss": "scss/choices.scss" + }, "provideAssets": [ { "name": "choicesjs", From 470df6b6e975bf92066426d300b9c2a2a4d31927 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 14:52:17 +0100 Subject: [PATCH 15/25] Update _metismenu.scss --- .../site/cassiopeia/scss/vendor/metismenu/_metismenu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss b/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss index 1ec186413409d..0dd56c81da1bb 100644 --- a/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss +++ b/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss @@ -139,7 +139,7 @@ top: 0; flex-basis: calc(100% + #{$cassiopeia-grid-gutter}); margin-top: ($cassiopeia-grid-gutter * .5); - margin-bottom: ($cassiopeia-grid-gutter * .5); + margin-bottom: ($cassiopeia-grid-gutter * -.5); background-color: hsla(0, 0%, 0%, .03); box-shadow: none; } From 0b265f3034574d1b82dee914d695e4d093b252be Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Thu, 10 Feb 2022 15:22:31 +0100 Subject: [PATCH 16/25] update the lock file Signed-off-by: dgrammatiko --- package-lock.json | 301 ++++++++-------------- plugins/editors/codemirror/codemirror.xml | 2 +- 2 files changed, 104 insertions(+), 199 deletions(-) diff --git a/package-lock.json b/package-lock.json index fec8faa94c9cf..3171d0cf9e363 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,13 +11,13 @@ "license": "GPL-2.0-or-later", "dependencies": { "@claviska/jquery-minicolors": "^2.3.6", - "@fortawesome/fontawesome-free": "^6.0.0-beta3", + "@fortawesome/fontawesome-free": "^6.0.0", "@popperjs/core": "^2.11.0", "@webcomponents/webcomponentsjs": "^2.6.0", "accessibility": "^3.0.14", "awesomplete": "^1.1.5", "bootstrap": "^5.1.3", - "choices.js": "^9.0.1", + "choices.js": "^10.0.0", "chosen-js": "^1.8.7", "codemirror": "^5.64.0", "cropperjs": "^1.5.12", @@ -1625,7 +1625,6 @@ "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz", "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==", - "dev": true, "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -1736,9 +1735,9 @@ } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "6.0.0-beta3", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0-beta3.tgz", - "integrity": "sha512-4SqOuhC8tSLeQvbW1nDmq6T7+8vdSgHy/w7PRwCFzMQCbKuYFIir/3UuWsV1QblX1lt7SGlSgwbaCv9XhRt8HA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0.tgz", + "integrity": "sha512-6LB4PYBST1Rx40klypw1SmSDArjFOcfBf2LeX9Zg5EKJT2eXiyiJq+CyBYKeXyK0sXS2FsCJWSPr/luyhuvh0Q==", "hasInstallScript": true, "engines": { "node": ">=6" @@ -2749,12 +2748,13 @@ } }, "node_modules/choices.js": { - "version": "9.0.1", - "integrity": "sha512-JgpeDY0Tmg7tqY6jaW/druSklJSt7W68tXFJIw0GSGWmO37SDAL8o60eICNGbzIODjj02VNNtf5h6TgoHDtCsA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/choices.js/-/choices.js-10.0.0.tgz", + "integrity": "sha512-I/p92v2Oqbgf/ugThrD2E5nVqtVv6QouiURC7izFr6Mqn5NNUX8VZO64Rur0gh4GWKovj32WcxONzgqJJr5vdA==", "dependencies": { - "deepmerge": "^4.2.0", - "fuse.js": "^3.4.5", - "redux": "^4.0.4" + "deepmerge": "^4.2.2", + "fuse.js": "^6.5.3", + "redux": "^4.1.2" } }, "node_modules/chokidar": { @@ -2811,9 +2811,9 @@ } }, "node_modules/codemirror": { - "version": "5.65.1", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz", - "integrity": "sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA==" + "version": "5.64.0", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.64.0.tgz", + "integrity": "sha512-fqr6CtDQdJ6iNMbD8NX2gH2G876nNDk+TO1rrYkgWnqQdO3O1Xa9tK6q+psqhJJgE5SpbaDcgdfLmukoUVE8pg==" }, "node_modules/color-convert": { "version": "1.9.3", @@ -3197,8 +3197,9 @@ "integrity": "sha1-LkYovhncSyFLXAJjDFlx6BFhgGI=" }, "node_modules/date-format": { - "version": "3.0.0", - "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz", + "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==", "dev": true, "engines": { "node": ">=4.0" @@ -3462,9 +3463,9 @@ } }, "node_modules/engine.io": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.0.tgz", - "integrity": "sha512-ErhZOVu2xweCjEfYcTdkCnEYUiZgkAcBBAhW4jbIvNG8SLU3orAqoJCiytZjYF7eTpVmmCrLDjLIEaPlUAs1uw==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz", + "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==", "dev": true, "dependencies": { "@types/cookie": "^0.4.1", @@ -4158,8 +4159,9 @@ } }, "node_modules/flatted": { - "version": "3.1.1", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", + "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", "dev": true }, "node_modules/focus-visible": { @@ -4167,8 +4169,9 @@ "integrity": "sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==" }, "node_modules/follow-redirects": { - "version": "1.13.3", - "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==", + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", "dev": true, "funding": [ { @@ -4248,10 +4251,11 @@ "dev": true }, "node_modules/fuse.js": { - "version": "3.6.1", - "integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.5.3.tgz", + "integrity": "sha512-sA5etGE7yD/pOqivZRBvUBd/NaL2sjAu6QuSaFoe1H2BrJSkH/T/UXAJ8CdXdw7DvY3Hs8CXKYkDWX7RiP5KOg==", "engines": { - "node": ">=6" + "node": ">=10" } }, "node_modules/gensync": { @@ -5170,7 +5174,8 @@ }, "node_modules/js-tokens": { "version": "4.0.0", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "node_modules/js-yaml": { "version": "4.1.0", @@ -5469,35 +5474,21 @@ "dev": true }, "node_modules/log4js": { - "version": "6.3.0", - "integrity": "sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz", + "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==", "dev": true, "dependencies": { - "date-format": "^3.0.0", - "debug": "^4.1.1", - "flatted": "^2.0.1", - "rfdc": "^1.1.4", - "streamroller": "^2.2.4" + "date-format": "^4.0.3", + "debug": "^4.3.3", + "flatted": "^3.2.4", + "rfdc": "^1.3.0", + "streamroller": "^3.0.2" }, "engines": { "node": ">=8.0" } }, - "node_modules/log4js/node_modules/flatted": { - "version": "2.0.2", - "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", - "dev": true - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, "node_modules/lowercase-keys": { "version": "2.0.0", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", @@ -5925,9 +5916,9 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -6929,11 +6920,11 @@ } }, "node_modules/redux": { - "version": "4.0.5", - "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz", + "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==", "dependencies": { - "loose-envify": "^1.4.0", - "symbol-observable": "^1.2.0" + "@babel/runtime": "^7.9.2" } }, "node_modules/regenerate": { @@ -6957,8 +6948,7 @@ "node_modules/regenerator-runtime": { "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, "node_modules/regenerator-transform": { "version": "0.14.5", @@ -7493,55 +7483,19 @@ } }, "node_modules/streamroller": { - "version": "2.2.4", - "integrity": "sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz", + "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==", "dev": true, "dependencies": { - "date-format": "^2.1.0", + "date-format": "^4.0.3", "debug": "^4.1.1", - "fs-extra": "^8.1.0" + "fs-extra": "^10.0.0" }, "engines": { "node": ">=8.0" } }, - "node_modules/streamroller/node_modules/date-format": { - "version": "2.1.0", - "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/streamroller/node_modules/fs-extra": { - "version": "8.1.0", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/streamroller/node_modules/jsonfile": { - "version": "4.0.0", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/streamroller/node_modules/universalify": { - "version": "0.1.2", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -7860,13 +7814,6 @@ "node": ">= 10" } }, - "node_modules/symbol-observable": { - "version": "1.2.0", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/table": { "version": "6.7.5", "resolved": "https://registry.npmjs.org/table/-/table-6.7.5.tgz", @@ -9551,7 +9498,6 @@ "version": "7.16.7", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz", "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -9635,9 +9581,9 @@ } }, "@fortawesome/fontawesome-free": { - "version": "6.0.0-beta3", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0-beta3.tgz", - "integrity": "sha512-4SqOuhC8tSLeQvbW1nDmq6T7+8vdSgHy/w7PRwCFzMQCbKuYFIir/3UuWsV1QblX1lt7SGlSgwbaCv9XhRt8HA==" + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.0.0.tgz", + "integrity": "sha512-6LB4PYBST1Rx40klypw1SmSDArjFOcfBf2LeX9Zg5EKJT2eXiyiJq+CyBYKeXyK0sXS2FsCJWSPr/luyhuvh0Q==" }, "@humanwhocodes/config-array": { "version": "0.9.2", @@ -10409,12 +10355,13 @@ } }, "choices.js": { - "version": "9.0.1", - "integrity": "sha512-JgpeDY0Tmg7tqY6jaW/druSklJSt7W68tXFJIw0GSGWmO37SDAL8o60eICNGbzIODjj02VNNtf5h6TgoHDtCsA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/choices.js/-/choices.js-10.0.0.tgz", + "integrity": "sha512-I/p92v2Oqbgf/ugThrD2E5nVqtVv6QouiURC7izFr6Mqn5NNUX8VZO64Rur0gh4GWKovj32WcxONzgqJJr5vdA==", "requires": { - "deepmerge": "^4.2.0", - "fuse.js": "^3.4.5", - "redux": "^4.0.4" + "deepmerge": "^4.2.2", + "fuse.js": "^6.5.3", + "redux": "^4.1.2" } }, "chokidar": { @@ -10463,9 +10410,9 @@ } }, "codemirror": { - "version": "5.65.1", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz", - "integrity": "sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA==" + "version": "5.64.0", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.64.0.tgz", + "integrity": "sha512-fqr6CtDQdJ6iNMbD8NX2gH2G876nNDk+TO1rrYkgWnqQdO3O1Xa9tK6q+psqhJJgE5SpbaDcgdfLmukoUVE8pg==" }, "color-convert": { "version": "1.9.3", @@ -10768,8 +10715,9 @@ "integrity": "sha1-LkYovhncSyFLXAJjDFlx6BFhgGI=" }, "date-format": { - "version": "3.0.0", - "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz", + "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==", "dev": true }, "debug": { @@ -10963,9 +10911,9 @@ } }, "engine.io": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.0.tgz", - "integrity": "sha512-ErhZOVu2xweCjEfYcTdkCnEYUiZgkAcBBAhW4jbIvNG8SLU3orAqoJCiytZjYF7eTpVmmCrLDjLIEaPlUAs1uw==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz", + "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==", "dev": true, "requires": { "@types/cookie": "^0.4.1", @@ -11516,8 +11464,9 @@ } }, "flatted": { - "version": "3.1.1", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", + "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", "dev": true }, "focus-visible": { @@ -11525,8 +11474,9 @@ "integrity": "sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==" }, "follow-redirects": { - "version": "1.13.3", - "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==", + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", "dev": true }, "fraction.js": { @@ -11575,8 +11525,9 @@ "dev": true }, "fuse.js": { - "version": "3.6.1", - "integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==" + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.5.3.tgz", + "integrity": "sha512-sA5etGE7yD/pOqivZRBvUBd/NaL2sjAu6QuSaFoe1H2BrJSkH/T/UXAJ8CdXdw7DvY3Hs8CXKYkDWX7RiP5KOg==" }, "gensync": { "version": "1.0.0-beta.2", @@ -12233,7 +12184,8 @@ }, "js-tokens": { "version": "4.0.0", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "js-yaml": { "version": "4.1.0", @@ -12479,29 +12431,16 @@ "dev": true }, "log4js": { - "version": "6.3.0", - "integrity": "sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz", + "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==", "dev": true, "requires": { - "date-format": "^3.0.0", - "debug": "^4.1.1", - "flatted": "^2.0.1", - "rfdc": "^1.1.4", - "streamroller": "^2.2.4" - }, - "dependencies": { - "flatted": { - "version": "2.0.2", - "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", - "dev": true - } - } - }, - "loose-envify": { - "version": "1.4.0", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" + "date-format": "^4.0.3", + "debug": "^4.3.3", + "flatted": "^3.2.4", + "rfdc": "^1.3.0", + "streamroller": "^3.0.2" } }, "lowercase-keys": { @@ -12817,9 +12756,9 @@ "dev": true }, "nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" }, "natural-compare": { "version": "1.4.0", @@ -13481,11 +13420,11 @@ } }, "redux": { - "version": "4.0.5", - "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz", + "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==", "requires": { - "loose-envify": "^1.4.0", - "symbol-observable": "^1.2.0" + "@babel/runtime": "^7.9.2" } }, "regenerate": { @@ -13506,8 +13445,7 @@ "regenerator-runtime": { "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", - "dev": true + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, "regenerator-transform": { "version": "0.14.5", @@ -13920,43 +13858,14 @@ "dev": true }, "streamroller": { - "version": "2.2.4", - "integrity": "sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz", + "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==", "dev": true, "requires": { - "date-format": "^2.1.0", + "date-format": "^4.0.3", "debug": "^4.1.1", - "fs-extra": "^8.1.0" - }, - "dependencies": { - "date-format": { - "version": "2.1.0", - "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", - "dev": true - }, - "fs-extra": { - "version": "8.1.0", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "universalify": { - "version": "0.1.2", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - } + "fs-extra": "^10.0.0" } }, "string_decoder": { @@ -14197,10 +14106,6 @@ } } }, - "symbol-observable": { - "version": "1.2.0", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" - }, "table": { "version": "6.7.5", "resolved": "https://registry.npmjs.org/table/-/table-6.7.5.tgz", diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml index 2f0744b83c028..626312c981649 100644 --- a/plugins/editors/codemirror/codemirror.xml +++ b/plugins/editors/codemirror/codemirror.xml @@ -1,7 +1,7 @@ plg_editors_codemirror - 5.65.1 + 5.64.0 28 March 2011 Marijn Haverbeke marijnh@gmail.com From bcc3ce8fb6197b16c1768f139c60842d07c2f49c Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 10 Feb 2022 15:45:12 +0100 Subject: [PATCH 17/25] Update codemirror.xml --- plugins/editors/codemirror/codemirror.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml index 626312c981649..2f0744b83c028 100644 --- a/plugins/editors/codemirror/codemirror.xml +++ b/plugins/editors/codemirror/codemirror.xml @@ -1,7 +1,7 @@ plg_editors_codemirror - 5.64.0 + 5.65.1 28 March 2011 Marijn Haverbeke marijnh@gmail.com From b8963261df09cc8fb8fa32b845996402695b5fd8 Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Thu, 10 Feb 2022 18:31:59 +0100 Subject: [PATCH 18/25] codemirror wrong version Signed-off-by: dgrammatiko --- package-lock.json | 14 +++++++------- package.json | 2 +- plugins/editors/codemirror/codemirror.xml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3171d0cf9e363..8e4e29b93914f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "bootstrap": "^5.1.3", "choices.js": "^10.0.0", "chosen-js": "^1.8.7", - "codemirror": "^5.64.0", + "codemirror": "^5.65.0", "cropperjs": "^1.5.12", "diff": "^5.0.0", "dragula": "^3.7.3", @@ -2811,9 +2811,9 @@ } }, "node_modules/codemirror": { - "version": "5.64.0", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.64.0.tgz", - "integrity": "sha512-fqr6CtDQdJ6iNMbD8NX2gH2G876nNDk+TO1rrYkgWnqQdO3O1Xa9tK6q+psqhJJgE5SpbaDcgdfLmukoUVE8pg==" + "version": "5.65.1", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz", + "integrity": "sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA==" }, "node_modules/color-convert": { "version": "1.9.3", @@ -10410,9 +10410,9 @@ } }, "codemirror": { - "version": "5.64.0", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.64.0.tgz", - "integrity": "sha512-fqr6CtDQdJ6iNMbD8NX2gH2G876nNDk+TO1rrYkgWnqQdO3O1Xa9tK6q+psqhJJgE5SpbaDcgdfLmukoUVE8pg==" + "version": "5.65.1", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz", + "integrity": "sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA==" }, "color-convert": { "version": "1.9.3", diff --git a/package.json b/package.json index 1ae9aaa9ce7b8..e2bbf92b2bfed 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "bootstrap": "^5.1.3", "choices.js": "^10.0.0", "chosen-js": "^1.8.7", - "codemirror": "^5.64.0", + "codemirror": "^5.65.0", "cropperjs": "^1.5.12", "diff": "^5.0.0", "dragula": "^3.7.3", diff --git a/plugins/editors/codemirror/codemirror.xml b/plugins/editors/codemirror/codemirror.xml index 626312c981649..2f0744b83c028 100644 --- a/plugins/editors/codemirror/codemirror.xml +++ b/plugins/editors/codemirror/codemirror.xml @@ -1,7 +1,7 @@ plg_editors_codemirror - 5.64.0 + 5.65.1 28 March 2011 Marijn Haverbeke marijnh@gmail.com From ea4dd990af15e35ce52de5129238ba2707d19142 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Fri, 11 Feb 2022 16:43:44 +0100 Subject: [PATCH 19/25] Update build/media_source/com_media/scss/components/_media-infobar.scss Co-authored-by: Quy --- .../com_media/scss/components/_media-infobar.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/com_media/scss/components/_media-infobar.scss b/build/media_source/com_media/scss/components/_media-infobar.scss index b2ceced65cee2..50545a57ce330 100644 --- a/build/media_source/com_media/scss/components/_media-infobar.scss +++ b/build/media_source/com_media/scss/components/_media-infobar.scss @@ -35,8 +35,8 @@ $fa-css-prefix: fa; direction: ltr; width: 100%; min-height: 1px; - padding-right: ($col-gutter-width * .5); - padding-left: ($col-gutter-width * .5); + padding-right: $col-gutter-width * .5; + padding-left: $col-gutter-width * .5; [dir=rtl] & { text-align: end; } From 65ccbabb3226dff0878c58aa593def42f058e204 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Fri, 11 Feb 2022 16:43:53 +0100 Subject: [PATCH 20/25] Update build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss Co-authored-by: Quy --- .../templates/site/cassiopeia/scss/vendor/_chosen.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss index 328b99c3627a0..993d53d24bcd3 100644 --- a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss +++ b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss @@ -97,7 +97,7 @@ $chosen-select-padding-y: $form-select-padding-y + .21; &::before { position: absolute; top: 6px; - right: ($chosen-multi-close-width * .25); + right: $chosen-multi-close-width * .25; font-size: $font-size-base; color: $white; content: "\00d7"; From 176a7a26d1365e9b634bde4ba0ed2236f9c91fb6 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Fri, 11 Feb 2022 16:43:57 +0100 Subject: [PATCH 21/25] Update build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss Co-authored-by: Quy --- .../site/cassiopeia/scss/vendor/metismenu/_metismenu.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss b/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss index 0dd56c81da1bb..c6a745c943675 100644 --- a/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss +++ b/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss @@ -138,8 +138,8 @@ position: relative; top: 0; flex-basis: calc(100% + #{$cassiopeia-grid-gutter}); - margin-top: ($cassiopeia-grid-gutter * .5); - margin-bottom: ($cassiopeia-grid-gutter * -.5); + margin-top: $cassiopeia-grid-gutter * .5; + margin-bottom: $cassiopeia-grid-gutter * -.5; background-color: hsla(0, 0%, 0%, .03); box-shadow: none; } From b1af67968e5db17c87df56c7d2992173996d84ac Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Fri, 11 Feb 2022 17:28:53 +0100 Subject: [PATCH 22/25] Add the shims for B/C Signed-off-by: dgrammatiko --- build/build-modules-js/init/patches.es6.js | 7 + .../vendor/fontawesome-free/fontawesome.scss | 3 + package-lock.json | 248 +++--------------- 3 files changed, 44 insertions(+), 214 deletions(-) diff --git a/build/build-modules-js/init/patches.es6.js b/build/build-modules-js/init/patches.es6.js index 2a6f317e97b85..552920ea7a51b 100644 --- a/build/build-modules-js/init/patches.es6.js +++ b/build/build-modules-js/init/patches.es6.js @@ -29,4 +29,11 @@ module.exports.patchPackages = async (options) => { let ShortandsweetJs = await readFile(shortandsweetPath, { encoding: 'utf8' }); ShortandsweetJs = ShortandsweetJs.concat('shortAndSweet(\'textarea.charcount\', {counterClassName: \'small text-muted\'});'); await writeFile(shortandsweetPath, ShortandsweetJs, { encoding: 'utf8', mode: 0o644 }); + + // Include the v5 shim for Font Awesome + const faPath = join(mediaVendorPath, 'fontawesome-free/scss/fontawesome.scss'); + let newScss = (await readFile(faPath, { encoding: 'utf8' })).concat(` +@import 'shims'; +`); + await writeFile(faPath, newScss, { encoding: 'utf8', mode: 0o644 }); }; diff --git a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss index 9df0b7a94aac4..fa3e3ac16b85b 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss @@ -10,6 +10,9 @@ $fa-font-path: "../../../../../../vendor/fontawesome-free/we // Brands must be imported last @import "../../../../../../../../media/vendor/fontawesome-free/scss/brands"; +// B/C with Font Awesome 5 +@import "../../../../../../../../media/vendor/fontawesome-free/scss/shims"; + // B/C for Icomoon @import "../../../../../../system/scss/icomoon"; diff --git a/package-lock.json b/package-lock.json index 8e4e29b93914f..8879a012e0c33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -828,7 +828,6 @@ }, "node_modules/@babel/plugin-syntax-async-generators": { "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "dependencies": { @@ -866,7 +865,6 @@ }, "node_modules/@babel/plugin-syntax-dynamic-import": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, "dependencies": { @@ -878,7 +876,6 @@ }, "node_modules/@babel/plugin-syntax-export-namespace-from": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, "dependencies": { @@ -890,7 +887,6 @@ }, "node_modules/@babel/plugin-syntax-json-strings": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, "dependencies": { @@ -902,7 +898,6 @@ }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, "dependencies": { @@ -914,7 +909,6 @@ }, "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "dependencies": { @@ -926,7 +920,6 @@ }, "node_modules/@babel/plugin-syntax-numeric-separator": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "dependencies": { @@ -938,7 +931,6 @@ }, "node_modules/@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "dependencies": { @@ -950,7 +942,6 @@ }, "node_modules/@babel/plugin-syntax-optional-catch-binding": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, "dependencies": { @@ -962,7 +953,6 @@ }, "node_modules/@babel/plugin-syntax-optional-chaining": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, "dependencies": { @@ -1962,13 +1952,11 @@ }, "node_modules/@types/cookie": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==", "dev": true }, "node_modules/@types/cors": { "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==", "dev": true }, @@ -1984,7 +1972,6 @@ }, "node_modules/@types/json5": { "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", "dev": true }, @@ -2013,7 +2000,6 @@ }, "node_modules/@types/parse-json": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, @@ -2046,7 +2032,6 @@ }, "node_modules/@vue/compiler-core/node_modules/source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "engines": { "node": ">=0.10.0" @@ -2161,7 +2146,6 @@ }, "node_modules/accepts": { "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "dev": true, "dependencies": { @@ -2200,7 +2184,6 @@ }, "node_modules/ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "dependencies": { @@ -2239,7 +2222,6 @@ }, "node_modules/ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "dependencies": { @@ -2288,7 +2270,6 @@ }, "node_modules/array-union": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true, "engines": { @@ -2322,7 +2303,6 @@ }, "node_modules/astral-regex": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true, "engines": { @@ -2366,7 +2346,6 @@ }, "node_modules/babel-plugin-dynamic-import-node": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, "dependencies": { @@ -2437,7 +2416,6 @@ }, "node_modules/base64-js": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, "funding": [ @@ -2457,7 +2435,6 @@ }, "node_modules/base64id": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", "dev": true, "engines": { @@ -2474,7 +2451,6 @@ }, "node_modules/bl": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, "dependencies": { @@ -2579,7 +2555,6 @@ }, "node_modules/buffer": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, "funding": [ @@ -2668,7 +2643,6 @@ }, "node_modules/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, "dependencies": { @@ -2735,7 +2709,6 @@ }, "node_modules/chalk": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "dependencies": { @@ -2817,7 +2790,6 @@ }, "node_modules/color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "dependencies": { @@ -2826,7 +2798,6 @@ }, "node_modules/color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, @@ -2860,7 +2831,6 @@ }, "node_modules/component-emitter": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, @@ -2927,7 +2897,6 @@ }, "node_modules/cookie": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", "dev": true, "engines": { @@ -2961,7 +2930,6 @@ }, "node_modules/core-js-compat/node_modules/semver": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", "dev": true, "bin": { @@ -2970,7 +2938,6 @@ }, "node_modules/cors": { "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", "dev": true, "dependencies": { @@ -3297,7 +3264,6 @@ }, "node_modules/define-properties": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "dependencies": { @@ -3330,7 +3296,6 @@ }, "node_modules/dir-glob": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, "dependencies": { @@ -3513,7 +3478,6 @@ }, "node_modules/entities": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", "dev": true, "funding": { @@ -3564,7 +3528,6 @@ }, "node_modules/es-to-primitive": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "dependencies": { @@ -3594,7 +3557,6 @@ }, "node_modules/escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true, "engines": { @@ -3755,7 +3717,6 @@ }, "node_modules/eslint-plugin-import/node_modules/debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "dependencies": { @@ -3776,7 +3737,6 @@ }, "node_modules/eslint-plugin-import/node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, @@ -3976,7 +3936,6 @@ }, "node_modules/esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "dependencies": { @@ -4051,7 +4010,6 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, @@ -4136,7 +4094,6 @@ }, "node_modules/find-up": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "dependencies": { @@ -4203,7 +4160,6 @@ }, "node_modules/fs-constants": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "dev": true }, @@ -4228,7 +4184,6 @@ }, "node_modules/fsevents": { "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "hasInstallScript": true, @@ -4276,7 +4231,6 @@ }, "node_modules/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, "dependencies": { @@ -4410,7 +4364,6 @@ }, "node_modules/globals": { "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, "engines": { @@ -4501,7 +4454,6 @@ }, "node_modules/has-bigints": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", "dev": true, "funding": { @@ -4510,7 +4462,6 @@ }, "node_modules/has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true, "engines": { @@ -4519,7 +4470,6 @@ }, "node_modules/has-symbols": { "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, "engines": { @@ -4551,7 +4501,6 @@ }, "node_modules/html-escaper": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, @@ -4626,7 +4575,6 @@ }, "node_modules/ieee754": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true, "funding": [ @@ -4646,7 +4594,6 @@ }, "node_modules/ignore": { "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true, "engines": { @@ -5068,7 +5015,6 @@ }, "node_modules/istanbul-lib-report": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", "dev": true, "dependencies": { @@ -5082,7 +5028,6 @@ }, "node_modules/istanbul-lib-report/node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "engines": { @@ -5091,7 +5036,6 @@ }, "node_modules/istanbul-lib-report/node_modules/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, "dependencies": { @@ -5117,7 +5061,6 @@ }, "node_modules/istanbul-lib-source-maps/node_modules/source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, "engines": { @@ -5191,7 +5134,6 @@ }, "node_modules/jsesc": { "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, "bin": { @@ -5213,7 +5155,6 @@ }, "node_modules/json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, @@ -5248,15 +5189,15 @@ } }, "node_modules/karma": { - "version": "6.3.9", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.9.tgz", - "integrity": "sha512-E/MqdLM9uVIhfuyVnrhlGBu4miafBdXEAEqCmwdEMh3n17C7UWC/8Kvm3AYKr91gc7scutekZ0xv6rxRaUCtnw==", + "version": "6.3.16", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz", + "integrity": "sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==", "dev": true, "dependencies": { "body-parser": "^1.19.0", "braces": "^3.0.2", "chokidar": "^3.5.1", - "colors": "^1.4.0", + "colors": "1.4.0", "connect": "^3.7.0", "di": "^0.0.1", "dom-serialize": "^2.2.1", @@ -5265,9 +5206,10 @@ "http-proxy": "^1.18.1", "isbinaryfile": "^4.0.8", "lodash": "^4.17.21", - "log4js": "^6.3.0", + "log4js": "^6.4.1", "mime": "^2.5.2", "minimatch": "^3.0.4", + "mkdirp": "^0.5.5", "qjobs": "^1.2.0", "range-parser": "^1.2.1", "rimraf": "^3.0.2", @@ -5365,6 +5307,18 @@ "karma": ">=0.12" } }, + "node_modules/karma/node_modules/mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, "node_modules/karma/node_modules/source-map": { "version": "0.6.1", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", @@ -5423,7 +5377,6 @@ }, "node_modules/locate-path": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "dependencies": { @@ -5441,7 +5394,6 @@ }, "node_modules/lodash.debounce": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, @@ -5463,7 +5415,6 @@ }, "node_modules/lodash.truncate": { "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", "dev": true }, @@ -5518,7 +5469,6 @@ }, "node_modules/make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "dependencies": { @@ -5784,7 +5734,6 @@ }, "node_modules/merge2": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, "engines": { @@ -5798,7 +5747,6 @@ }, "node_modules/micromatch": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "dependencies": { @@ -5933,7 +5881,6 @@ }, "node_modules/negotiator": { "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", "dev": true, "engines": { @@ -5993,7 +5940,6 @@ }, "node_modules/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, "engines": { @@ -6011,7 +5957,6 @@ }, "node_modules/object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, "engines": { @@ -6020,7 +5965,6 @@ }, "node_modules/object.assign": { "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, "dependencies": { @@ -6112,7 +6056,6 @@ }, "node_modules/p-limit": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "dependencies": { @@ -6124,7 +6067,6 @@ }, "node_modules/p-locate": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "dependencies": { @@ -6136,7 +6078,6 @@ }, "node_modules/p-try": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true, "engines": { @@ -6190,7 +6131,6 @@ }, "node_modules/path-exists": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true, "engines": { @@ -6251,7 +6191,6 @@ }, "node_modules/pkg-dir": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "dependencies": { @@ -6820,7 +6759,6 @@ }, "node_modules/queue-microtask": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, "funding": [ @@ -6873,7 +6811,6 @@ }, "node_modules/readable-stream": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "dependencies": { @@ -6929,7 +6866,6 @@ }, "node_modules/regenerate": { "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", "dev": true }, @@ -6952,7 +6888,6 @@ }, "node_modules/regenerator-transform": { "version": "0.14.5", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", "dev": true, "dependencies": { @@ -6990,7 +6925,6 @@ }, "node_modules/regjsgen": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==", "dev": true }, @@ -7008,7 +6942,6 @@ }, "node_modules/regjsparser/node_modules/jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true, "bin": { @@ -7025,7 +6958,6 @@ }, "node_modules/require-from-string": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, "engines": { @@ -7073,7 +7005,6 @@ }, "node_modules/reusify": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, "engines": { @@ -7147,7 +7078,6 @@ }, "node_modules/run-parallel": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "funding": [ @@ -7301,7 +7231,6 @@ }, "node_modules/slash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, "engines": { @@ -7310,7 +7239,6 @@ }, "node_modules/slice-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, "dependencies": { @@ -7327,7 +7255,6 @@ }, "node_modules/slice-ansi/node_modules/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, "dependencies": { @@ -7342,7 +7269,6 @@ }, "node_modules/slice-ansi/node_modules/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, "dependencies": { @@ -7354,7 +7280,6 @@ }, "node_modules/slice-ansi/node_modules/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 }, @@ -7383,7 +7308,6 @@ }, "node_modules/socket.io-parser": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", "dev": true, "dependencies": { @@ -7498,7 +7422,6 @@ }, "node_modules/string_decoder": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, "dependencies": { @@ -7507,7 +7430,6 @@ }, "node_modules/string_decoder/node_modules/safe-buffer": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true, "funding": [ @@ -7541,7 +7463,6 @@ }, "node_modules/string.prototype.trimend": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", "dev": true, "dependencies": { @@ -7554,7 +7475,6 @@ }, "node_modules/string.prototype.trimstart": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", "dev": true, "dependencies": { @@ -7579,7 +7499,6 @@ }, "node_modules/strip-bom": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true, "engines": { @@ -7599,7 +7518,6 @@ }, "node_modules/strip-json-comments": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, "engines": { @@ -7761,7 +7679,6 @@ }, "node_modules/supports-color": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "dependencies": { @@ -7848,7 +7765,6 @@ }, "node_modules/table/node_modules/json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, @@ -7985,7 +7901,6 @@ }, "node_modules/tsconfig-paths/node_modules/json5": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "dependencies": { @@ -8059,7 +7974,6 @@ }, "node_modules/unbox-primitive": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", "dev": true, "dependencies": { @@ -8130,7 +8044,6 @@ }, "node_modules/uri-js": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, "dependencies": { @@ -8166,7 +8079,6 @@ }, "node_modules/vary": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true, "engines": { @@ -8244,6 +8156,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-4.1.0.tgz", "integrity": "sha512-3SkEj4NqwM69ikJdFVw6gObeB0NHyspRYMYkR/EbhR0hbvAKyR5gksVhtAfY1UYuWUOCCA0QNGwv9pOwdj+XUQ==", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", "dependencies": { "deepmerge": "^4.2.2", "shvl": "^2.0.3" @@ -8268,7 +8181,6 @@ }, "node_modules/which-boxed-primitive": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", "dev": true, "dependencies": { @@ -8954,7 +8866,6 @@ }, "@babel/plugin-syntax-async-generators": { "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "requires": { @@ -8980,7 +8891,6 @@ }, "@babel/plugin-syntax-dynamic-import": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, "requires": { @@ -8989,7 +8899,6 @@ }, "@babel/plugin-syntax-export-namespace-from": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, "requires": { @@ -8998,7 +8907,6 @@ }, "@babel/plugin-syntax-json-strings": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, "requires": { @@ -9007,7 +8915,6 @@ }, "@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, "requires": { @@ -9016,7 +8923,6 @@ }, "@babel/plugin-syntax-nullish-coalescing-operator": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "requires": { @@ -9025,7 +8931,6 @@ }, "@babel/plugin-syntax-numeric-separator": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "requires": { @@ -9034,7 +8939,6 @@ }, "@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "requires": { @@ -9043,7 +8947,6 @@ }, "@babel/plugin-syntax-optional-catch-binding": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, "requires": { @@ -9052,7 +8955,6 @@ }, "@babel/plugin-syntax-optional-chaining": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, "requires": { @@ -9741,13 +9643,11 @@ }, "@types/cookie": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==", "dev": true }, "@types/cors": { "version": "2.8.12", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==", "dev": true }, @@ -9763,7 +9663,6 @@ }, "@types/json5": { "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", "dev": true }, @@ -9792,7 +9691,6 @@ }, "@types/parse-json": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, @@ -9825,7 +9723,6 @@ "dependencies": { "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } @@ -9935,7 +9832,6 @@ }, "accepts": { "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "dev": true, "requires": { @@ -9963,7 +9859,6 @@ }, "ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { @@ -9992,7 +9887,6 @@ }, "ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { @@ -10029,7 +9923,6 @@ }, "array-union": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, @@ -10051,7 +9944,6 @@ }, "astral-regex": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, @@ -10079,7 +9971,6 @@ }, "babel-plugin-dynamic-import-node": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, "requires": { @@ -10137,13 +10028,11 @@ }, "base64-js": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true }, "base64id": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", "dev": true }, @@ -10154,7 +10043,6 @@ }, "bl": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, "requires": { @@ -10239,7 +10127,6 @@ }, "buffer": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, "requires": { @@ -10295,7 +10182,6 @@ }, "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": { @@ -10345,7 +10231,6 @@ }, "chalk": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { @@ -10416,7 +10301,6 @@ }, "color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "requires": { @@ -10425,7 +10309,6 @@ }, "color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, @@ -10453,7 +10336,6 @@ }, "component-emitter": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, @@ -10516,7 +10398,6 @@ }, "cookie": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", "dev": true }, @@ -10538,7 +10419,6 @@ "dependencies": { "semver": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", "dev": true } @@ -10546,7 +10426,6 @@ }, "cors": { "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", "dev": true, "requires": { @@ -10781,7 +10660,6 @@ }, "define-properties": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "requires": { @@ -10805,7 +10683,6 @@ }, "dir-glob": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, "requires": { @@ -10952,7 +10829,6 @@ }, "entities": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", "dev": true }, @@ -10994,7 +10870,6 @@ }, "es-to-primitive": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { @@ -11015,7 +10890,6 @@ }, "escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, @@ -11219,7 +11093,6 @@ "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { @@ -11237,7 +11110,6 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } @@ -11309,7 +11181,6 @@ }, "esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { @@ -11369,7 +11240,6 @@ }, "fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, @@ -11447,7 +11317,6 @@ }, "find-up": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { @@ -11487,7 +11356,6 @@ }, "fs-constants": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "dev": true }, @@ -11509,7 +11377,6 @@ }, "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 @@ -11541,7 +11408,6 @@ }, "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": { @@ -11638,7 +11504,6 @@ }, "globals": { "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, @@ -11707,19 +11572,16 @@ }, "has-bigints": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", "dev": true }, "has-flag": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, "has-symbols": { "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 }, @@ -11739,7 +11601,6 @@ }, "html-escaper": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, @@ -11801,13 +11662,11 @@ }, "ieee754": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true }, "ignore": { "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, @@ -12096,7 +11955,6 @@ }, "istanbul-lib-report": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", "dev": true, "requires": { @@ -12107,13 +11965,11 @@ "dependencies": { "has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "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": { @@ -12135,7 +11991,6 @@ "dependencies": { "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true } @@ -12198,7 +12053,6 @@ }, "jsesc": { "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, @@ -12214,7 +12068,6 @@ }, "json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, @@ -12241,15 +12094,15 @@ } }, "karma": { - "version": "6.3.9", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.9.tgz", - "integrity": "sha512-E/MqdLM9uVIhfuyVnrhlGBu4miafBdXEAEqCmwdEMh3n17C7UWC/8Kvm3AYKr91gc7scutekZ0xv6rxRaUCtnw==", + "version": "6.3.16", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz", + "integrity": "sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==", "dev": true, "requires": { "body-parser": "^1.19.0", "braces": "^3.0.2", "chokidar": "^3.5.1", - "colors": "^1.4.0", + "colors": "1.4.0", "connect": "^3.7.0", "di": "^0.0.1", "dom-serialize": "^2.2.1", @@ -12258,9 +12111,10 @@ "http-proxy": "^1.18.1", "isbinaryfile": "^4.0.8", "lodash": "^4.17.21", - "log4js": "^6.3.0", + "log4js": "^6.4.1", "mime": "^2.5.2", "minimatch": "^3.0.4", + "mkdirp": "^0.5.5", "qjobs": "^1.2.0", "range-parser": "^1.2.1", "rimraf": "^3.0.2", @@ -12271,6 +12125,15 @@ "yargs": "^16.1.1" }, "dependencies": { + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "source-map": { "version": "0.6.1", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", @@ -12383,7 +12246,6 @@ }, "locate-path": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { @@ -12398,7 +12260,6 @@ }, "lodash.debounce": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, @@ -12420,7 +12281,6 @@ }, "lodash.truncate": { "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", "dev": true }, @@ -12466,7 +12326,6 @@ }, "make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { @@ -12661,7 +12520,6 @@ }, "merge2": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true }, @@ -12672,7 +12530,6 @@ }, "micromatch": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { @@ -12767,7 +12624,6 @@ }, "negotiator": { "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", "dev": true }, @@ -12809,7 +12665,6 @@ }, "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 }, @@ -12821,13 +12676,11 @@ }, "object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, "object.assign": { "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": { @@ -12895,7 +12748,6 @@ }, "p-limit": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { @@ -12904,7 +12756,6 @@ }, "p-locate": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { @@ -12913,7 +12764,6 @@ }, "p-try": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true }, @@ -12951,7 +12801,6 @@ }, "path-exists": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true }, @@ -12994,7 +12843,6 @@ }, "pkg-dir": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { @@ -13358,7 +13206,6 @@ }, "queue-microtask": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, @@ -13385,7 +13232,6 @@ }, "readable-stream": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "requires": { @@ -13429,7 +13275,6 @@ }, "regenerate": { "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", "dev": true }, @@ -13449,7 +13294,6 @@ }, "regenerator-transform": { "version": "0.14.5", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", "dev": true, "requires": { @@ -13478,7 +13322,6 @@ }, "regjsgen": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==", "dev": true }, @@ -13493,7 +13336,6 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -13506,7 +13348,6 @@ }, "require-from-string": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true }, @@ -13545,7 +13386,6 @@ }, "reusify": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true }, @@ -13602,7 +13442,6 @@ }, "run-parallel": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "requires": { @@ -13711,13 +13550,11 @@ }, "slash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, "slice-ansi": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, "requires": { @@ -13728,7 +13565,6 @@ "dependencies": { "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": { @@ -13737,7 +13573,6 @@ }, "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": { @@ -13746,7 +13581,6 @@ }, "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 } @@ -13774,7 +13608,6 @@ }, "socket.io-parser": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", "dev": true, "requires": { @@ -13870,7 +13703,6 @@ }, "string_decoder": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, "requires": { @@ -13879,7 +13711,6 @@ "dependencies": { "safe-buffer": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true } @@ -13898,7 +13729,6 @@ }, "string.prototype.trimend": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", "dev": true, "requires": { @@ -13908,7 +13738,6 @@ }, "string.prototype.trimstart": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", "dev": true, "requires": { @@ -13927,7 +13756,6 @@ }, "strip-bom": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true }, @@ -13941,7 +13769,6 @@ }, "strip-json-comments": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, @@ -14066,7 +13893,6 @@ }, "supports-color": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { @@ -14133,7 +13959,6 @@ }, "json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true } @@ -14247,7 +14072,6 @@ "dependencies": { "json5": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { @@ -14295,7 +14119,6 @@ }, "unbox-primitive": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", "dev": true, "requires": { @@ -14345,7 +14168,6 @@ }, "uri-js": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, "requires": { @@ -14378,7 +14200,6 @@ }, "vary": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, @@ -14452,7 +14273,6 @@ }, "which-boxed-primitive": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", "dev": true, "requires": { From 5799e92d214cc6210cf53cb3dc9892b687c5e6a3 Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Fri, 11 Feb 2022 17:32:48 +0100 Subject: [PATCH 23/25] Also here Signed-off-by: dgrammatiko --- installation/template/scss/template.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss index 26b7f93f96416..3bbcc8d0a448e 100644 --- a/installation/template/scss/template.scss +++ b/installation/template/scss/template.scss @@ -13,6 +13,9 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts"; @import "../../../media/vendor/fontawesome-free/scss/solid"; @import "../../../media/vendor/fontawesome-free/scss/brands"; // order of loading is important. +// B/C with Font Awesome 5 +@import "../../../media/vendor/fontawesome-free/scss/shims"; + // B/C for Icomoon @import "../../../build/media_source/system/scss/icomoon"; From f743b5abe549ab716f9a1935e921f2f0c99231e1 Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Mon, 14 Feb 2022 08:35:12 +0100 Subject: [PATCH 24/25] JS lint Signed-off-by: dgrammatiko --- .../scripts/components/browser/items/image.vue | 12 ++++++++---- build/build-modules-js/init/patches.es6.js | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue index 1ec2fd16a6a04..9b25d92967d85 100644 --- a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue +++ b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue @@ -4,8 +4,10 @@ @dblclick="openPreview()" @mouseleave="hideActions()" > -
+
-
+
{{ item.name }} {{ item.filetype }}
{ // Include the v5 shim for Font Awesome const faPath = join(mediaVendorPath, 'fontawesome-free/scss/fontawesome.scss'); - let newScss = (await readFile(faPath, { encoding: 'utf8' })).concat(` + const newScss = (await readFile(faPath, { encoding: 'utf8' })).concat(` @import 'shims'; `); await writeFile(faPath, newScss, { encoding: 'utf8', mode: 0o644 }); From a64f70f5f97227745605ff7fa2d0f422fe77a1c1 Mon Sep 17 00:00:00 2001 From: dgrammatiko Date: Mon, 14 Feb 2022 09:02:31 +0100 Subject: [PATCH 25/25] Fix it Signed-off-by: dgrammatiko --- .../com_media/scss/components/_media-browser.scss | 4 ++-- .../plg_system_debug/widgets/languageStrings/widget.css | 2 +- .../plg_system_debug/widgets/sqlqueries/widget.css | 2 +- build/media_source/system/scss/_icomoon.scss | 4 ++-- build/media_source/system/scss/joomla-fontawesome.scss | 2 +- .../templates/administrator/atum/scss/blocks/_global.scss | 2 +- .../administrator/atum/scss/blocks/_sidebar-nav.scss | 4 ++-- .../templates/administrator/atum/scss/blocks/_sidebar.scss | 4 ++-- .../templates/administrator/atum/scss/blocks/_toolbar.scss | 4 ++-- .../atum/scss/vendor/fontawesome-free/fontawesome.scss | 4 ++-- .../templates/site/cassiopeia/scss/blocks/_toolbar.scss | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/media_source/com_media/scss/components/_media-browser.scss b/build/media_source/com_media/scss/components/_media-browser.scss index 9d0cbed5acb55..f03da442bb5a1 100644 --- a/build/media_source/com_media/scss/components/_media-browser.scss +++ b/build/media_source/com_media/scss/components/_media-browser.scss @@ -90,7 +90,7 @@ left: 0; width: calc(#{$grid-item-icon-size} * 1.3); height: calc(#{$grid-item-icon-size} * 1.3); - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; font-size: $grid-item-icon-size; font-weight: 900; line-height: calc(#{$grid-item-icon-size} * 1.3); @@ -319,7 +319,7 @@ transition: all .2s cubic-bezier(.4, 0, .2, 1); } &::before { - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; color: $table-item-icon-color; .selected & { color: $table-item-icon-color-selected; diff --git a/build/media_source/plg_system_debug/widgets/languageStrings/widget.css b/build/media_source/plg_system_debug/widgets/languageStrings/widget.css index 928782ab263cf..dd7c8595c1679 100644 --- a/build/media_source/plg_system_debug/widgets/languageStrings/widget.css +++ b/build/media_source/plg_system_debug/widgets/languageStrings/widget.css @@ -44,7 +44,7 @@ table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye-dash { table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye:before, table.phpdebugbar-widgets-languageStrings span.phpdebugbar-widgets-eye-dash:before { - font-family:"Font Awesome 5 Free"; + font-family:"Font Awesome 6 Free"; margin-right: 4px; /*font-size: 12px;*/ } diff --git a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css index fd6350a6cc15a..ed503b2e10839 100644 --- a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css +++ b/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css @@ -49,7 +49,7 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-eye-dash:before, div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before, div.phpdebugbar-widgets-sqlqueries a.phpdebugbar-widgets-editor-link:before { - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; margin-right: 4px; font-size: 12px; font-weight: 900; diff --git a/build/media_source/system/scss/_icomoon.scss b/build/media_source/system/scss/_icomoon.scss index 3a4c29d42e5af..a17e6afd40c33 100644 --- a/build/media_source/system/scss/_icomoon.scss +++ b/build/media_source/system/scss/_icomoon.scss @@ -289,7 +289,7 @@ $jicons: ( minus-circle : $fa-var-minus-circle, minus-sign : $fa-var-minus, minus : $fa-var-minus, - mobile : $fa-var-mobile-screen-button, + mobile : $fa-var-mobile, move : $fa-var-arrows-alt, music : $fa-var-music, new-tab-2 : $fa-var-external-link-square-alt, @@ -403,7 +403,7 @@ $jicons: ( support : $fa-var-life-ring, switch : $fa-var-power-off, sync : $fa-var-sync, - tablet : $fa-var-tablet-button, + tablet : $fa-var-tablet, tachometer-alt : $fa-var-tachometer-alt, tag-2 : $fa-var-tag, tag : $fa-var-tag, diff --git a/build/media_source/system/scss/joomla-fontawesome.scss b/build/media_source/system/scss/joomla-fontawesome.scss index f94624aaffa4f..065b91451793b 100644 --- a/build/media_source/system/scss/joomla-fontawesome.scss +++ b/build/media_source/system/scss/joomla-fontawesome.scss @@ -2,7 +2,7 @@ $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts" !default; $fa-font-display: block !default; -// Font Awesome 5 Free +// Font Awesome 6 Free @import "../../../../media/vendor/fontawesome-free/scss/fontawesome"; @import "../../../../media/vendor/fontawesome-free/scss/regular"; @import "../../../../media/vendor/fontawesome-free/scss/solid"; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss index 62cc4d3e0894a..47d7c1d33285d 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_global.scss @@ -183,7 +183,7 @@ body:not(.contentpane) .main-card { // external links with icons a[target="_blank"]::before { padding-inline-end: 3px; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; font-size: 14px; font-weight: 900; content: "\f35d"; diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss index e161f24c46b12..e553db4f609f9 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss @@ -20,7 +20,7 @@ &::before { margin-right: .5rem; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; font-weight: 900; content: "\f054"; @@ -33,7 +33,7 @@ &::after { [dir="rtl"] & { margin-inline-end: .5rem; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; font-weight: 900; content: "\f053"; } diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss index ad0af74c350e2..28bacf2fea376 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss @@ -141,7 +141,7 @@ align-items: center; justify-content: center; width: 2rem; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; font-weight: 900; [dir="ltr"] & { @@ -267,7 +267,7 @@ .navbar-toggler-icon::before { display: inline-block; - font: normal normal 900 28px/1 "Font Awesome 5 Free"; + font: normal normal 900 28px/1 "Font Awesome 6 Free"; color: var(--toggle-color); content: "\f00d"; } diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss index f176b259e05a2..a9f1647b67b5e 100644 --- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss @@ -93,7 +93,7 @@ &::after { width: 2.375rem; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; font-weight: 900; content: "\f078"; border: 0; @@ -170,7 +170,7 @@ border-radius: 30px; .toggler-toolbar-icon::before { - font: normal normal 900 28px/1 "Font Awesome 5 Free"; + font: normal normal 900 28px/1 "Font Awesome 6 Free"; color: var(--toggle-color); content: "\f00d"; } diff --git a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss index fa3e3ac16b85b..1333e51d9cc9a 100644 --- a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss +++ b/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss @@ -2,7 +2,7 @@ $fa-css-prefix: fa; $fa-font-path: "../../../../../../vendor/fontawesome-free/webfonts" !default; -// Font Awesome 5 Free +// Font Awesome 6 Free @import "../../../../../../../../media/vendor/fontawesome-free/scss/fontawesome"; @import "../../../../../../../../media/vendor/fontawesome-free/scss/regular"; @import "../../../../../../../../media/vendor/fontawesome-free/scss/solid"; @@ -14,7 +14,7 @@ $fa-font-path: "../../../../../../vendor/fontawesome-free/we @import "../../../../../../../../media/vendor/fontawesome-free/scss/shims"; // B/C for Icomoon -@import "../../../../../../system/scss/icomoon"; +@import "../../../../../../../../media/system/scss/icomoon"; // RTL override html[dir=rtl] .float-right { diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss b/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss index 3369c3d29a16e..546cd4ab49ddd 100644 --- a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss +++ b/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss @@ -93,7 +93,7 @@ &::after { width: 2.375rem; - font-family: "Font Awesome 5 Free"; + font-family: "Font Awesome 6 Free"; font-weight: 900; content: "\f078"; border: 0;