mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2026-02-15 07:28:59 +00:00
Inherit font stack everywhere
Co-authored-by: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user