diff options
| author | Ram Lmn <ramlmn@users.noreply.github.com> | 2017-05-07 18:53:06 +0530 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-07 15:23:06 +0200 |
| commit | f14df434352c5bfa522e868eb292a33afd36da28 (patch) | |
| tree | 36cb738fbd102f0384c0fc356aff90a3ec290879 /app/javascript/styles/fonts/roboto.scss | |
| parent | f000673599e484d8fa20a2e39048ad816ef92afe (diff) | |
Fix local fonts and change font-face values (#2877)
* Fix local fonts and change font-face values * Remove eot font files
Diffstat (limited to 'app/javascript/styles/fonts/roboto.scss')
| -rw-r--r-- | app/javascript/styles/fonts/roboto.scss | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/app/javascript/styles/fonts/roboto.scss b/app/javascript/styles/fonts/roboto.scss index 6198a580f..345d9ad50 100644 --- a/app/javascript/styles/fonts/roboto.scss +++ b/app/javascript/styles/fonts/roboto.scss @@ -1,8 +1,6 @@ @font-face { - font-family: 'Roboto'; - src: local('Roboto'); - src: url('../fonts/roboto/roboto-italic-webfont.eot'); - src: url('../fonts/roboto/roboto-italic-webfont.eot?#iefix') format('embedded-opentype'), + font-family: 'mastodon-font-sans-serif'; + src: local('Roboto'), url('../fonts/roboto/roboto-italic-webfont.woff2') format('woff2'), url('../fonts/roboto/roboto-italic-webfont.woff') format('woff'), url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'), @@ -12,11 +10,8 @@ } @font-face { - font-family: 'Roboto'; - src: local('Roboto'); - src: url('../fonts/roboto/roboto-bold-webfont.eot'); - src: local('Roboto bold'), local('roboto-bold'), - url('../fonts/roboto/roboto-bold-webfont.eot?#iefix') format('embedded-opentype'), + font-family: 'mastodon-font-sans-serif'; + src: local('Roboto'), url('../fonts/roboto/roboto-bold-webfont.woff2') format('woff2'), url('../fonts/roboto/roboto-bold-webfont.woff') format('woff'), url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'), @@ -26,10 +21,8 @@ } @font-face { - font-family: 'Roboto'; - src: local('Roboto'); - src: url('../fonts/roboto/roboto-medium-webfont.eot'); - src: url('../fonts/roboto/roboto-medium-webfont.eot?#iefix') format('embedded-opentype'), + font-family: 'mastodon-font-sans-serif'; + src: local('Roboto'), url('../fonts/roboto/roboto-medium-webfont.woff2') format('woff2'), url('../fonts/roboto/roboto-medium-webfont.woff') format('woff'), url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'), @@ -39,10 +32,8 @@ } @font-face { - font-family: 'Roboto'; - src: local('Roboto'); - src: url('../fonts/roboto/roboto-regular-webfont.eot'); - src: url('../fonts/roboto/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'), + font-family: 'mastodon-font-sans-serif'; + src: local('Roboto'), url('../fonts/roboto/roboto-regular-webfont.woff2') format('woff2'), url('../fonts/roboto/roboto-regular-webfont.woff') format('woff'), url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'), |