treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Font styles are now packagified

lolsob-rspec
kibigo! 2017-11-18 11:05:00 -08:00
parent b8fdcfd55e
commit 0c90d1ab38
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/styles/fonts/montserrat.scss
View File

@ -1,9 +1,9 @@
@font-face { @font-face {
font-family: 'mastodon-font-display'; font-family: 'mastodon-font-display';
src: local('Montserrat'), src: local('Montserrat'),
url('../fonts/montserrat/Montserrat-Regular.woff2') format('woff2'), url('~fonts/montserrat/Montserrat-Regular.woff2') format('woff2'),
url('../fonts/montserrat/Montserrat-Regular.woff') format('woff'), url('~fonts/montserrat/Montserrat-Regular.woff') format('woff'),
url('../fonts/montserrat/Montserrat-Regular.ttf') format('truetype'); url('~fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
} }
@ -11,7 +11,7 @@
@font-face { @font-face {
font-family: 'mastodon-font-display'; font-family: 'mastodon-font-display';
src: local('Montserrat'), src: local('Montserrat'),
url('../fonts/montserrat/Montserrat-Medium.ttf') format('truetype'); url('~fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
font-weight: 500; font-weight: 500;
font-style: normal; font-style: normal;
} }

8
app/javascript/styles/fonts/roboto-mono.scss
View File

@ -1,10 +1,10 @@
@font-face { @font-face {
font-family: 'mastodon-font-monospace'; font-family: 'mastodon-font-monospace';
src: local('Roboto Mono'), src: local('Roboto Mono'),
url('../fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'), url('~fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
url('../fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'), url('~fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
url('../fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'), url('~fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
url('../fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg'); url('~fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
} }

32
app/javascript/styles/fonts/roboto.scss
View File

@ -1,10 +1,10 @@
@font-face { @font-face {
font-family: 'mastodon-font-sans-serif'; font-family: 'mastodon-font-sans-serif';
src: local('Roboto'), src: local('Roboto'),
url('../fonts/roboto/roboto-italic-webfont.woff2') format('woff2'), url('~fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
url('../fonts/roboto/roboto-italic-webfont.woff') format('woff'), url('~fonts/roboto/roboto-italic-webfont.woff') format('woff'),
url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'), url('~fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg'); url('~fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg');
font-weight: normal; font-weight: normal;
font-style: italic; font-style: italic;
} }
@ -12,10 +12,10 @@
@font-face { @font-face {
font-family: 'mastodon-font-sans-serif'; font-family: 'mastodon-font-sans-serif';
src: local('Roboto'), src: local('Roboto'),
url('../fonts/roboto/roboto-bold-webfont.woff2') format('woff2'), url('~fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
url('../fonts/roboto/roboto-bold-webfont.woff') format('woff'), url('~fonts/roboto/roboto-bold-webfont.woff') format('woff'),
url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'), url('~fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg'); url('~fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg');
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
} }
@ -23,10 +23,10 @@
@font-face { @font-face {
font-family: 'mastodon-font-sans-serif'; font-family: 'mastodon-font-sans-serif';
src: local('Roboto'), src: local('Roboto'),
url('../fonts/roboto/roboto-medium-webfont.woff2') format('woff2'), url('~fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
url('../fonts/roboto/roboto-medium-webfont.woff') format('woff'), url('~fonts/roboto/roboto-medium-webfont.woff') format('woff'),
url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'), url('~fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg'); url('~fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg');
font-weight: 500; font-weight: 500;
font-style: normal; font-style: normal;
} }
@ -34,10 +34,10 @@
@font-face { @font-face {
font-family: 'mastodon-font-sans-serif'; font-family: 'mastodon-font-sans-serif';
src: local('Roboto'), src: local('Roboto'),
url('../fonts/roboto/roboto-regular-webfont.woff2') format('woff2'), url('~fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
url('../fonts/roboto/roboto-regular-webfont.woff') format('woff'), url('~fonts/roboto/roboto-regular-webfont.woff') format('woff'),
url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'), url('~fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg'); url('~fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }