Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion site/src/common/blocks/AccordionBlock.module.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.root {
display: flex;
flex-direction: column;
border-bottom: 1px solid var(--palette-gray-300);
border-bottom: 1px solid var(--brand-grey-300);
}

.pageLayoutContent {
Expand Down
10 changes: 5 additions & 5 deletions site/src/common/blocks/AccordionItemBlock.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
display: flex;
align-items: center;
justify-content: center;
color: var(--palette-primary-light);
color: var(--brand-primary-light);
}

.titleWrapper {
text-align: left;
display: flex;
align-items: center;
border-top: 1px solid var(--palette-gray-300);
border-top: 1px solid var(--brand-grey-300);
padding: var(--spacing-s500) 0;
gap: 8px;

&:hover {
color: var(--palette-primary-light);
color: var(--brand-primary-light);

.iconWrapper {
background-color: var(--palette-primary-light);
color: var(--palette-primary-contrastText);
background-color: var(--brand-primary-light);
color: var(--brand-primary-contrast);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion site/src/common/blocks/MediaGalleryBlock.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
display: block;
mask-image: url("/assets/icons/arrow-right.svg");
mask-repeat: no-repeat;
background-color: var(--palette-primary-main);
background-color: var(--brand-primary-main);
}
}

Expand Down
4 changes: 2 additions & 2 deletions site/src/common/blocks/RichTextBlock.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
}

.inlineLink {
color: var(--palette-primary-main);
color: var(--brand-primary-main);
transition: color 0.3s ease-in-out;

&:hover {
color: var(--palette-primary-dark);
color: var(--brand-primary-dark);
text-decoration-thickness: 2px;
}
}
Expand Down
38 changes: 19 additions & 19 deletions site/src/common/components/Button.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,53 +23,53 @@
}

.contained {
background-color: var(--palette-primary-main);
color: var(--palette-primary-contrastText);
border: 1px solid var(--palette-primary-main);
background-color: var(--brand-primary-main);
color: var(--brand-primary-contrast);
border: 1px solid var(--brand-primary-main);

&:hover {
color: var(--palette-primary-dark);
border-color: var(--palette-primary-dark);
background-color: var(--palette-primary-contrastText);
color: var(--brand-primary-dark);
border-color: var(--brand-primary-dark);
background-color: var(--brand-primary-contrast);
}

&:disabled {
background-color: var(--palette-gray-50);
color: var(--palette-gray-400);
border-color: var(--palette-gray-200);
background-color: var(--brand-grey-050);
color: var(--brand-grey-400);
border-color: var(--brand-grey-200);
}
}

.outlined {
background-color: transparent;
color: var(--palette-primary-main);
border: 1px solid var(--palette-primary-main);
color: var(--brand-primary-main);
border: 1px solid var(--brand-primary-main);

&:hover {
background-color: var(--palette-primary-dark);
color: var(--palette-primary-contrastText);
border-color: var(--palette-primary-dark);
background-color: var(--brand-primary-dark);
color: var(--brand-primary-contrast);
border-color: var(--brand-primary-dark);
}

&:disabled {
color: var(--palette-gray-300);
border-color: var(--palette-gray-200);
color: var(--brand-grey-300);
border-color: var(--brand-grey-200);
}
}

.text {
background-color: transparent;
color: var(--palette-primary-main);
color: var(--brand-primary-main);
border: 1px solid transparent;
text-decoration: underline;
text-underline-offset: 3px;

&:hover {
color: var(--palette-primary-dark);
color: var(--brand-primary-dark);
text-decoration-thickness: 2px;
}

&:disabled {
color: var(--palette-gray-300);
color: var(--brand-grey-300);
}
}
102 changes: 99 additions & 3 deletions site/src/common/components/Typography.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
@media (min-width: $breakpoint-lg) {
font-size: 67px;
line-height: 74px;
margin-bottom: 30px;
margin-bottom: 32px;
}
}

Expand Down Expand Up @@ -154,12 +154,102 @@
}
}

