mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Inherit font stack everywhere

Browse source
This commit is contained in:
Jamie Kyle 2024-02-14 06:37:44 -08:00 committed by GitHub
parent 07a435a1bc
commit 3032adb1c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sticker-creator/src/fonts.scss
View file

@ -14,7 +14,6 @@ $inter: Inter, 'Source Sans Pro', 'Source Han Sans', -apple-system, system-ui,
}
@mixin font-title-1 {
@include font-family;
font-weight: 600;
font-size: 26px;
line-height: 32px;
@ -22,7 +21,6 @@ $inter: Inter, 'Source Sans Pro', 'Source Han Sans', -apple-system, system-ui,
}
@mixin font-title-2 {
@include font-family;
font-weight: 600;
font-size: 20px;
line-height: 26px;
@ -30,7 +28,6 @@ $inter: Inter, 'Source Sans Pro', 'Source Han Sans', -apple-system, system-ui,
}
@mixin font-body-1 {
@include font-family;
font-size: 14px;
line-height: 20px;
letter-spacing: -0.08px;
@ -50,7 +47,6 @@ $inter: Inter, 'Source Sans Pro', 'Source Han Sans', -apple-system, system-ui,
}
@mixin font-body-2 {
@include font-family;
font-size: 13px;
line-height: 18px;
letter-spacing: -0.03px;
@ -74,14 +70,12 @@ $inter: Inter, 'Source Sans Pro', 'Source Han Sans', -apple-system, system-ui,
}
@mixin font-subtitle {
@include font-family;
font-size: 12px;
line-height: 16px;
letter-spacing: 0;
}
@mixin font-caption {
@include font-family;
font-size: 11px;
line-height: 14px;
letter-spacing: 0.06px;

9
sticker-creator/src/index.scss
View file

@ -24,6 +24,7 @@ body {
width: 100%;
margin: 0;
@include font-family;
@include font-body-1;
@include light-theme() {
@ -36,6 +37,14 @@ body {
}
}
input,
button,
select,
optgroup,
textarea {
font-family: inherit;
}
button {
cursor: pointer;
font-size: inherit;

9
stylesheets/_global.scss
View file

@ -18,6 +18,7 @@ body {
color: $color-gray-90;
@include font-family;
@include font-body-1;
&.light-theme {
@ -34,6 +35,14 @@ body {
}
}
input,
button,
select,
optgroup,
textarea {
font-family: inherit;
}
[contenteditable] {
-webkit-user-modify: read-write-plaintext-only;
}

7
stylesheets/_mixins.scss
View file

@ -33,7 +33,6 @@
}
@mixin font-title-1 {
@include font-family;
font-weight: 600;
font-size: 26px;
line-height: 32px;
@ -41,7 +40,6 @@
}
@mixin font-title-2 {
@include font-family;
font-weight: 600;
font-size: 20px;
line-height: 26px;
@ -49,7 +47,6 @@
}
@mixin font-title-medium {
@include font-family;
font-weight: 600;
font-size: 18px;
line-height: 25px;
@ -57,7 +54,6 @@
}
@mixin font-body-1 {
@include font-family;
font-size: 14px;
line-height: 20px;
letter-spacing: -0.08px;
@ -77,7 +73,6 @@
}
@mixin font-body-2 {
@include font-family;
font-size: 13px;
line-height: 18px;
letter-spacing: -0.03px;
@ -101,7 +96,6 @@
}
@mixin font-subtitle {
@include font-family;
font-size: 12px;
line-height: 16px;
letter-spacing: 0;
@ -112,7 +106,6 @@
}
@mixin font-caption {
@include font-family;
font-size: 11px;
line-height: 14px;
letter-spacing: 0.06px;

2
stylesheets/components/ConversationDetails.scss
View file

@ -300,6 +300,7 @@
padding-inline: 24px;
user-select: none;
width: 100%;
@include font-body-2;
&--button {
color: inherit;
@ -350,7 +351,6 @@
}
&__info {
@include font-body-2;
margin-top: 4px;
@include light-theme {

2
stylesheets/components/Preferences.scss
View file

@ -315,6 +315,7 @@
.Preferences__LanguageButton {
@include button-reset;
@include localized-fonts;
}
.Preferences__LanguageModal {
@ -401,6 +402,7 @@
.Preferences__LanguageModal__Item__Matching {
display: block;
@include localized-fonts;
@include font-body-2;
@include light-theme {
color: $color-gray-60;