Skip to content

Commit

Permalink
AAE-25326 Fix custom theme
Browse files Browse the repository at this point in the history
  • Loading branch information
BSekula committed Aug 19, 2024
1 parent 075e63d commit 5455665
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions lib/core/custom-theme/theme/typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@import '../variables/font-family';

@function get-mat-typography($base-font-size, $font-family) {
$custom-typography: mat.define-legacy-typography-configmat.define-typography-config(
$custom-typography: mat.define-legacy-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif',
$headline-1: mat.define-typography-level(112px, 112px, 300),
$headline-2: mat.define-typography-level(56px, 56px, 400),
Expand All @@ -21,7 +21,7 @@
);

@if $base-font-size {
$custom-typography: mat.define-legacy-typography-configmat.define-typography-config(
$custom-typography: mat.define-legacy-typography-config(
$headline-1: mat.define-typography-level(8rem, 8rem, 300),
$headline-2: mat.define-typography-level(4rem, 4rem, 400),
$headline-3: mat.define-typography-level(3.21rem, 3.21rem, 400),
Expand All @@ -34,23 +34,24 @@
$body-2: mat.define-typography-level(1rem, 1.42rem, 400),
$caption: mat.define-typography-level(0.86rem, 1.42rem, 400),
$button: mat.define-typography-level(1rem, 1rem, 500),
$font-family: $default-font-family,
$font-family: $default-font-family
);
}

@if $font-family {
@each $key, $level in $custom-typography {
/* stylelint-disable-next-line scss/no-global-function-names */
@if type-of($level) == 'map' {
$new-level: map.merge(
$level,
(
font-family: $font-family,
font-family: $font-family
)
);
$custom-typography: map.merge(
$custom-typography,
(
$key: $new-level,
$key: $new-level
)
);
}
Expand All @@ -59,7 +60,7 @@
$custom-typography: map.merge(
$custom-typography,
(
font-family: $font-family,
font-family: $font-family
)
);
}
Expand Down

0 comments on commit 5455665

Please sign in to comment.