From addc6f2dfbdff19698eea4141146457d00d9b4b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:07:25 +0000 Subject: [PATCH 1/4] feat(Dependencies): Update dependency @coreui/coreui to v5 | datasource | package | from | to | | ---------- | -------------- | ----- | ----- | | npm | @coreui/coreui | 4.3.2 | 5.0.0 | --- package-lock.json | 52 ++++++++++++++++------------------------------- package.json | 4 ++-- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58ce9823e1..f8f39b2a9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@denbi/cloud-portal-webapp", - "version": "4.815.0", + "version": "4.816.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@denbi/cloud-portal-webapp", - "version": "4.815.0", + "version": "4.816.0", "dependencies": { "@angular-eslint/eslint-plugin": "^17.3.0", "@angular/animations": "17.3.3", @@ -22,7 +22,7 @@ "@angular/service-worker": "17.3.3", "@angular/upgrade": "17.3.3", "@coreui/angular": "4.7.18", - "@coreui/coreui": "4.3.2", + "@coreui/coreui": "5.0.0", "@coreui/icons-angular": "4.7.18", "@ng-bootstrap/ng-bootstrap": "16.0.0", "@ng-select/ng-select": "12.0.7", @@ -3130,14 +3130,17 @@ } }, "node_modules/@coreui/coreui": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-4.3.2.tgz", - "integrity": "sha512-SKGY6E6v7QGq0P3YTnZQRSrU8t0euLQ3UV/FH5j0JmHYBBu7Mv0Hd9g8AESnj8xrCelKZ5bdZKZhmKaIdG5clw==", - "dependencies": { - "postcss-combine-duplicated-selectors": "^10.0.3" - }, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-5.0.0.tgz", + "integrity": "sha512-okQEoPVOqIQOH9aDN9jfgrjuMTgZ1YX/S81wWP5WuMmx5u0s8K+BXXDja5bbl4eP703+rElew/tHqGEAn+89Gw==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/coreui" + } + ], "peerDependencies": { - "@popperjs/core": "^2.11.6" + "@popperjs/core": "^2.11.8" } }, "node_modules/@coreui/icons": { @@ -15740,19 +15743,6 @@ "postcss": "^8.4.31" } }, - "node_modules/postcss-combine-duplicated-selectors": { - "version": "10.0.3", - "license": "MIT", - "dependencies": { - "postcss-selector-parser": "^6.0.4" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >=14.0.0" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, "node_modules/postcss-convert-values": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz", @@ -22201,12 +22191,10 @@ } }, "@coreui/coreui": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-4.3.2.tgz", - "integrity": "sha512-SKGY6E6v7QGq0P3YTnZQRSrU8t0euLQ3UV/FH5j0JmHYBBu7Mv0Hd9g8AESnj8xrCelKZ5bdZKZhmKaIdG5clw==", - "requires": { - "postcss-combine-duplicated-selectors": "^10.0.3" - } + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-5.0.0.tgz", + "integrity": "sha512-okQEoPVOqIQOH9aDN9jfgrjuMTgZ1YX/S81wWP5WuMmx5u0s8K+BXXDja5bbl4eP703+rElew/tHqGEAn+89Gw==", + "requires": {} }, "@coreui/icons": { "version": "3.0.1", @@ -30764,12 +30752,6 @@ "postcss-value-parser": "^4.2.0" } }, - "postcss-combine-duplicated-selectors": { - "version": "10.0.3", - "requires": { - "postcss-selector-parser": "^6.0.4" - } - }, "postcss-convert-values": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz", diff --git a/package.json b/package.json index 4f92be3bb9..76f7645a1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@denbi/cloud-portal-webapp", - "version": "4.815.0", + "version": "4.816.0", "description": "de.NBI Cloud Portal", "scripts": { "ng": "ng serve", @@ -32,7 +32,7 @@ "@angular/service-worker": "17.3.3", "@angular/upgrade": "17.3.3", "@coreui/angular": "4.7.18", - "@coreui/coreui": "4.3.2", + "@coreui/coreui": "5.0.0", "@coreui/icons-angular": "4.7.18", "@ng-bootstrap/ng-bootstrap": "16.0.0", "@ng-select/ng-select": "12.0.7", From 8c737da437273ee36d5a089b17277b4e8c8e7a7b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 18:17:18 +0000 Subject: [PATCH 2/4] feat(Dependencies): Update dependency @coreui/coreui to v5 | datasource | package | from | to | | ---------- | -------------- | ----- | ----- | | npm | @coreui/coreui | 4.3.2 | 5.1.1 | --- package-lock.json | 37 ++++++++++++++----------------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f55688e60..3bcce1963a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@denbi/cloud-portal-webapp", - "version": "4.848.0", + "version": "4.849.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@denbi/cloud-portal-webapp", - "version": "4.848.0", + "version": "4.849.0", "dependencies": { "@angular-eslint/eslint-plugin": "^17.3.0", "@angular/animations": "17.3.10", @@ -22,7 +22,7 @@ "@angular/service-worker": "17.3.10", "@angular/upgrade": "17.3.10", "@coreui/angular": "4.7.19", - "@coreui/coreui": "4.3.2", + "@coreui/coreui": "5.1.1", "@coreui/icons-angular": "5.0.4", "@ng-bootstrap/ng-bootstrap": "16.0.0", "@ng-select/ng-select": "12.0.7", @@ -2797,14 +2797,18 @@ } }, "node_modules/@coreui/coreui": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-4.3.2.tgz", - "integrity": "sha512-SKGY6E6v7QGq0P3YTnZQRSrU8t0euLQ3UV/FH5j0JmHYBBu7Mv0Hd9g8AESnj8xrCelKZ5bdZKZhmKaIdG5clw==", - "dependencies": { - "postcss-combine-duplicated-selectors": "^10.0.3" - }, + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-5.1.1.tgz", + "integrity": "sha512-oXAqIoHwY19Xj0uS6OKwAoCxpe7lw44YWJr54i9Sq1tDL0dzWK6GOqMav3a23SjvFW9yDSpqdC9xCbVZd2spBQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/coreui" + } + ], + "license": "MIT", "peerDependencies": { - "@popperjs/core": "^2.11.6" + "@popperjs/core": "^2.11.8" } }, "node_modules/@coreui/icons-angular": { @@ -14315,19 +14319,6 @@ "postcss": "^8.4.31" } }, - "node_modules/postcss-combine-duplicated-selectors": { - "version": "10.0.3", - "license": "MIT", - "dependencies": { - "postcss-selector-parser": "^6.0.4" - }, - "engines": { - "node": "^10.0.0 || ^12.0.0 || >=14.0.0" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, "node_modules/postcss-convert-values": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz", diff --git a/package.json b/package.json index 5dddf1e030..0ae7afe058 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@denbi/cloud-portal-webapp", - "version": "4.848.0", + "version": "4.849.0", "description": "de.NBI Cloud Portal", "scripts": { "ng": "ng serve", @@ -32,7 +32,7 @@ "@angular/service-worker": "17.3.10", "@angular/upgrade": "17.3.10", "@coreui/angular": "4.7.19", - "@coreui/coreui": "4.3.2", + "@coreui/coreui": "5.1.1", "@coreui/icons-angular": "5.0.4", "@ng-bootstrap/ng-bootstrap": "16.0.0", "@ng-select/ng-select": "12.0.7", From b2fd7fe7e5ea6b49d8a356e7283b0356c63cea2f Mon Sep 17 00:00:00 2001 From: dweinholz Date: Wed, 14 Aug 2024 10:54:48 +0200 Subject: [PATCH 3/4] fixed coreui_5 --- package-lock.json | 28 +++++++++++++++------------- package.json | 6 +++--- src/scss/_custom.scss | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3bcce1963a..e4e7299f97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,9 +21,9 @@ "@angular/router": "17.3.10", "@angular/service-worker": "17.3.10", "@angular/upgrade": "17.3.10", - "@coreui/angular": "4.7.19", + "@coreui/angular": "5.1.11", "@coreui/coreui": "5.1.1", - "@coreui/icons-angular": "5.0.4", + "@coreui/icons-angular": "5.1.11", "@ng-bootstrap/ng-bootstrap": "16.0.0", "@ng-select/ng-select": "12.0.7", "@sindresorhus/transliterate": "1.6.0", @@ -103,7 +103,7 @@ "npm-run-all2": "6.1.2", "prettier": "3.2.5", "raw-loader": "4.0.2", - "sass-loader": "14.2.1", + "sass-loader": "16.0.0", "script-loader": "0.7.2", "source-map-loader": "5.0.0", "style-loader": "4.0.0", @@ -2780,11 +2780,11 @@ } }, "node_modules/@coreui/angular": { - "version": "4.7.19", - "resolved": "https://registry.npmjs.org/@coreui/angular/-/angular-4.7.19.tgz", - "integrity": "sha512-FF/VuKk2usUdmmtOnsM2P8q+pZBkEM2FUovwq5H08uPkq5oN/NAhxldDP6VFgvlWgpSI8FwqZmWWEI8cnVcE2A==", + "version": "5.1.11", + "resolved": "https://registry.npmjs.org/@coreui/angular/-/angular-5.1.11.tgz", + "integrity": "sha512-hz5vS2V/9HQLqG3mftoe0quLCWD3AfAy+YLlt4+cp6PCGec/8v0shb7uTh3X117lEuzFw23ChH+g0KrViujahg==", "dependencies": { - "@popperjs/core": "~2.11.6", + "@popperjs/core": "~2.11.8", "tslib": "^2.3.0" }, "peerDependencies": { @@ -2793,6 +2793,8 @@ "@angular/common": "^17.3.0", "@angular/core": "^17.3.0", "@angular/router": "^17.3.0", + "@coreui/coreui": "^5.1.0", + "@coreui/icons-angular": "~5.1.11", "rxjs": "^7.8.1" } }, @@ -2812,9 +2814,9 @@ } }, "node_modules/@coreui/icons-angular": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/@coreui/icons-angular/-/icons-angular-5.0.4.tgz", - "integrity": "sha512-NmdKlpzJtFbTfwM+aypqaVH4Q3L1nyus5qgOwAElwLeIncu8lCyCwVLDRNIgQ8s1dzfpRXSv8m54i3Z35eLj9w==", + "version": "5.1.11", + "resolved": "https://registry.npmjs.org/@coreui/icons-angular/-/icons-angular-5.1.11.tgz", + "integrity": "sha512-ao2c3tJBmbDBDyL9gIoMTxIV4Yvg1tHg1C/6jCZvWvR1zp8eZ7NdO9SL/hFm+8l6vh4tK+4HU5lESlcMlEojIA==", "dependencies": { "tslib": "^2.3.0" }, @@ -15748,9 +15750,9 @@ } }, "node_modules/sass-loader": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.2.1.tgz", - "integrity": "sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz", + "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==", "dev": true, "dependencies": { "neo-async": "^2.6.2" diff --git a/package.json b/package.json index 0ae7afe058..d370e1cb15 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ "@angular/router": "17.3.10", "@angular/service-worker": "17.3.10", "@angular/upgrade": "17.3.10", - "@coreui/angular": "4.7.19", + "@coreui/angular": "5.1.11", "@coreui/coreui": "5.1.1", - "@coreui/icons-angular": "5.0.4", + "@coreui/icons-angular": "5.1.11", "@ng-bootstrap/ng-bootstrap": "16.0.0", "@ng-select/ng-select": "12.0.7", "@sindresorhus/transliterate": "1.6.0", @@ -113,7 +113,7 @@ "npm-run-all2": "6.1.2", "prettier": "3.2.5", "raw-loader": "4.0.2", - "sass-loader": "14.2.1", + "sass-loader": "16.0.0", "script-loader": "0.7.2", "source-map-loader": "5.0.0", "style-loader": "4.0.0", diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 7e4f9efc16..b8fc60c1bd 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -1,7 +1,7 @@ // Here you can add other styles @use "sass:math"; -@import "../node_modules/bootstrap/scss/bootstrap"; +//@import "../node_modules/bootstrap/scss/bootstrap"; // due to change from ngx-perfect-scrollbar to ngx-scrollbar From 1a4e2014da1c96726421854fdfe26cc3df733958 Mon Sep 17 00:00:00 2001 From: vktrrdk Date: Wed, 14 Aug 2024 11:59:52 +0000 Subject: [PATCH 4/4] fixing style issues with coreui 5 --- .../information-detail.component.html | 4 +-- src/scss/_custom-variables.scss | 5 ++++ src/scss/_custom.scss | 28 +++++++++++++++++-- src/scss/_variables-dark.scss | 2 ++ 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 src/scss/_variables-dark.scss diff --git a/src/app/applications/application-detail/information-detail/information-detail.component.html b/src/app/applications/application-detail/information-detail/information-detail.component.html index f8753f8e24..6d7797fe22 100644 --- a/src/app/applications/application-detail/information-detail/information-detail.component.html +++ b/src/app/applications/application-detail/information-detail/information-detail.component.html @@ -79,9 +79,9 @@
Project Member Names Visibility - Visible + Visible - Hidden + Hidden diff --git a/src/scss/_custom-variables.scss b/src/scss/_custom-variables.scss index c337e80cf5..aaab5acdbe 100644 --- a/src/scss/_custom-variables.scss +++ b/src/scss/_custom-variables.scss @@ -6,5 +6,10 @@ $gray-lighter: #cfd8dc; $border-color: $gray-lighter; + +$primary: #00adef; // $navbar-brand-logo-size: 120px auto; // $navbar-brand-logo: url('../img/denbi_cloud_logo.svg'); + +$theme-colors: ('primary': $primary); +$--cui-primary: $primary !important; \ No newline at end of file diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index b8fc60c1bd..54a5c923cc 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -339,6 +339,14 @@ $kubernetescolor: #326ce5; width: 13rem; } +.sidebar-nav .nav-item { + padding: 0; +} + +.sidebar-nav { + padding: 2px 0; +} + .row>.ng-star-inserted { width: unset; } @@ -875,6 +883,14 @@ app-dashboard { border-color: #BBC1C7; } +.alert-link { + color: $deNBI_blue; +} + +.alert-link:hover { + color: $deNBI_cyan; +} + .btn-secondary, .btn-info { background-color: $deNBI_lightgrey !important; @@ -1071,6 +1087,8 @@ header { color: $deNBI_darkgrey; } + + .nav-link:hover, .nav-link:hover { color: $deNBI_lightgrey; @@ -1113,8 +1131,14 @@ header { } .sidebar-nav .nav-item:hover, -.sidebar .nav-item:hover>.nav-link { - background-color: $deNBI_lightgrey +.sidebar .nav-item:hover>.nav-link, +.sidebar .nav-item:hover>.nav-link .nav-icon { + background-color: $deNBI_lightgrey; + color: white; +} + +.sidebar .nav-item .nav-link.active .nav-icon { + color: white; } .sidebar-nav .nav-group-toggle::after { diff --git a/src/scss/_variables-dark.scss b/src/scss/_variables-dark.scss new file mode 100644 index 0000000000..dc7eeabcc2 --- /dev/null +++ b/src/scss/_variables-dark.scss @@ -0,0 +1,2 @@ +// Override Boostrap variables +