Commit 6f5b9426 authored by Haelwenn's avatar Haelwenn

[MastodonFE] Use system-fonts

parent 133c3b76
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
@import 'mastodon/mixins';
@import 'mastodon/variables';
@import 'fonts/roboto';
@import 'fonts/roboto-mono';
@import 'fonts/montserrat';
@import 'mastodon/reset';
@import 'mastodon/basics';
......
@import 'mastodon/variables';
@import 'fonts/roboto';
table,
td,
......
......@@ -180,7 +180,7 @@ $small-breakpoint: 960px;
p,
li {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
......@@ -229,7 +229,7 @@ $small-breakpoint: 960px;
}
h1 {
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-size: 26px;
line-height: 30px;
font-weight: 500;
......@@ -237,7 +237,7 @@ $small-breakpoint: 960px;
color: $ui-secondary-color;
small {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
display: block;
font-size: 18px;
font-weight: 400;
......@@ -246,7 +246,7 @@ $small-breakpoint: 960px;
}
h2 {
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-size: 22px;
line-height: 26px;
font-weight: 500;
......@@ -255,7 +255,7 @@ $small-breakpoint: 960px;
}
h3 {
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-size: 18px;
line-height: 24px;
font-weight: 500;
......@@ -264,7 +264,7 @@ $small-breakpoint: 960px;
}
h4 {
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-size: 16px;
line-height: 24px;
font-weight: 500;
......@@ -273,7 +273,7 @@ $small-breakpoint: 960px;
}
h5 {
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-size: 14px;
line-height: 24px;
font-weight: 500;
......@@ -282,7 +282,7 @@ $small-breakpoint: 960px;
}
h6 {
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-size: 12px;
line-height: 24px;
font-weight: 500;
......@@ -349,7 +349,7 @@ $small-breakpoint: 960px;
.hero .heading {
padding-bottom: 20px;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
......@@ -400,7 +400,7 @@ $small-breakpoint: 960px;
text-decoration: none;
padding: 12px 16px;
line-height: 32px;
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-weight: 500;
font-size: 14px;
......@@ -473,7 +473,7 @@ $small-breakpoint: 960px;
.about-short {
background: darken($ui-base-color, 4%);
padding: 50px 0 30px;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
......@@ -503,7 +503,7 @@ $small-breakpoint: 960px;
&__section {
flex: 1 0 0;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
font-size: 16px;
line-height: 28px;
color: $primary-text-color;
......@@ -544,7 +544,7 @@ $small-breakpoint: 960px;
bottom: -40px;
.panel-header {
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-size: 14px;
line-height: 24px;
font-weight: 500;
......@@ -853,7 +853,7 @@ $small-breakpoint: 960px;
display: flex;
-webkit-overflow-scrolling: touch;
-ms-overflow-style: -ms-autohiding-scrollbar;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
font-size: 13px;
line-height: 18px;
font-weight: 400;
......@@ -964,7 +964,7 @@ $small-breakpoint: 960px;
.extended-description {
padding: 50px 0;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
......
......@@ -170,7 +170,7 @@
font-weight: 500;
font-size: 18px;
color: $primary-text-color;
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
}
}
......
......@@ -460,7 +460,7 @@
border-radius: 0 0 4px 4px;
padding: 10px;
color: $ui-primary-color;
font-family: 'mastodon-font-monospace', monospace;
font-family: monospace;
font-size: 12px;
word-wrap: break-word;
min-height: 20px;
......
body {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
background: $ui-base-color;
background-size: cover;
background-attachment: fixed;
......@@ -14,21 +14,6 @@ body {
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: transparent;
&.system-font {
// system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
// -apple-system => Safari <11 specific
// BlinkMacSystemFont => Chrome <56 on macOS specific
// Segoe UI => Windows 7/8/10
// Oxygen => KDE
// Ubuntu => Unity/Ubuntu
// Cantarell => GNOME
// Fira Sans => Firefox OS
// Droid Sans => Older Androids (<4.0)
// Helvetica Neue => Older macOS <10.11
// mastodon-font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", mastodon-font-sans-serif, sans-serif;
}
&.app-body {
position: absolute;
width: 100%;
......
......@@ -560,7 +560,7 @@
.character-counter {
cursor: default;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: sans-serif;
font-size: 14px;
font-weight: 600;
color: lighten($ui-base-color, 12%);
......@@ -4940,7 +4940,7 @@ noscript {
width: 100%;
border: none;
padding: 10px;
font-family: 'mastodon-font-monospace', monospace;
font-family: monospace;
background: $ui-base-color;
color: $ui-primary-color;
font-size: 14px;
......
......@@ -37,7 +37,7 @@
outline: 0;
padding: 12px 16px;
line-height: 32px;
font-family: 'mastodon-font-display', sans-serif;
font-family: sans-serif;
font-weight: 500;
font-size: 14px;
}
......
code {
font-family: 'mastodon-font-monospace', monospace;
font-family: monospace;
font-weight: 400;
}
......@@ -385,7 +385,7 @@ code {
width: 100%;
border: none;
padding: 10px;
font-family: 'mastodon-font-monospace', monospace;
font-family: monospace;
background: $ui-base-color;
color: $ui-primary-color;
font-size: 14px;
......
......@@ -60,7 +60,7 @@
}
samp {
font-family: 'mastodon-font-monospace', monospace;
font-family: monospace;
}
a.table-action-link {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment