Update Inter to 3.19
This commit is contained in:
parent
206f65e67d
commit
2b5f0ffc10
|
@ -3469,7 +3469,9 @@ Signal Desktop makes use of the following open source projects.
|
||||||
|
|
||||||
## typeface-inter
|
## typeface-inter
|
||||||
|
|
||||||
Copyright (c) 2016-2018 The Inter Project Authors (me@rsms.me)
|
Copyright (c) 2016-2020 The Inter Project Authors.
|
||||||
|
"Inter" is trademark of Rasmus Andersson.
|
||||||
|
https://github.com/rsms/inter
|
||||||
|
|
||||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
This license is copied below, and is also available with a FAQ at:
|
This license is copied below, and is also available with a FAQ at:
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -174,7 +174,7 @@
|
||||||
"sharp": "0.30.5",
|
"sharp": "0.30.5",
|
||||||
"split2": "4.0.0",
|
"split2": "4.0.0",
|
||||||
"testcheck": "1.0.0-rc.2",
|
"testcheck": "1.0.0-rc.2",
|
||||||
"typeface-inter": "3.10.0",
|
"typeface-inter": "3.18.1",
|
||||||
"underscore": "1.12.1",
|
"underscore": "1.12.1",
|
||||||
"uuid": "3.3.2",
|
"uuid": "3.3.2",
|
||||||
"websocket": "1.0.28",
|
"websocket": "1.0.28",
|
||||||
|
|
|
@ -3,34 +3,39 @@
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Inter';
|
font-family: 'Inter';
|
||||||
src: url('../fonts/inter-v3.10/Inter-BoldItalic.woff2');
|
src: url('../fonts/inter-v3.19/Inter-BoldItalic.woff2');
|
||||||
font-weight: bolder;
|
font-weight: bolder;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Inter';
|
font-family: 'Inter';
|
||||||
src: url('../fonts/inter-v3.10/Inter-Bold.woff2');
|
src: url('../fonts/inter-v3.19/Inter-Bold.woff2');
|
||||||
font-weight: bolder;
|
font-weight: bolder;
|
||||||
}
|
}
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Inter';
|
font-family: 'Inter';
|
||||||
src: url('../fonts/inter-v3.10/Inter-SemiBoldItalic.woff2');
|
src: url('../fonts/inter-v3.19/Inter-SemiBoldItalic.woff2');
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Inter';
|
font-family: 'Inter';
|
||||||
src: url('../fonts/inter-v3.10/Inter-Italic.woff2');
|
src: url('../fonts/inter-v3.19/Inter-Italic.woff2');
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Inter';
|
font-family: 'Inter';
|
||||||
src: url('../fonts/inter-v3.10/Inter-SemiBold.woff2');
|
src: url('../fonts/inter-v3.19/Inter-SemiBold.woff2');
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Inter';
|
||||||
|
src: url('../fonts/inter-v3.19/Inter-Medium.woff2');
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: 'Inter';
|
font-family: 'Inter';
|
||||||
src: url('../fonts/inter-v3.10/Inter-Regular.woff2');
|
src: url('../fonts/inter-v3.19/Inter-Regular.woff2');
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,10 @@
|
||||||
@include font-body-2;
|
@include font-body-2;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
|
@mixin font-body-2-medium {
|
||||||
|
@include font-body-2;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
@mixin font-body-2-italic {
|
@mixin font-body-2-italic {
|
||||||
@include font-body-2;
|
@include font-body-2;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
|
|
@ -56,6 +56,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
&__author {
|
&__author {
|
||||||
@include font-body-2-bold;
|
@include font-body-2-medium;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4891,12 +4891,13 @@ export class ConversationModel extends window.Backbone
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getTitle(): string {
|
getTitle({ isShort = false }: { isShort?: boolean } = {}): string {
|
||||||
if (isDirectConversation(this.attributes)) {
|
if (isDirectConversation(this.attributes)) {
|
||||||
const username = this.get('username');
|
const username = this.get('username');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
this.get('name') ||
|
this.get('name') ||
|
||||||
|
(isShort ? this.get('profileName') : undefined) ||
|
||||||
this.getProfileName() ||
|
this.getProfileName() ||
|
||||||
this.getNumber() ||
|
this.getNumber() ||
|
||||||
(username && window.i18n('at-username', { username })) ||
|
(username && window.i18n('at-username', { username })) ||
|
||||||
|
|
|
@ -841,7 +841,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
||||||
|
|
||||||
// if it's not selfAuthor and there's no incoming contact,
|
// if it's not selfAuthor and there's no incoming contact,
|
||||||
// it might be a group notification, so we return undefined
|
// it might be a group notification, so we return undefined
|
||||||
return selfAuthor ?? this.getIncomingContact()?.getTitle();
|
return selfAuthor ?? this.getIncomingContact()?.getTitle({ isShort: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
getNotificationText(): string {
|
getNotificationText(): string {
|
||||||
|
|
|
@ -40,7 +40,7 @@ async function drawImage(
|
||||||
async function getFont(text: string): Promise<string> {
|
async function getFont(text: string): Promise<string> {
|
||||||
const font = new window.FontFace(
|
const font = new window.FontFace(
|
||||||
'Inter',
|
'Inter',
|
||||||
'url("fonts/inter-v3.10/Inter-Regular.woff2")'
|
'url("fonts/inter-v3.19/Inter-Regular.woff2")'
|
||||||
);
|
);
|
||||||
await font.load();
|
await font.load();
|
||||||
|
|
||||||
|
|
|
@ -16205,10 +16205,10 @@ typedarray@^0.0.6:
|
||||||
version "0.0.6"
|
version "0.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
|
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
|
||||||
|
|
||||||
typeface-inter@3.10.0:
|
typeface-inter@3.18.1:
|
||||||
version "3.10.0"
|
version "3.18.1"
|
||||||
resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.10.0.tgz#04a55d62e2dc3f60db3afab5d8a547e067692bc6"
|
resolved "https://registry.yarnpkg.com/typeface-inter/-/typeface-inter-3.18.1.tgz#24cccdf29923f318589783997be20a662cd3ab9c"
|
||||||
integrity sha512-WuXE+TaJLB8pdMuvIVY3LfT5UQqndR8+Js0xfhNpdXlsEx0Abwd1bzg4w4YWl2eoOmmLYrRpx6UJJ7a7/q6wZQ==
|
integrity sha512-c+TBanYFCvmg3j5vPk+zxK4ocMZbPxMEmjnwG7rPQoV87xvQ6b07VbAOC0Va0XBbbZCGw6cWNeFuLeg1YQru3Q==
|
||||||
|
|
||||||
typescript@4.6.2:
|
typescript@4.6.2:
|
||||||
version "4.6.2"
|
version "4.6.2"
|
||||||
|
|
Loading…
Reference in New Issue