Merge branch 'master' into skeleton

This commit is contained in:
sercan 2018-10-19 10:45:10 +03:00
commit 3c45bd49e4
2 changed files with 2 additions and 2 deletions

View File

@ -41,7 +41,7 @@
// -----------------------------------------------------------------------------------------------------
html {
font-size: 62.5%;
font-family: 'Nunito', 'Helvetica Neue', 'Arial', sans-serif;
font-family: 'Muli', 'Helvetica Neue', 'Arial', sans-serif;
line-height: 1.4 !important;
letter-spacing: -0.1px !important;
}

View File

@ -63,7 +63,7 @@ $custom_palettes: (
// Force the input field font sizes to 16px
$typography: mat-typography-config(
$font-family: 'Nunito, Helvetica Neue, Arial, sans-serif',
$font-family: 'Muli, Helvetica Neue, Arial, sans-serif',
$title: mat-typography-level(20px, 32px, 600),
$body-2: mat-typography-level(14px, 24px, 600),
$button: mat-typography-level(14px, 14px, 600),