@@ -88,15 +87,14 @@ export default function LanguageSwitcher({
})}
onClick={handleClick}
>
-
- {languages[currentLanguage]}
+
+
+ {languages[currentLanguage]}
-
diff --git a/components/LanguageSwitcher/languageSwitcher.module.css b/components/LanguageSwitcher/languageSwitcher.module.css
index 7f3854520..82753e9b5 100644
--- a/components/LanguageSwitcher/languageSwitcher.module.css
+++ b/components/LanguageSwitcher/languageSwitcher.module.css
@@ -1,25 +1,38 @@
.button {
+ --language-switcher-color: var(--Base-Text-Medium-contrast);
+ --language-switcher-hover-color: var(--Base-Text-High-contrast);
+
background-color: transparent;
- font-family: var(--typography-Caption-Regular-fontFamily);
- font-size: var(--typography-Caption-Regular-fontSize);
border-width: 0;
padding: 0;
cursor: pointer;
display: grid;
grid-template-columns: repeat(2, max-content) 1fr;
- gap: var(--Spacing-x1);
align-items: center;
width: 100%;
+ color: var(--language-switcher-color);
}
-.burgundy .button {
- color: var(--Base-Text-High-contrast);
+.button * {
+ fill: var(--language-switcher-color);
+}
+.button:hover {
+ color: var(--language-switcher-hover-color);
+}
+.button:hover * {
+ fill: var(--language-switcher-hover-color);
}
-.pale .button {
- color: var(--Primary-Dark-On-Surface-Text);
+.buttonText {
+ color: inherit !important;
+ margin-left: var(--Spacing-x1);
+ margin-right: var(--Spacing-x-quarter);
}
+.footer .button {
+ --language-switcher-color: var(--Primary-Dark-On-Surface-Text);
+ --language-switcher-hover-color: var(--Primary-Dark-On-Surface-Text);
+}
.chevron {
justify-self: end;
transition: transform 0.3s;
@@ -36,19 +49,19 @@
z-index: var(--menu-overlay-z-index);
}
-.top .dropdown {
+.header .dropdown {
right: -100vw;
top: var(--main-menu-mobile-height);
bottom: 0;
transition: right 0.3s;
}
-.top .dropdown.isExpanded {
+.header .dropdown.isExpanded {
display: block;
right: 0;
}
-.bottom .dropdown {
+.footer .dropdown {
transition: transform 0.3s;
width: 100%;
height: 100vh;
@@ -57,7 +70,7 @@
transform: translateY(100%);
}
-.bottom .dropdown.isExpanded {
+.footer .dropdown.isExpanded {
transform: translateY(0);
}
@@ -70,39 +83,37 @@
position: absolute;
background-color: var(--Base-Surface-Primary-light-Normal);
border-radius: var(--Corner-radius-Large);
- box-shadow: 0px 0px 14px 6px #0000001a;
+ box-shadow: 0 0 14px 6px rgba(0, 0, 0, 0.1);
display: none;
min-width: 12.5rem;
z-index: 1;
}
- .top .dropdown {
+ .header .dropdown {
top: 2.25rem;
bottom: auto;
}
- .top .dropdown::before {
+ .header .dropdown::before {
top: -1.25rem;
transform: rotate(180deg);
}
- .bottom .dropdown {
+ .footer .dropdown {
transition: none;
height: auto;
left: -100%;
bottom: 2.25rem;
}
- .bottom .dropdown.isExpanded {
+ .footer .dropdown.isExpanded {
display: block;
}
- .bottom .dropdown::before {
+ .footer .dropdown::before {
top: 100%;
}
.button {
grid-template-columns: repeat(3, max-content);
- font-size: var(--typography-Body-Bold-fontSize);
- font-family: var(--typography-Body-Bold-fontFamily);
}
}
diff --git a/components/LanguageSwitcher/variants.ts b/components/LanguageSwitcher/variants.ts
index 0fac0e5da..ca9050366 100644
--- a/components/LanguageSwitcher/variants.ts
+++ b/components/LanguageSwitcher/variants.ts
@@ -4,17 +4,12 @@ import styles from "./languageSwitcher.module.css"
export const languageSwitcherVariants = cva(styles.languageSwitcher, {
variants: {
- color: {
- burgundy: styles.burgundy,
- pale: styles.pale,
- },
position: {
- header: styles.top,
- footer: styles.bottom,
+ header: styles.header,
+ footer: styles.footer,
},
defaultVariants: {
- color: "burgundy",
- position: "top",
+ position: "header",
},
},
})
diff --git a/components/LoginButton/index.tsx b/components/LoginButton/index.tsx
index 54ba17b34..f6b163b38 100644
--- a/components/LoginButton/index.tsx
+++ b/components/LoginButton/index.tsx
@@ -18,13 +18,13 @@ export default function LoginButton({
trackingId,
children,
color = "black",
- variant = "default",
+ variant = "navigation",
}: PropsWithChildren<{
className: string
trackingId: string
position: TrackingPosition
color?: LinkProps["color"]
- variant?: "default" | "signupVerification"
+ variant?: "navigation" | "signupVerification"
}>) {
const lang = useLang()
const pathName = useLazyPathname({ includeSearchParams: true })
diff --git a/components/TempDesignSystem/Accordion/AccordionItem/index.tsx b/components/TempDesignSystem/Accordion/AccordionItem/index.tsx
index 013eb746d..be877dd9e 100644
--- a/components/TempDesignSystem/Accordion/AccordionItem/index.tsx
+++ b/components/TempDesignSystem/Accordion/AccordionItem/index.tsx
@@ -50,7 +50,12 @@ export default function AccordionItem({
{IconComp && }
{title}
-
+
{children}
diff --git a/components/TempDesignSystem/Alert/Sidepeek/index.tsx b/components/TempDesignSystem/Alert/Sidepeek/index.tsx
index db69cf563..d967bd24e 100644
--- a/components/TempDesignSystem/Alert/Sidepeek/index.tsx
+++ b/components/TempDesignSystem/Alert/Sidepeek/index.tsx
@@ -30,7 +30,7 @@ export default function AlertSidepeek({
wrapping
>
{ctaText}
-
+
{sidePeekIsOpen ? (
-
+
)
}
diff --git a/components/TempDesignSystem/Link/index.tsx b/components/TempDesignSystem/Link/index.tsx
index 2c46c8b6f..47c00bba4 100644
--- a/components/TempDesignSystem/Link/index.tsx
+++ b/components/TempDesignSystem/Link/index.tsx
@@ -23,6 +23,7 @@ export default function Link({
scroll = true,
prefetch,
variant,
+ weight,
trackingId,
onClick,
/**
@@ -45,6 +46,7 @@ export default function Link({
textDecoration,
color,
size,
+ weight,
variant,
})
diff --git a/components/TempDesignSystem/Link/link.module.css b/components/TempDesignSystem/Link/link.module.css
index 4e09ffc3e..138c8094e 100644
--- a/components/TempDesignSystem/Link/link.module.css
+++ b/components/TempDesignSystem/Link/link.module.css
@@ -154,20 +154,25 @@
color: var(--Base-Text-Medium-contrast);
}
-.red {
- color: var(--Primary-Strong-Button-Primary-On-Fill-Normal);
-}
-
.peach80:hover,
.peach80:active {
color: var(--Base-Text-High-contrast);
}
+.peach80 *,
+.peach80 * {
+ fill: var(--Base-Text-Medium-contrast);
+}
+
.peach80:hover *,
.peach80:active * {
fill: var(--Base-Text-High-contrast);
}
+.red {
+ color: var(--Primary-Strong-Button-Primary-On-Fill-Normal);
+}
+
.white {
color: var(--Base-Button-Primary-On-Fill-Normal);
}
@@ -213,6 +218,14 @@
letter-spacing: var(--typography-Caption-Bold-letterSpacing);
line-height: var(--typography-Caption-Bold-lineHeight);
}
+.bold {
+ font-family: var(--typography-Body-Bold-fontFamily);
+ font-size: var(--typography-Body-Bold-fontSize);
+ font-weight: 500
+ /* Should be fixed when variables starts working: var(--typography-Body-Bold-fontWeight) */;
+ letter-spacing: var(--typography-Body-Bold-letterSpacing);
+ line-height: var(--typography-Body-Bold-lineHeight);
+}
.menu {
display: flex;
@@ -223,11 +236,6 @@
padding: var(--Spacing-x1);
gap: var(--Spacing-x-one-and-half);
color: var(--Base-Text-High-contrast);
- font-family: var(--typography-Body-Bold-fontFamily);
- font-size: var(--typography-Body-Bold-fontSize);
- font-weight: var(--typography-Body-Bold-fontWeight);
- line-height: var(--typography-Body-Bold-lineHeight);
- letter-spacing: var(--typography-Body-Bold-letterSpacing);
border-radius: var(--Corner-radius-Medium);
}
@@ -236,6 +244,12 @@
background-color: var(--Base-Surface-Primary-light-Hover-alt);
}
+.navigation {
+ color: var(--Base-Text-High-contrast);
+ text-decoration: none;
+ padding: var(--Spacing-x-half) var(--Spacing-x1);
+}
+
.signupVerification {
background-color: var(--Base-Button-Primary-Fill-Normal);
color: var(--Base-Button-Inverted-Fill-Normal);
diff --git a/components/TempDesignSystem/Link/variants.ts b/components/TempDesignSystem/Link/variants.ts
index 267da008f..61c7f8493 100644
--- a/components/TempDesignSystem/Link/variants.ts
+++ b/components/TempDesignSystem/Link/variants.ts
@@ -26,12 +26,16 @@ export const linkVariants = cva(styles.link, {
none: styles.noDecoration,
underline: styles.underline,
},
+ weight: {
+ bold: styles.bold,
+ },
variant: {
breadcrumb: styles.breadcrumb,
default: styles.default,
icon: styles.icon,
underscored: styles.underscored,
myPageMobileDropdown: styles.myPageMobileDropdown,
+ navigation: styles.navigation,
menu: styles.menu,
shortcut: styles.shortcut,
sidebar: styles.sidebar,
diff --git a/components/TempDesignSystem/TeaserCard/Sidepeek/index.tsx b/components/TempDesignSystem/TeaserCard/Sidepeek/index.tsx
index cc90086ce..84f654639 100644
--- a/components/TempDesignSystem/TeaserCard/Sidepeek/index.tsx
+++ b/components/TempDesignSystem/TeaserCard/Sidepeek/index.tsx
@@ -31,7 +31,7 @@ export default function TeaserCardSidepeek({
wrapping
>
{button.call_to_action_text}
-
+