hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix local fonts and change font-face values (#2877) 

* Fix local fonts and change font-face values

* Remove eot font files
signup-info-prompt
Ram Lmn 2017-05-07 18:53:06 +05:30 committed by Eugen Rochko
parent f000673599
commit f14df43435
14 changed files with 29 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/javascript/fonts/montserrat/Montserrat-Regular.eot
View File

Binary file not shown.

BIN
app/javascript/fonts/roboto-mono/robotomono-regular-webfont.eot
View File

Binary file not shown.

BIN
app/javascript/fonts/roboto/roboto-bold-webfont.eot
View File

Binary file not shown.

BIN
app/javascript/fonts/roboto/roboto-italic-webfont.eot
View File

Binary file not shown.

BIN
app/javascript/fonts/roboto/roboto-medium-webfont.eot
View File

Binary file not shown.

BIN
app/javascript/fonts/roboto/roboto-regular-webfont.eot
View File

Binary file not shown.

12
app/javascript/styles/about.scss
View File

@ -12,7 +12,7 @@
} }
h1 { h1 {
font: 46px/52px 'Roboto', sans-serif; font: 46px/52px 'mastodon-font-sans-serif', sans-serif;
font-weight: 600; font-weight: 600;
margin-bottom: 20px; margin-bottom: 20px;
color: $color4; color: $color4;
@ -27,7 +27,7 @@
} }
h2 { h2 {
font-family: 'Montserrat', sans-serif; font-family: 'mastodon-font-display', sans-serif;
font-size: 24px; font-size: 24px;
line-height: 28px; line-height: 28px;
font-weight: 400; font-weight: 400;
@ -36,7 +36,7 @@
} }
h3 { h3 {
font-family: 'Montserrat', sans-serif; font-family: 'mastodon-font-display', sans-serif;
font-size: 20px; font-size: 20px;
line-height: 28px; line-height: 28px;
font-weight: 400; font-weight: 400;
@ -62,7 +62,7 @@
} }
p, li { p, li {
font: 16px/28px 'Montserrat', sans-serif; font: 16px/28px 'mastodon-font-sans-serif', sans-serif;
font-weight: 400; font-weight: 400;
margin-bottom: 12px; margin-bottom: 12px;
@ -78,7 +78,7 @@
margin: 0 2px; margin: 0 2px;
background: $color3; background: $color3;
color: $color1; color: $color1;
font: 16px/16px 'Montserrat', sans-serif; font: 16px/16px 'mastodon-font-sans-serif', sans-serif;
font-weight: 300; font-weight: 300;
} }
@ -132,7 +132,7 @@
flex: 1 0 0; flex: 1 0 0;
padding: 14px; padding: 14px;
text-align: right; text-align: right;
font: 16px/28px 'Montserrat', sans-serif; font: 16px/28px 'mastodon-font-sans-serif', sans-serif;
span, strong { span, strong {
display: block; display: block;

2
app/javascript/styles/basics.scss
View File

@ -1,5 +1,5 @@
body { body {
font-family: 'Roboto', sans-serif; font-family: 'mastodon-font-sans-serif', sans-serif;
background: $color1 url('../images/background-photo.jpg'); background: $color1 url('../images/background-photo.jpg');
background-size: cover; background-size: cover;
background-attachment: fixed; background-attachment: fixed;

2
app/javascript/styles/containers.scss
View File

@ -65,7 +65,7 @@
display: block; display: block;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
font-family: 'Roboto Mono', monospace; font-family: 'mastodon-font-monospace', monospace;
} }
} }
} }

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

@ -1,11 +1,9 @@
@font-face { @font-face {
font-family: 'Montserrat'; font-family: 'mastodon-font-display';
src: local('Montserrat'); src: local('Montserrat'),
src: url('../fonts/montserrat/Montserrat-Regular.eot'); url('../fonts/montserrat/Montserrat-Regular.woff2') format('woff2'),
src: url('../fonts/montserrat/Montserrat-Regular.eot?#iefix') format('embedded-opentype'), url('../fonts/montserrat/Montserrat-Regular.woff') format('woff'),
url('../fonts/montserrat/Montserrat-Regular.woff2') format('woff2'), url('../fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
url('../fonts/montserrat/Montserrat-Regular.woff') format('woff'),
url('../fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
} }

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

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

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

@ -1,8 +1,6 @@
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'mastodon-font-sans-serif';
src: local('Roboto'); src: local('Roboto'),
src: url('../fonts/roboto/roboto-italic-webfont.eot');
src: url('../fonts/roboto/roboto-italic-webfont.eot?#iefix') format('embedded-opentype'),
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'),
@ -12,11 +10,8 @@
} }
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'mastodon-font-sans-serif';
src: local('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'),
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'),
@ -26,10 +21,8 @@
} }
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'mastodon-font-sans-serif';
src: local('Roboto'); src: local('Roboto'),
src: url('../fonts/roboto/roboto-medium-webfont.eot');
src: url('../fonts/roboto/roboto-medium-webfont.eot?#iefix') format('embedded-opentype'),
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'),
@ -39,10 +32,8 @@
} }
@font-face { @font-face {
font-family: 'Roboto'; font-family: 'mastodon-font-sans-serif';
src: local('Roboto'); src: local('Roboto'),
src: url('../fonts/roboto/roboto-regular-webfont.eot');
src: url('../fonts/roboto/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'),
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'),

2
app/javascript/styles/forms.scss
View File

@ -1,5 +1,5 @@
code { code {
font-family: 'Roboto Mono', monospace; font-family: 'mastodon-font-monospace', monospace;
font-weight: 400; font-weight: 400;
} }

2
app/javascript/styles/tables.scss
View File

@ -43,7 +43,7 @@
} }
samp { samp {
font-family: 'Roboto Mono', monospace; font-family: 'mastodon-font-monospace', monospace;
} }
a.table-action-link { a.table-action-link {