diff --git a/ionic/components/app/typography.scss b/ionic/components/app/typography.scss index 286f34559d..baa2c58238 100644 --- a/ionic/components/app/typography.scss +++ b/ionic/components/app/typography.scss @@ -88,3 +88,7 @@ ion-app { bottom: -0.25em; } } + +body[mode=md] ion-app { + font-family: "Roboto", "Helvetica Neue", sans-serif; +} diff --git a/ionic/fonts/ionicons-font.scss b/ionic/fonts/ionicons-font.scss index 116ef71634..ed334c8d5a 100644 --- a/ionic/fonts/ionicons-font.scss +++ b/ionic/fonts/ionicons-font.scss @@ -4,8 +4,7 @@ @font-face { font-family: $ionicons-font-family; src:url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype"), - url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"), - url("#{$ionicons-font-path}/ionicons.svg?v=#{$ionicons-version}#Ionicons") format("svg"); + url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"); font-weight: normal; font-style: normal; } diff --git a/ionic/fonts/roboto-bold.ttf b/ionic/fonts/roboto-bold.ttf new file mode 100644 index 0000000000..4e35166a1f Binary files /dev/null and b/ionic/fonts/roboto-bold.ttf differ diff --git a/ionic/fonts/roboto-bold.woff b/ionic/fonts/roboto-bold.woff new file mode 100644 index 0000000000..3143de2975 Binary files /dev/null and b/ionic/fonts/roboto-bold.woff differ diff --git a/ionic/fonts/roboto-light.ttf b/ionic/fonts/roboto-light.ttf new file mode 100644 index 0000000000..5e26ccdb1e Binary files /dev/null and b/ionic/fonts/roboto-light.ttf differ diff --git a/ionic/fonts/roboto-light.woff b/ionic/fonts/roboto-light.woff new file mode 100644 index 0000000000..1bff3ec454 Binary files /dev/null and b/ionic/fonts/roboto-light.woff differ diff --git a/ionic/fonts/roboto-medium.ttf b/ionic/fonts/roboto-medium.ttf new file mode 100644 index 0000000000..034710638e Binary files /dev/null and b/ionic/fonts/roboto-medium.ttf differ diff --git a/ionic/fonts/roboto-medium.woff b/ionic/fonts/roboto-medium.woff new file mode 100644 index 0000000000..d3c82e1846 Binary files /dev/null and b/ionic/fonts/roboto-medium.woff differ diff --git a/ionic/fonts/roboto-regular.ttf b/ionic/fonts/roboto-regular.ttf new file mode 100644 index 0000000000..05037ed5e5 Binary files /dev/null and b/ionic/fonts/roboto-regular.ttf differ diff --git a/ionic/fonts/roboto-regular.woff b/ionic/fonts/roboto-regular.woff new file mode 100644 index 0000000000..5e353cf47a Binary files /dev/null and b/ionic/fonts/roboto-regular.woff differ diff --git a/ionic/fonts/roboto.scss b/ionic/fonts/roboto.scss new file mode 100644 index 0000000000..dc2ac48b1e --- /dev/null +++ b/ionic/fonts/roboto.scss @@ -0,0 +1,37 @@ +/** + Roboto Font + Google + Apache License, version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.html + */ + +$roboto-font-path: "../fonts" !default; + + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + 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(#{$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(#{$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(#{$roboto-font-path}/roboto-bold.ttf) format('truetype'), url(#{$roboto-font-path}/roboto-bold.woff) format('woff'); +} diff --git a/ionic/ionic.scss b/ionic/ionic.scss index d1596be5e5..2c72878eb0 100755 --- a/ionic/ionic.scss +++ b/ionic/ionic.scss @@ -30,5 +30,12 @@ $ionicons: true !default; } +// Roboto +$roboto: true !default; +@if ($roboto) { + @import "fonts/roboto"; +} + + // Platforms @import "platform/cordova";