From e5d28e0639df6a89c9fa4e5b05e7e93cbadb744c Mon Sep 17 00:00:00 2001 From: Drew Rygh Date: Fri, 30 Oct 2015 15:47:15 -0500 Subject: [PATCH] feat: add -path, -font-path --- ionic/fonts/ionicons.scss | 2 +- ionic/fonts/roboto.scss | 9 +++++---- ionic/ionic.core.scss | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ionic/fonts/ionicons.scss b/ionic/fonts/ionicons.scss index 803e7faa4a..dc6f011de4 100644 --- a/ionic/fonts/ionicons.scss +++ b/ionic/fonts/ionicons.scss @@ -2,7 +2,7 @@ // Ionicons // -------------------------- -$ionicons-font-path: "../fonts" !default; +$ionicons-font-path: $font-path !default; $ionicons-font-family: "Ionicons" !default; $ionicons-version: "3.0.0" !default; diff --git a/ionic/fonts/roboto.scss b/ionic/fonts/roboto.scss index 34e09dc7db..638cdb834a 100644 --- a/ionic/fonts/roboto.scss +++ b/ionic/fonts/roboto.scss @@ -5,31 +5,32 @@ http://www.apache.org/licenses/LICENSE-2.0.html */ +$roboto-font-path: $font-path !default; @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url(../fonts/roboto-light.ttf) format('truetype'), url(../fonts/roboto-light.woff) format('woff'); + src: local('Roboto Light'), local('Roboto-Light'), url('#{$roboto-font-path}/roboto-light.ttf') format('truetype'), url('#{$roboto-font-path}/roboto-light.woff') format('woff'); } @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(../fonts/roboto-regular.ttf) format('truetype'), url(../fonts/roboto-regular.woff) format('woff'); + src: local('Roboto'), local('Roboto-Regular'), url('#{$roboto-font-path}/roboto-regular.ttf') format('truetype'), url('#{$roboto-font-path}/roboto-regular.woff') format('woff'); } @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url(../fonts/roboto-medium.ttf) format('truetype'), url(../fonts/roboto-medium.woff) format('woff'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('#{$roboto-font-path}/roboto-medium.ttf') format('truetype'), url('#{$roboto-font-path}/roboto-medium.woff') format('woff'); } @font-face { font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url(../fonts/roboto-bold.ttf) format('truetype'), url(../fonts/roboto-bold.woff) format('woff'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('#{$roboto-font-path}/roboto-bold.ttf') format('truetype'), url('#{$roboto-font-path}/roboto-bold.woff') format('woff'); } diff --git a/ionic/ionic.core.scss b/ionic/ionic.core.scss index 045b7abd6a..c8bf1d9991 100644 --- a/ionic/ionic.core.scss +++ b/ionic/ionic.core.scss @@ -49,6 +49,7 @@ // Ionicons +$font-path: "../fonts" !default; $ionicons: true !default; @if ($ionicons) { @import "fonts/ionicons";