From 71ca17753a5c3362b8f48e19ab884fb10968cee5 Mon Sep 17 00:00:00 2001 From: Carlo Nomes Date: Fri, 7 Dec 2018 10:20:04 +0100 Subject: [PATCH] fix(stark-ui): remove `-apple-system` from default font-family for correct rendering in IE11 - update docs ISSUE: #732 --- packages/stark-ui/assets/styles/_variables.scss | 3 +-- .../pages/typography/styleguide-typography-page.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/stark-ui/assets/styles/_variables.scss b/packages/stark-ui/assets/styles/_variables.scss index 65b716bad9..245f52c1e4 100644 --- a/packages/stark-ui/assets/styles/_variables.scss +++ b/packages/stark-ui/assets/styles/_variables.scss @@ -225,8 +225,7 @@ $foregrounds: ( ); // https://material.angular.io/guide/typography $typography-theme: ( - font-family: - "-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif", + font-family: "BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif", display-4: ( 112px, 112px, diff --git a/showcase/src/app/styleguide/pages/typography/styleguide-typography-page.component.ts b/showcase/src/app/styleguide/pages/typography/styleguide-typography-page.component.ts index 820da1430a..a5e47ca65a 100644 --- a/showcase/src/app/styleguide/pages/typography/styleguide-typography-page.component.ts +++ b/showcase/src/app/styleguide/pages/typography/styleguide-typography-page.component.ts @@ -15,7 +15,7 @@ export class StyleguideTypographyPageComponent implements OnInit { public ngOnInit(): void { this.fontFamilyCSS = ` - font-family: "-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif"; + font-family: "BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif"; `; this.fontFaceExample = ` @@ -40,7 +40,7 @@ export class StyleguideTypographyPageComponent implements OnInit { this.customizeMap = ` $stark-typography-theme: ( - font-family: "-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif", + font-family: "BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif", display-4: (112px, 112px, 300), display-3: (56px, 56px, 400), display-2: (45px, 48px, 400),