Merge branch 'dev' into staging

deNBI · Aug 14, 2024 · 3a088ce · 3a088ce
2 parents 5f49a16 + a709d69
commit 3a088ce
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 46 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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",
@@ -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/coreui": "4.3.2",
-        "@coreui/icons-angular": "5.0.4",
+        "@coreui/angular": "5.1.11",
+        "@coreui/coreui": "5.1.1",
+        "@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/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 @@ <h5>
 		<tr>
 			<td>Project Member Names Visibility</td>
 			<td>
-				<span *ngIf="application?.show_member_names" class="badge bg-light">Visible</span>
+				<span *ngIf="application?.show_member_names" class="badge bg-secondary">Visible</span>
 				<!--			<span *ngIf="!application?.show_member_names" class="badge bg-info">Hidden</span>-->
-				<span *ngIf="!application?.show_member_names" class="badge bg-primary">Hidden</span>
+				<span *ngIf="!application?.show_member_names" class="badge bg-secondary">Hidden</span>
 			</td>
 		</tr>
 

diff --git 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;
diff --git 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
@@ -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
@@ -0,0 +1,2 @@
+// Override Boostrap variables
+