diff --git a/src/app/(proper_react)/(redesign)/(public)/LandingView.module.scss b/src/app/(proper_react)/(redesign)/(public)/LandingView.module.scss index 1634ac11af..4b6633ccd1 100644 --- a/src/app/(proper_react)/(redesign)/(public)/LandingView.module.scss +++ b/src/app/(proper_react)/(redesign)/(public)/LandingView.module.scss @@ -5,6 +5,28 @@ flex-direction: column; height: 100%; } + +.waitlistSection { + display: flex; + flex-direction: column; + align-items: center; + gap: $spacing-lg; + padding: $layout-md $spacing-md; + + .waitlistTitle { + text-align: center; + font: $text-title-2xs; + font-weight: 600; + line-height: 1.4; + font-family: var(--font-inter); + color: $color-purple-70; + } + + a { + align-self: center; + } +} + .navbar { font: $text-body-xl; padding: $layout-xs; @@ -12,28 +34,28 @@ flex-direction: row; justify-content: flex-start; background-color: $color-grey-05; - .navbarLinksContainer { + ul { display: flex; flex-direction: column; - .navbarLinks { + a { text-decoration: none; color: $color-grey-50; } } @media screen and (min-width: $screen-sm) { justify-content: flex-end; - .navbarLinksContainer { + ul { flex-direction: row; justify-content: flex-end; - .navbarLinks { + a { margin-left: $spacing-lg; } } } @media screen and (min-width: $screen-md) { padding: $layout-xs $layout-xl; - .navbarLinksContainer { - .navbarLinks { + ul { + a { margin-left: $spacing-xl; } } @@ -396,24 +418,3 @@ align-self: center; } } - -.waitlistSection { - display: flex; - flex-direction: column; - align-items: center; - gap: $spacing-lg; - padding: $layout-md $spacing-md; - - .waitlistTitle { - text-align: center; - font: $text-title-2xs; - font-weight: 600; - line-height: 1.4; - font-family: var(--font-inter); - color: $color-purple-70; - } - - a { - align-self: center; - } -} diff --git a/src/app/(proper_react)/(redesign)/(public)/LandingView.tsx b/src/app/(proper_react)/(redesign)/(public)/LandingView.tsx index 74b8cd304b..315719a321 100644 --- a/src/app/(proper_react)/(redesign)/(public)/LandingView.tsx +++ b/src/app/(proper_react)/(redesign)/(public)/LandingView.tsx @@ -44,7 +44,11 @@ export const View = (props: Props) => { <>
- {props.eligibleForPremium && } + {props.eligibleForPremium && ( +
+ +
+ )}

{props.l10n.getString("landing-all-hero-title")}

diff --git a/src/app/(proper_react)/(redesign)/(public)/PublicShell.module.scss b/src/app/(proper_react)/(redesign)/(public)/PublicShell.module.scss index 2b67bcaa8f..514a1f9c83 100644 --- a/src/app/(proper_react)/(redesign)/(public)/PublicShell.module.scss +++ b/src/app/(proper_react)/(redesign)/(public)/PublicShell.module.scss @@ -45,6 +45,22 @@ } &.navDesktop { + ul { + display: flex; + + a { + color: $color-black; + text-decoration: none; + font-weight: 600; + padding: $spacing-sm $spacing-md; + + &:hover { + color: $color-purple-70; + text-decoration: underline; + } + } + } + @media screen and (max-width: $screen-xl) { display: none; } @@ -54,21 +70,3 @@ .content { flex: 1 0 auto; } - -.navbar { - display: flex; - flex-direction: row; - font-weight: 600; - justify-content: flex-start; - - .navbarLinksContainer { - display: flex; - gap: $spacing-md; - } - - .navbarLinks { - color: $color-black; - padding: $spacing-sm; - text-decoration: none; - } -} diff --git a/src/app/(proper_react)/(redesign)/(public)/PublicShell.tsx b/src/app/(proper_react)/(redesign)/(public)/PublicShell.tsx index 8a8d1e00ed..68f879b8c7 100644 --- a/src/app/(proper_react)/(redesign)/(public)/PublicShell.tsx +++ b/src/app/(proper_react)/(redesign)/(public)/PublicShell.tsx @@ -82,7 +82,7 @@ export const PublicShell = (props: Props) => { /> - {hasLandingPageRedesign && } + {hasLandingPageRedesign && }
{props.children}
diff --git a/src/app/(proper_react)/(redesign)/(public)/TopNavBar.tsx b/src/app/(proper_react)/(redesign)/(public)/TopNavBar.tsx index e44143439c..bce2997a65 100644 --- a/src/app/(proper_react)/(redesign)/(public)/TopNavBar.tsx +++ b/src/app/(proper_react)/(redesign)/(public)/TopNavBar.tsx @@ -7,61 +7,51 @@ import { TelemetryLink } from "../../../components/client/TelemetryLink"; import { useL10n } from "../../../hooks/l10n"; -export const TopNavBar = (props: { - styles: { - readonly [key: string]: string; - }; -}) => { +export const TopNavBar = () => { const l10n = useL10n(); return ( -
-
    -
  • - - {l10n.getString("landing-premium-hero-navbar-link-how-it-works")} - -
  • -
  • - - {l10n.getString("landing-premium-hero-navbar-link-pricing")} - -
  • -
  • - - {l10n.getString("landing-premium-hero-navbar-link-faqs")} - -
  • -
  • - - {l10n.getString("landing-premium-hero-navbar-link-recent-breaches")} - -
  • -
-
+
    +
  • + + {l10n.getString("landing-premium-hero-navbar-link-how-it-works")} + +
  • +
  • + + {l10n.getString("landing-premium-hero-navbar-link-pricing")} + +
  • +
  • + + {l10n.getString("landing-premium-hero-navbar-link-faqs")} + +
  • +
  • + + {l10n.getString("landing-premium-hero-navbar-link-recent-breaches")} + +
  • +
); }; diff --git a/src/app/(proper_react)/(redesign)/MobileShell.module.scss b/src/app/(proper_react)/(redesign)/MobileShell.module.scss index 95de9bdeb2..294e70e333 100644 --- a/src/app/(proper_react)/(redesign)/MobileShell.module.scss +++ b/src/app/(proper_react)/(redesign)/MobileShell.module.scss @@ -79,10 +79,6 @@ display: none; } - .navbar { - width: 100%; - } - @media screen and (max-width: $screen-xl) { .hasOpenMenu & .mainMenuLayer { display: block; diff --git a/src/app/(proper_react)/(redesign)/MobileShell.tsx b/src/app/(proper_react)/(redesign)/MobileShell.tsx index b55b35ff52..f98e0bc51b 100644 --- a/src/app/(proper_react)/(redesign)/MobileShell.tsx +++ b/src/app/(proper_react)/(redesign)/MobileShell.tsx @@ -197,7 +197,7 @@ export const MobileShell = (props: Props) => {
) : ( - + )}