Merge branch 'dev' into main

jmuzina · Aug 1, 2023 · 19b9f79 · 19b9f79
2 parents 4751e91 + e89b0ed
commit 19b9f79
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 52 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,8 +40,8 @@
     "@angular/cli": "~16.1.6",
     "@angular/compiler-cli": "^16.1.7",
     "@types/jasmine": "~4.3.5",
-    "@typescript-eslint/eslint-plugin": "6.2.0",
-    "@typescript-eslint/parser": "6.2.0",
+    "@typescript-eslint/eslint-plugin": "6.2.1",
+    "@typescript-eslint/parser": "6.2.1",
     "eslint": "^8.46.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.1.0",

diff --git a/src/app/modules/shared/components/header/header.component.scss b/src/app/modules/shared/components/header/header.component.scss
@@ -18,10 +18,11 @@
     border-bottom: 0.05em solid var(--surface-400);
     border-radius: 0;
     .p-menuitem-link-active {
-      background-color: var(--highlighted-nav-item-background);
+      border-radius: 0.3em;
+      background-color: var(--highlighted-nav-item-background) !important;
       span.p-menuitem-text,
       span.p-menuitem-icon {
-        color: var(--highlighted-nav-item-text);
+        color: var(--highlighted-nav-item-text) !important;
       }
     }
   }

diff --git a/src/styles.scss b/src/styles.scss
@@ -1,6 +1,6 @@
 html {
-  height: 100vh;
-  width: 100vw;
+  height: 100svh;
+  width: 100svw;
   overflow: hidden;
 }