Japanese specific fonts
This commit is contained in:
parent
0872afba3d
commit
34eb6a541d
2 changed files with 21 additions and 6 deletions
|
@ -3,8 +3,17 @@
|
|||
|
||||
// Fonts
|
||||
|
||||
@mixin font-title-1 {
|
||||
@mixin font-family {
|
||||
font-family: $inter;
|
||||
&:lang(ja) {
|
||||
font-family: 'SF Pro JP', 'Hiragino Kaku Gothic Pro', 'ヒラギノ角ゴ Pro W3',
|
||||
メイリオ, Meiryo, 'MS Pゴシック', 'Helvetica Neue', Helvetica, Arial,
|
||||
sans-serif;
|
||||
}
|
||||
}
|
||||
|
||||
@mixin font-title-1 {
|
||||
@include font-family;
|
||||
font-weight: 600;
|
||||
font-size: 26px;
|
||||
line-height: 32px;
|
||||
|
@ -12,7 +21,7 @@
|
|||
}
|
||||
|
||||
@mixin font-title-2 {
|
||||
font-family: $inter;
|
||||
@include font-family;
|
||||
font-weight: 600;
|
||||
font-size: 20px;
|
||||
line-height: 26px;
|
||||
|
@ -20,7 +29,8 @@
|
|||
}
|
||||
|
||||
@mixin font-body-1 {
|
||||
font-family: $inter;
|
||||
@include font-family;
|
||||
font-weight: 600;
|
||||
font-size: 14px;
|
||||
line-height: 20px;
|
||||
letter-spacing: -0.08px;
|
||||
|
@ -40,7 +50,7 @@
|
|||
}
|
||||
|
||||
@mixin font-body-2 {
|
||||
font-family: $inter;
|
||||
@include font-family;
|
||||
font-size: 13px;
|
||||
line-height: 18px;
|
||||
letter-spacing: -0.03px;
|
||||
|
@ -60,14 +70,14 @@
|
|||
}
|
||||
|
||||
@mixin font-subtitle {
|
||||
font-family: $inter;
|
||||
@include font-family;
|
||||
font-size: 11px;
|
||||
line-height: 16px;
|
||||
letter-spacing: 0;
|
||||
}
|
||||
|
||||
@mixin font-caption {
|
||||
font-family: $inter;
|
||||
@include font-family;
|
||||
font-size: 11px;
|
||||
line-height: 14px;
|
||||
letter-spacing: 0.06px;
|
||||
|
|
|
@ -459,6 +459,11 @@ export async function startApp(): Promise<void> {
|
|||
|
||||
window.document.title = window.getTitle();
|
||||
|
||||
document.documentElement.setAttribute(
|
||||
'lang',
|
||||
window.getLocale().substring(0, 2)
|
||||
);
|
||||
|
||||
KeyChangeListener.init(window.textsecure.storage.protocol);
|
||||
window.textsecure.storage.protocol.on('removePreKey', (ourUuid: UUID) => {
|
||||
const uuidKind = window.textsecure.storage.user.getOurUuidKind(ourUuid);
|
||||
|
|
Loading…
Reference in a new issue