inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

AAE-25326 Fix custom theme (#10100)

Browse Source 
* AAE-25326 Fix custom theme

* fix
This commit is contained in:
Bartosz Sekula
2024-08-19 13:51:54 -04:00
committed by GitHub
parent 075e63d693
commit cd9dc4d8c2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/core/custom-theme/theme/typography.scss
View File

@@ -3,7 +3,7 @@
@import '../variables/font-family'; @import '../variables/font-family';
@function get-mat-typography($base-font-size, $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-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif', $font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif',
$headline-1: mat.define-typography-level(112px, 112px, 300), $headline-1: mat.define-typography-level(112px, 112px, 300),
$headline-2: mat.define-typography-level(56px, 56px, 400), $headline-2: mat.define-typography-level(56px, 56px, 400),
@@ -21,7 +21,7 @@
); );
@if $base-font-size { @if $base-font-size {
$custom-typography: mat.define-legacy-typography-configmat.define-typography-config( $custom-typography: mat.define-typography-config(
$headline-1: mat.define-typography-level(8rem, 8rem, 300), $headline-1: mat.define-typography-level(8rem, 8rem, 300),
$headline-2: mat.define-typography-level(4rem, 4rem, 400), $headline-2: mat.define-typography-level(4rem, 4rem, 400),
$headline-3: mat.define-typography-level(3.21rem, 3.21rem, 400), $headline-3: mat.define-typography-level(3.21rem, 3.21rem, 400),
@@ -34,23 +34,24 @@
$body-2: mat.define-typography-level(1rem, 1.42rem, 400), $body-2: mat.define-typography-level(1rem, 1.42rem, 400),
$caption: mat.define-typography-level(0.86rem, 1.42rem, 400), $caption: mat.define-typography-level(0.86rem, 1.42rem, 400),
$button: mat.define-typography-level(1rem, 1rem, 500), $button: mat.define-typography-level(1rem, 1rem, 500),
$font-family: $default-font-family, $font-family: $default-font-family
); );
} }
@if $font-family { @if $font-family {
@each $key, $level in $custom-typography { @each $key, $level in $custom-typography {
/* stylelint-disable-next-line scss/no-global-function-names */
@if type-of($level) == 'map' { @if type-of($level) == 'map' {
$new-level: map.merge( $new-level: map.merge(
$level, $level,
( (
font-family: $font-family, font-family: $font-family
) )
); );
$custom-typography: map.merge( $custom-typography: map.merge(
$custom-typography, $custom-typography,
( (
$key: $new-level, $key: $new-level
) )
); );
} }
@@ -59,7 +60,7 @@
$custom-typography: map.merge( $custom-typography: map.merge(
$custom-typography, $custom-typography,
( (
font-family: $font-family, font-family: $font-family
) )
); );
} }