.p300 {
.e600 {
font-size: 20px;
line-height: 20px;
margin-bottom: 8px;

@media (min-width: $breakpoint-sm) {
font-size: 22px;
line-height: 22px;
}

@media (min-width: $breakpoint-md) {
font-size: 26px;
line-height: 26px;
}

@media (min-width: $breakpoint-lg) {
font-size: 30px;
line-height: 30px;
}
}

.e550 {
font-size: 18px;
line-height: 18px;
margin-bottom: 4px;

@media (min-width: $breakpoint-sm) {
font-size: 20px;
line-height: 20px;
}

@media (min-width: $breakpoint-md) {
font-size: 22px;
line-height: 22px;
}

@media (min-width: $breakpoint-lg) {
font-size: 26px;
line-height: 26px;
}
}

.e500 {
font-size: 16px;
line-height: 16px;
margin-bottom: 4px;

@media (min-width: $breakpoint-sm) {
font-size: 18px;
line-height: 18px;
}

@media (min-width: $breakpoint-md) {
font-size: 20px;
line-height: 20px;
}

@media (min-width: $breakpoint-lg) {
font-size: 22px;
line-height: 22px;
}
}

.e450 {
font-size: 13px;
line-height: 13px;
margin-bottom: 4px;

@media (min-width: $breakpoint-sm) {
font-size: 14px;
line-height: 14px;
}

@media (min-width: $breakpoint-md) {
font-size: 16px;
line-height: 16px;
}

@media (min-width: $breakpoint-lg) {
font-size: 18px;
line-height: 18px;
}
}

.p300 {
font-size: 15px;
line-height: 22px;
font-weight: 400;
margin-bottom: 16px;

@media (min-width: $breakpoint-sm) {
font-size: 16px;
line-height: 22px;
margin-bottom: 16px;
}

@media (min-width: $breakpoint-md) {
font-size: 17px;
line-height: 24px;
Expand All @@ -174,11 +264,17 @@
}

.p200 {
font-size: 14px;
font-size: 13px;
line-height: 20px;
font-weight: 400;
margin-bottom: 14px;

@media (min-width: $breakpoint-sm) {
font-size: 14px;
line-height: 20px;
margin-bottom: 14px;
}

@media (min-width: $breakpoint-md) {
font-size: 15px;
line-height: 22px;
Expand Down
6 changes: 5 additions & 1 deletion site/src/common/components/Typography.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { type ComponentProps, type ElementType, type PropsWithChildren } from "r

import styles from "./Typography.module.scss";

type TypographyVariant = "h600" | "h550" | "h500" | "h450" | "h400" | "h350" | "p300" | "p200";
type TypographyVariant = "h600" | "h550" | "h500" | "h450" | "h400" | "h350" | "e600" | "e550" | "e500" | "e450" | "p300" | "p200";

const variantToElementMap: Record<TypographyVariant, ElementType> = {
h600: "h1",
Expand All @@ -12,6 +12,10 @@ const variantToElementMap: Record<TypographyVariant, ElementType> = {
h450: "h4",
h400: "h5",
h350: "h6",
e600: "p",
e550: "p",
e500: "p",
e450: "p",
p300: "p",
p200: "p",
};
Expand Down
6 changes: 3 additions & 3 deletions site/src/documents/NotFound.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
text-decoration: none;
display: inline-block;
padding: var(--spacing-s100) 0;
color: var(--palette-text-primary);
color: var(--brand-grey-900);

&:hover {
color: var(--palette-primary-main);
color: var(--brand-primary-main);
}

&.active {
text-decoration: underline var(--palette-primary-main);
text-decoration: underline var(--brand-primary-main);
text-underline-offset: 8px;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
flex: 1;
flex-direction: column;
justify-content: center;
color: var(--palette-text-inverted);
color: var(--brand-primary-contrast);
}

.mediaPhone {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
flex-direction: column;
justify-content: center;
align-items: center;
color: var(--palette-text-inverted);
color: var(--brand-primary-contrast);
grid-column: 3 / -3;

@media (min-width: $breakpoint-sm) {
Expand Down
6 changes: 3 additions & 3 deletions site/src/documents/pages/blocks/ContentGroupBlock.module.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.lightGray {
background-color: var(--palette-gray-100);
background-color: var(--brand-grey-100);
}

.darkGray {
background-color: var(--palette-gray-900);
color: var(--palette-text-inverted);
background-color: var(--brand-grey-900);
color: var(--brand-primary-contrast);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

.fact {
margin-bottom: var(--spacing-s300);
color: var(--palette-primary-dark);
color: var(--brand-primary-dark);
}

.description {
Expand Down
6 changes: 3 additions & 3 deletions site/src/documents/pages/blocks/TeaserItemBlock.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
flex: 1;
flex-direction: row;
gap: var(--spacing-s300);
color: var(--palette-text-primary);
color: var(--brand-grey-900);

@media (min-width: $breakpoint-md) {
flex: unset;
Expand Down Expand Up @@ -46,11 +46,11 @@
display: flex;
align-items: center;
gap: var(--spacing-s200);
color: var(--palette-primary-main);
color: var(--brand-primary-main);
transition: color 0.3s ease-in-out;

&:hover {
color: var(--palette-primary-dark);
color: var(--brand-primary-dark);
}
}

Expand Down
Loading