Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 04:09:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Japanese specific fonts

Browse Source
This commit is contained in:
Josh Perez
2022-03-02 13:41:16 -05:00
committed by GitHub
parent 0872afba3d
commit 34eb6a541d
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
stylesheets/_mixins.scss
View File

@@ -3,8 +3,17 @@
// Fonts // Fonts
@mixin font-title-1 { @mixin font-family {
font-family: $inter; font-family: $inter;
&:lang(ja) {
font-family: 'SF Pro JP', 'Hiragino Kaku Gothic Pro', 'ヒラギノ角ゴ Pro W3',
メイリオ, Meiryo, 'ＭＳ Ｐゴシック', 'Helvetica Neue', Helvetica, Arial,
sans-serif;
}
}
@mixin font-title-1 {
@include font-family;
font-weight: 600; font-weight: 600;
font-size: 26px; font-size: 26px;
line-height: 32px; line-height: 32px;
@@ -12,7 +21,7 @@
} }
@mixin font-title-2 { @mixin font-title-2 {
font-family: $inter; @include font-family;
font-weight: 600; font-weight: 600;
font-size: 20px; font-size: 20px;
line-height: 26px; line-height: 26px;
@@ -20,7 +29,8 @@
} }
@mixin font-body-1 { @mixin font-body-1 {
font-family: $inter; @include font-family;
font-weight: 600;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
letter-spacing: -0.08px; letter-spacing: -0.08px;
@@ -40,7 +50,7 @@
} }
@mixin font-body-2 { @mixin font-body-2 {
font-family: $inter; @include font-family;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
letter-spacing: -0.03px; letter-spacing: -0.03px;
@@ -60,14 +70,14 @@
} }
@mixin font-subtitle { @mixin font-subtitle {
font-family: $inter; @include font-family;
font-size: 11px; font-size: 11px;
line-height: 16px; line-height: 16px;
letter-spacing: 0; letter-spacing: 0;
} }
@mixin font-caption { @mixin font-caption {
font-family: $inter; @include font-family;
font-size: 11px; font-size: 11px;
line-height: 14px; line-height: 14px;
letter-spacing: 0.06px; letter-spacing: 0.06px;

5
ts/background.ts
View File

@@ -459,6 +459,11 @@ export async function startApp(): Promise<void> {
window.document.title = window.getTitle(); window.document.title = window.getTitle();
document.documentElement.setAttribute(
'lang',
window.getLocale().substring(0, 2)
);
KeyChangeListener.init(window.textsecure.storage.protocol); KeyChangeListener.init(window.textsecure.storage.protocol);
window.textsecure.storage.protocol.on('removePreKey', (ourUuid: UUID) => { window.textsecure.storage.protocol.on('removePreKey', (ourUuid: UUID) => {
const uuidKind = window.textsecure.storage.user.getOurUuidKind(ourUuid); const uuidKind = window.textsecure.storage.user.getOurUuidKind(ourUuid);