From 12b16c6162f02d0426b32b4a9464ad66d168f5ad Mon Sep 17 00:00:00 2001 From: Vasilica Olariu Date: Tue, 19 Nov 2024 10:00:13 +0200 Subject: [PATCH 1/3] PM-319 - update marketing navbar --- public/assets/logo.svg | 2 +- src/lib/components/Accordion.module.scss | 2 +- src/lib/components/LinksMenu.module.scss | 4 +- src/lib/components/TcLogo.module.scss | 11 ++++- src/lib/components/TcLogo.svelte | 3 +- src/lib/components/TopNavbar.svelte | 3 +- .../components/user-area/AuthArea.module.scss | 15 +++++++ src/lib/components/user-area/AuthArea.svelte | 44 +++++++++++++++++++ src/lib/components/user-area/UserArea.svelte | 35 ++------------- src/lib/config/index.ts | 7 +++ .../config/nav-menu/all-nav-items.config.ts | 17 +++++++ .../config/nav-menu/main-navigation.config.ts | 11 +---- .../config/nav-menu/marketing-nav-items.ts | 5 +++ .../marketing-navigation.provider.ts | 2 + .../MarketingNavigation.svelte | 12 +++-- .../components/NavigationBar.svelte | 18 +++++++- src/lib/styles/_fonts.scss | 1 + src/lib/tool-navigation/ToolNavigation.svelte | 2 +- src/lib/utils/fonts.ts | 21 +++++---- uni-nav.env.dev | 1 + uni-nav.env.prod | 1 + uni-nav.env.qa | 1 + 22 files changed, 151 insertions(+), 67 deletions(-) create mode 100644 src/lib/components/user-area/AuthArea.module.scss create mode 100644 src/lib/components/user-area/AuthArea.svelte diff --git a/public/assets/logo.svg b/public/assets/logo.svg index 9d06f235..03edf122 100644 --- a/public/assets/logo.svg +++ b/public/assets/logo.svg @@ -1 +1 @@ - + diff --git a/src/lib/components/Accordion.module.scss b/src/lib/components/Accordion.module.scss index b3abe1f0..27e8418b 100644 --- a/src/lib/components/Accordion.module.scss +++ b/src/lib/components/Accordion.module.scss @@ -59,7 +59,7 @@ } .accordionWrap:global(.primary) { - font-family: $barlowCondensed; + font-family: $roboto; font-weight: 500; font-size: 20px; line-height: 16px; diff --git a/src/lib/components/LinksMenu.module.scss b/src/lib/components/LinksMenu.module.scss index ce0081e6..57ad6a33 100644 --- a/src/lib/components/LinksMenu.module.scss +++ b/src/lib/components/LinksMenu.module.scss @@ -23,7 +23,7 @@ & { // same as secondary styles color: #AAAAAA; - font-family: $roboto; + font-family: $nunito; font-weight: 500; font-size: 14px; line-height: 22px; @@ -43,7 +43,7 @@ &.primary { color: #2A2A2A; - font-family: $roboto; + font-family: $nunito; font-weight: 500; font-size: 16px; line-height: 24px; diff --git a/src/lib/components/TcLogo.module.scss b/src/lib/components/TcLogo.module.scss index 22368e53..95ec348e 100644 --- a/src/lib/components/TcLogo.module.scss +++ b/src/lib/components/TcLogo.module.scss @@ -2,12 +2,19 @@ .logo { display: flex; - margin-right: 48px; + margin-right: 40px; flex: 0 0 auto; img { display: block; - height: 22px; + height: 32px; + } + + .min { + margin-right: 48px; + img { + height: 22px; + } } @include mobile { diff --git a/src/lib/components/TcLogo.svelte b/src/lib/components/TcLogo.svelte index 9b0b6942..ffae1387 100644 --- a/src/lib/components/TcLogo.svelte +++ b/src/lib/components/TcLogo.svelte @@ -2,6 +2,7 @@ import { allNavItems } from 'lib/config/nav-menu/all-nav-items.config'; import { getPublicPath } from 'lib/utils/paths'; import styles from './TcLogo.module.scss'; + import { classnames } from 'lib/utils/classnames'; export let minVersion: boolean = false; @@ -9,6 +10,6 @@ $: imgUrl = getPublicPath(`/assets/logo${minVersion ? '.min' : ''}.svg`); - + diff --git a/src/lib/components/TopNavbar.svelte b/src/lib/components/TopNavbar.svelte index bb8fd0c9..325e0d93 100644 --- a/src/lib/components/TopNavbar.svelte +++ b/src/lib/components/TopNavbar.svelte @@ -7,13 +7,14 @@ export {className as class}; export let showLogo = false; export let style: 'primary'|'secondary'|'tertiary'; + export let minVersionLogo: boolean = false;