From 1a3d61ae625c748beed28edd9c5b2504194f1508 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Sun, 22 Mar 2015 22:46:55 -0500 Subject: [PATCH] Typography --- src/components/app/_globals.scss | 14 +------------- src/components/app/_typography.scss | 8 ++++++++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/components/app/_globals.scss b/src/components/app/_globals.scss index 01616250c4..5faa2624f4 100644 --- a/src/components/app/_globals.scss +++ b/src/components/app/_globals.scss @@ -1,19 +1,6 @@ [ion-app] { - // Typography - // ------------------------- - @import "typography"; - font-size: $font-size-base; - font-family: $font-family-base; - line-height: $line-height-computed; - -webkit-font-smoothing: antialiased; - font-smoothing: antialiased; - text-rendering: optimizeLegibility; - -webkit-text-size-adjust: none; - text-size-adjust: none; - - // User Interaction // ------------------------- -webkit-user-drag: none; @@ -23,4 +10,5 @@ -webkit-user-select: none; -ms-user-select: none; user-select: none; + } diff --git a/src/components/app/_typography.scss b/src/components/app/_typography.scss index 6fb3d1348d..04e14004e8 100644 --- a/src/components/app/_typography.scss +++ b/src/components/app/_typography.scss @@ -17,6 +17,14 @@ $headings-line-height: 1.2 !default; [ion-app] { + font-size: $font-size-base; + font-family: $font-family-base; + line-height: $line-height-computed; + -webkit-font-smoothing: antialiased; + font-smoothing: antialiased; + text-rendering: optimizeLegibility; + -webkit-text-size-adjust: none; + text-size-adjust: none; h1, h2, h3, h4, h5, h6 { font-weight: $headings-font-weight;