From 33ac55cb66fde767ae9258144a635615d6edd6a2 Mon Sep 17 00:00:00 2001 From: Zbynek Konecny Date: Tue, 19 Mar 2024 22:39:58 +0100 Subject: [PATCH] Improve modal dialog design (#1657) --- .github/renovate.json | 3 +- plugins/plugin-site/package.json | 2 +- plugins/plugin-site/src/styles/base.css | 4 + yarn.lock | 140 +++++++++--------------- 4 files changed, 56 insertions(+), 93 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index b74ddbaf6..e24240c2d 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -46,8 +46,7 @@ }, { "matchPackageNames": [ - "husky", - "reactstrap" + "husky" ], "enabled": false }, diff --git a/plugins/plugin-site/package.json b/plugins/plugin-site/package.json index cb118f98f..a6ea76d10 100644 --- a/plugins/plugin-site/package.json +++ b/plugins/plugin-site/package.json @@ -102,7 +102,7 @@ "react-helmet": "6.1.0", "react-radio-group": "3.0.3", "react-timeago": "7.2.0", - "reactstrap": "8.10.1" + "reactstrap": "9.2.2" }, "devDependencies": { "@babel/plugin-proposal-class-properties": "7.18.6", diff --git a/plugins/plugin-site/src/styles/base.css b/plugins/plugin-site/src/styles/base.css index 3386dddad..229818200 100644 --- a/plugins/plugin-site/src/styles/base.css +++ b/plugins/plugin-site/src/styles/base.css @@ -1052,4 +1052,8 @@ a.card:hover { --bs-form-invalid-color: #ea868f; --bs-form-invalid-border-color: #ea868f; } + + .btn-close { + filter: var(--bs-btn-close-white-filter); + } } diff --git a/yarn.lock b/yarn.lock index 8f505d206..9bedd2f5f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2197,7 +2197,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.9, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.9, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": version: 7.23.5 resolution: "@babel/runtime@npm:7.23.5" dependencies: @@ -2206,6 +2206,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7": + version: 7.24.1 + resolution: "@babel/runtime@npm:7.24.1" + dependencies: + regenerator-runtime: "npm:^0.14.0" + checksum: 10c0/500c6a99ddd84f37c7bc5dbc84777af47b1372b20e879941670451d55484faf18a673c5ebee9ca2b0f36208a729417873b35b1b92e76f811620f6adf7b8cb0f1 + languageName: node + linkType: hard + "@babel/template@npm:^7.20.7, @babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3": version: 7.22.15 resolution: "@babel/template@npm:7.22.15" @@ -3246,19 +3255,6 @@ __metadata: languageName: node linkType: hard -"@hypnosphi/create-react-context@npm:^0.3.1": - version: 0.3.1 - resolution: "@hypnosphi/create-react-context@npm:0.3.1" - dependencies: - gud: "npm:^1.0.0" - warning: "npm:^4.0.3" - peerDependencies: - prop-types: ^15.0.0 - react: ">=0.14.0" - checksum: 10c0/e8072221f9f9c2c47c3ebc5bc6079f9a71938e181d2b4aa3e1d3922707bc097336d5260dad088cf47c1d6e1ff34839fa21f2505a95bddda0d7548c5a955b5691 - languageName: node - linkType: hard - "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -3435,7 +3431,7 @@ __metadata: react-helmet: "npm:6.1.0" react-radio-group: "npm:3.0.3" react-timeago: "npm:7.2.0" - reactstrap: "npm:8.10.1" + reactstrap: "npm:9.2.2" remark: "npm:14.0.2" remark-frontmatter: "npm:5.0.0" remark-gfm: "npm:4.0.0" @@ -4548,6 +4544,13 @@ __metadata: languageName: node linkType: hard +"@popperjs/core@npm:^2.6.0": + version: 2.11.8 + resolution: "@popperjs/core@npm:2.11.8" + checksum: 10c0/4681e682abc006d25eb380d0cf3efc7557043f53b6aea7a5057d0d1e7df849a00e281cd8ea79c902a35a414d7919621fc2ba293ecec05f413598e0b23d5a1e63 + languageName: node + linkType: hard + "@sideway/address@npm:^4.1.3": version: 4.1.4 resolution: "@sideway/address@npm:4.1.4" @@ -8545,20 +8548,6 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^1.1.1": - version: 1.1.2 - resolution: "deep-equal@npm:1.1.2" - dependencies: - is-arguments: "npm:^1.1.1" - is-date-object: "npm:^1.0.5" - is-regex: "npm:^1.1.4" - object-is: "npm:^1.1.5" - object-keys: "npm:^1.1.1" - regexp.prototype.flags: "npm:^1.5.1" - checksum: 10c0/cd85d822d18e9b3e1532d0f6ba412d229aa9d22881d70da161674428ae96e47925191296f7cda29306bac252889007da40ed8449363bd1c96c708acb82068a00 - languageName: node - linkType: hard - "deep-equal@npm:^2.0.5": version: 2.2.3 resolution: "deep-equal@npm:2.2.3" @@ -8841,12 +8830,13 @@ __metadata: languageName: node linkType: hard -"dom-helpers@npm:^3.4.0": - version: 3.4.0 - resolution: "dom-helpers@npm:3.4.0" +"dom-helpers@npm:^5.0.1": + version: 5.2.1 + resolution: "dom-helpers@npm:5.2.1" dependencies: - "@babel/runtime": "npm:^7.1.2" - checksum: 10c0/1d2d3e4eadac2c4f4c8c7470a737ab32b7ec28237c4d094ea967ec3184168fd12452196fcc424a5d7860b6176117301aeaecba39467bf1a6e8492a8e5c9639d1 + "@babel/runtime": "npm:^7.8.7" + csstype: "npm:^3.0.2" + checksum: 10c0/f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c languageName: node linkType: hard @@ -11884,13 +11874,6 @@ __metadata: languageName: node linkType: hard -"gud@npm:^1.0.0": - version: 1.0.0 - resolution: "gud@npm:1.0.0" - checksum: 10c0/a4db6edc18e2c4e3a22dc9e639e40a4e5650d53dae9cf384a96d5380dfa17ddda376cf6b7797a5c30d140d2532e5a69d167bdb70c2c151dd673253bac6b027f3 - languageName: node - linkType: hard - "gzip-size@npm:^6.0.0": version: 6.0.0 resolution: "gzip-size@npm:6.0.0" @@ -17093,13 +17076,6 @@ __metadata: languageName: node linkType: hard -"popper.js@npm:^1.14.4": - version: 1.16.1 - resolution: "popper.js@npm:1.16.1" - checksum: 10c0/1c1a826f757edb5b8c2049dfd7a9febf6ae1e9d0e51342fc715b49a0c1020fced250d26484619883651e097c5764bbcacd2f31496e3646027f079dd83e072681 - languageName: node - linkType: hard - "possible-typed-array-names@npm:^1.0.0": version: 1.0.0 resolution: "possible-typed-array-names@npm:1.0.0" @@ -18160,7 +18136,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:^15.5.8, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": +"prop-types@npm:^15.5.8, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -18457,7 +18433,7 @@ __metadata: languageName: node linkType: hard -"react-fast-compare@npm:^3.1.1": +"react-fast-compare@npm:^3.0.1, react-fast-compare@npm:^3.1.1": version: 3.2.2 resolution: "react-fast-compare@npm:3.2.2" checksum: 10c0/0bbd2f3eb41ab2ff7380daaa55105db698d965c396df73e6874831dbafec8c4b5b08ba36ff09df01526caa3c61595247e3269558c284e37646241cba2b90a367 @@ -18499,27 +18475,17 @@ __metadata: languageName: node linkType: hard -"react-lifecycles-compat@npm:^3.0.4": - version: 3.0.4 - resolution: "react-lifecycles-compat@npm:3.0.4" - checksum: 10c0/1d0df3c85af79df720524780f00c064d53a9dd1899d785eddb7264b378026979acbddb58a4b7e06e7d0d12aa1494fd5754562ee55d32907b15601068dae82c27 - languageName: node - linkType: hard - -"react-popper@npm:^1.3.6": - version: 1.3.11 - resolution: "react-popper@npm:1.3.11" +"react-popper@npm:^2.2.4": + version: 2.3.0 + resolution: "react-popper@npm:2.3.0" dependencies: - "@babel/runtime": "npm:^7.1.2" - "@hypnosphi/create-react-context": "npm:^0.3.1" - deep-equal: "npm:^1.1.1" - popper.js: "npm:^1.14.4" - prop-types: "npm:^15.6.1" - typed-styles: "npm:^0.0.7" + react-fast-compare: "npm:^3.0.1" warning: "npm:^4.0.2" peerDependencies: - react: 0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 10c0/d5dd1d0d4b5a3407134681b42a079fce525c94bce892ad177515d54a8cf64203eecbc30231476367e916aaff91221f5b6abd5afc207a86c698f35b7254178488 + "@popperjs/core": ^2.0.0 + react: ^16.8.0 || ^17 || ^18 + react-dom: ^16.8.0 || ^17 || ^18 + checksum: 10c0/23f93540537ca4c035425bb8d5e51b11131fbc921d7ac1d041d0ae557feac8c877f3a012d36b94df8787803f52ed81e6df9257ac9e58719875f7805518d6db3f languageName: node linkType: hard @@ -18574,18 +18540,18 @@ __metadata: languageName: node linkType: hard -"react-transition-group@npm:^3.0.0": - version: 3.0.0 - resolution: "react-transition-group@npm:3.0.0" +"react-transition-group@npm:^4.4.2": + version: 4.4.5 + resolution: "react-transition-group@npm:4.4.5" dependencies: - dom-helpers: "npm:^3.4.0" + "@babel/runtime": "npm:^7.5.5" + dom-helpers: "npm:^5.0.1" loose-envify: "npm:^1.4.0" prop-types: "npm:^15.6.2" - react-lifecycles-compat: "npm:^3.0.4" peerDependencies: react: ">=16.6.0" react-dom: ">=16.6.0" - checksum: 10c0/133a8c88c20db86b092886a4f6883df53e02054929dfc18df9a43654643a0b11f687d08fa6e22ae61a95fe3d63419135f29d75ac2fb2838eb723f3459701e865 + checksum: 10c0/2ba754ba748faefa15f87c96dfa700d5525054a0141de8c75763aae6734af0740e77e11261a1e8f4ffc08fd9ab78510122e05c21c2d79066c38bb6861a886c82 languageName: node linkType: hard @@ -18598,19 +18564,20 @@ __metadata: languageName: node linkType: hard -"reactstrap@npm:8.10.1": - version: 8.10.1 - resolution: "reactstrap@npm:8.10.1" +"reactstrap@npm:9.2.2": + version: 9.2.2 + resolution: "reactstrap@npm:9.2.2" dependencies: "@babel/runtime": "npm:^7.12.5" + "@popperjs/core": "npm:^2.6.0" classnames: "npm:^2.2.3" prop-types: "npm:^15.5.8" - react-popper: "npm:^1.3.6" - react-transition-group: "npm:^3.0.0" + react-popper: "npm:^2.2.4" + react-transition-group: "npm:^4.4.2" peerDependencies: - react: ">=16.3.0" - react-dom: ">=16.3.0" - checksum: 10c0/fe11c44066a207e57c9437f794af40b1eaf67dfcecc0dbc3a24dea6aefc1e055dd7320547c948677100739cbafe52b98063bb8b142210e95260209dd5e02b30c + react: ">=16.8.0" + react-dom: ">=16.8.0" + checksum: 10c0/004ca38326f031bc3c48d2bbaacf7be2ae220ba76a2dc9d71da529ce06ad361918e190445326383c5b3f994e71b0145436eff74db74a7b6e7a6e81b9ae4df0e4 languageName: node linkType: hard @@ -21170,13 +21137,6 @@ __metadata: languageName: node linkType: hard -"typed-styles@npm:^0.0.7": - version: 0.0.7 - resolution: "typed-styles@npm:0.0.7" - checksum: 10c0/ec159f0e538364750cf9b8f19136375df64ad364fda355e6f7a7216ebffc67f18b436722c5c6853c89f70e6507eb69e5061ceb9334fa1f54902c0f6be1b985fe - languageName: node - linkType: hard - "typedarray-to-buffer@npm:^3.1.5": version: 3.1.5 resolution: "typedarray-to-buffer@npm:3.1.5" @@ -21773,7 +21733,7 @@ __metadata: languageName: node linkType: hard -"warning@npm:^4.0.2, warning@npm:^4.0.3": +"warning@npm:^4.0.2": version: 4.0.3 resolution: "warning@npm:4.0.3" dependencies: