diff --git a/src/lib/components/Button.module.scss b/src/lib/components/Button.module.scss index 58e40ced..4f677b31 100644 --- a/src/lib/components/Button.module.scss +++ b/src/lib/components/Button.module.scss @@ -40,6 +40,10 @@ color: #FFF; } + &.primary-link { + color: #2A2A2A; + } + &.outline { border: 2px solid; background-color: #fff; diff --git a/src/lib/components/Button.svelte b/src/lib/components/Button.svelte index 72c740f6..83c7e9fa 100644 --- a/src/lib/components/Button.svelte +++ b/src/lib/components/Button.svelte @@ -2,7 +2,7 @@ import { classnames } from 'lib/utils/classnames'; import styles from './Button.module.scss' - type ButtonVariant = 'primary'|'outline'|'contrast'|'' + type ButtonVariant = 'primary'|'primary-link'|'outline'|'contrast'|'' let className = ''; export {className as class}; diff --git a/src/lib/components/user-area/UserArea.svelte b/src/lib/components/user-area/UserArea.svelte index f46410ea..75e9188e 100644 --- a/src/lib/components/user-area/UserArea.svelte +++ b/src/lib/components/user-area/UserArea.svelte @@ -87,12 +87,12 @@ {#if isReady} - +
{#if !user}
-
{:else } diff --git a/src/lib/marketing-navigation/MarketingNavigation.svelte b/src/lib/marketing-navigation/MarketingNavigation.svelte index 103d8c78..1aeed4f3 100644 --- a/src/lib/marketing-navigation/MarketingNavigation.svelte +++ b/src/lib/marketing-navigation/MarketingNavigation.svelte @@ -11,6 +11,7 @@ import { windowLocation } from 'lib/utils/location.store'; import { checkAndLoadFonts } from 'lib/utils/fonts'; import NavigationBar from './components/NavigationBar.svelte'; + import UserArea from 'lib/components/user-area/UserArea.svelte'; const ctx = getAppContext() $: ({auth, navigationHandler} = $ctx) @@ -41,5 +42,7 @@ menuItems={menuItems} isMobile={$isMobile} navigationHandler={navigationHandler} - /> + > + +
diff --git a/src/lib/marketing-navigation/components/NavigationBar.svelte b/src/lib/marketing-navigation/components/NavigationBar.svelte index daaf36b2..f3e055fa 100644 --- a/src/lib/marketing-navigation/components/NavigationBar.svelte +++ b/src/lib/marketing-navigation/components/NavigationBar.svelte @@ -4,7 +4,6 @@ import TopNavbar from 'lib/components/TopNavbar.svelte'; import MobileNavigation from 'lib/mobile-navigation/MobileNavigation.svelte'; import { marketingRightItems } from 'lib/functions/marketing-navigation.provider' - import { allNavItems } from 'lib/config/nav-menu/all-nav-items.config'; import { NavigationHandler } from "../../app-context/navigation-handler.model"; export let style: 'primary'|'secondary'|'tertiary'; @@ -33,22 +32,6 @@ {/if} - {#if !isMobile} - - {:else} - - {/if} +