Merge pull request #732 from amyspark/fix-fonts

Fix Whalebird font stack
This commit is contained in:
AkiraFukushima 2018-11-21 22:43:11 +09:00 committed by GitHub
commit d2c8c14de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions

View File

@ -74,7 +74,7 @@ html, body, #app {
background-color: #d9e1e8;
}
--specified-fonts: 'Noto Sans', 'Noto Sans CJK JP', 'Takaoゴシック', 'Hiragino Kaku Gothic ProN', 'ヒラギノ角ゴ ProN W3', Meiryo, メイリオ, Osaka, 'MS PGothic', arial, helvetica, sans-serif;
--specified-fonts: 'Noto Sans', 'Noto Sans CJK JP', 'Takaoゴシック', 'ヒラギノ角ゴ ProN W3', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'Helvetica Neue', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
font-family: var(--specified-fonts);

View File

@ -316,7 +316,6 @@ export default {
input {
border-radius: 0;
font-family: 'Lato', sans-serif;
&::placeholder {
color: #c0c4cc;

View File

@ -319,7 +319,6 @@ export default {
resize: none;
height: 120px;
transition: border-color 0.2s cubic-bezier(0.645, 0.045, 9.355, 1);
font-family: 'Lato', sans-serif;
&::placeholder {
color: #c0c4cc;

View File

@ -2,13 +2,13 @@ export default [
'Noto Sans',
'Noto Sans CJK JP',
'Takaoゴシック',
'Hiragino Kaku Gothic ProN',
'ヒラギノ角ゴ ProN W3',
'Meiryo',
'メイリオ',
'Osaka',
'MS PGothic',
'arial',
'helvetica',
'sans-serif'
'-apple-system',
'BlinkMacSystemFont',
'Segoe UI',
'Roboto',
'Helvetica Neue',
'Apple Color Emoji',
'Segoe UI Emoji',
'Segoe UI Symbol'
]