mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

[Glitch] Separate font-family into variable 

Port d0d65b5a28 to glitch-soc
This commit is contained in:
Thibaut Girka 2018-10-01 13:13:58 +02:00
parent 24d05c7a50
commit 36d426cec9
8 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/javascript/flavours/glitch/styles/about.scss
View File

@ -16,7 +16,7 @@ $small-breakpoint: 960px;
} }
.rich-formatting { .rich-formatting {
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
@ -31,7 +31,7 @@ $small-breakpoint: 960px;
p, p,
li { li {
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
@ -62,7 +62,7 @@ $small-breakpoint: 960px;
} }
h1 { h1 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 26px; font-size: 26px;
line-height: 30px; line-height: 30px;
font-weight: 500; font-weight: 500;
@ -70,7 +70,7 @@ $small-breakpoint: 960px;
color: $secondary-text-color; color: $secondary-text-color;
small { small {
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
display: block; display: block;
font-size: 18px; font-size: 18px;
font-weight: 400; font-weight: 400;
@ -79,7 +79,7 @@ $small-breakpoint: 960px;
} }
h2 { h2 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 22px; font-size: 22px;
line-height: 26px; line-height: 26px;
font-weight: 500; font-weight: 500;
@ -88,7 +88,7 @@ $small-breakpoint: 960px;
} }
h3 { h3 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 18px; font-size: 18px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -97,7 +97,7 @@ $small-breakpoint: 960px;
} }
h4 { h4 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -106,7 +106,7 @@ $small-breakpoint: 960px;
} }
h5 { h5 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -115,7 +115,7 @@ $small-breakpoint: 960px;
} }
h6 { h6 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 12px; font-size: 12px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -180,7 +180,7 @@ $small-breakpoint: 960px;
&__section { &__section {
flex: 1 0 0; flex: 1 0 0;
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
font-size: 16px; font-size: 16px;
line-height: 28px; line-height: 28px;
color: $primary-text-color; color: $primary-text-color;
@ -221,7 +221,7 @@ $small-breakpoint: 960px;
bottom: -40px; bottom: -40px;
.panel-header { .panel-header {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -452,7 +452,7 @@ $small-breakpoint: 960px;
p, p,
li { li {
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
@ -501,7 +501,7 @@ $small-breakpoint: 960px;
} }
h1 { h1 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 26px; font-size: 26px;
line-height: 30px; line-height: 30px;
font-weight: 500; font-weight: 500;
@ -509,7 +509,7 @@ $small-breakpoint: 960px;
color: $secondary-text-color; color: $secondary-text-color;
small { small {
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
display: block; display: block;
font-size: 18px; font-size: 18px;
font-weight: 400; font-weight: 400;
@ -518,7 +518,7 @@ $small-breakpoint: 960px;
} }
h2 { h2 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 22px; font-size: 22px;
line-height: 26px; line-height: 26px;
font-weight: 500; font-weight: 500;
@ -527,7 +527,7 @@ $small-breakpoint: 960px;
} }
h3 { h3 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 18px; font-size: 18px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -536,7 +536,7 @@ $small-breakpoint: 960px;
} }
h4 { h4 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -545,7 +545,7 @@ $small-breakpoint: 960px;
} }
h5 { h5 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -554,7 +554,7 @@ $small-breakpoint: 960px;
} }
h6 { h6 {
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-size: 12px; font-size: 12px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
@ -621,7 +621,7 @@ $small-breakpoint: 960px;
.hero .heading { .hero .heading {
padding-bottom: 20px; padding-bottom: 20px;
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
@ -672,7 +672,7 @@ $small-breakpoint: 960px;
text-decoration: none; text-decoration: none;
padding: 12px 16px; padding: 12px 16px;
line-height: 32px; line-height: 32px;
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
@ -745,7 +745,7 @@ $small-breakpoint: 960px;
.about-short { .about-short {
background: darken($ui-base-color, 4%); background: darken($ui-base-color, 4%);
padding: 50px 0 30px; padding: 50px 0 30px;
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
@ -1015,7 +1015,7 @@ $small-breakpoint: 960px;
display: flex; display: flex;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
-ms-overflow-style: -ms-autohiding-scrollbar; -ms-overflow-style: -ms-autohiding-scrollbar;
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
font-weight: 400; font-weight: 400;

2
app/javascript/flavours/glitch/styles/admin.scss
View File

@ -443,7 +443,7 @@ $no-columns-breakpoint: 600px;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
padding: 10px; padding: 10px;
color: $darker-text-color; color: $darker-text-color;
font-family: 'mastodon-font-monospace', monospace; font-family: $font-monospace, monospace;
font-size: 12px; font-size: 12px;
word-wrap: break-word; word-wrap: break-word;
min-height: 20px; min-height: 20px;

6
app/javascript/flavours/glitch/styles/basics.scss
View File

@ -6,7 +6,7 @@
} }
body { body {
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: $font-sans-serif, sans-serif;
background: darken($ui-base-color, 8%); background: darken($ui-base-color, 8%);
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
@ -29,8 +29,8 @@ body {
// Fira Sans => Firefox OS // Fira Sans => Firefox OS
// Droid Sans => Older Androids (<4.0) // Droid Sans => Older Androids (<4.0)
// Helvetica Neue => Older macOS <10.11 // Helvetica Neue => Older macOS <10.11
// mastodon-font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0) // $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; font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", $font-sans-serif, sans-serif;
} }
&.app-body { &.app-body {

4
app/javascript/flavours/glitch/styles/containers.scss
View File

@ -37,7 +37,7 @@
outline: 0; outline: 0;
padding: 12px 16px; padding: 12px 16px;
line-height: 32px; line-height: 32px;
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
} }
@ -633,7 +633,7 @@
font-size: 18px; font-size: 18px;
margin-bottom: 5px; margin-bottom: 5px;
color: $primary-text-color; color: $primary-text-color;
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
} }
} }

2
app/javascript/flavours/glitch/styles/dashboard.scss
View File

@ -35,7 +35,7 @@
font-weight: 500; font-weight: 500;
font-size: 24px; font-size: 24px;
color: $primary-text-color; color: $primary-text-color;
font-family: 'mastodon-font-display', sans-serif; font-family: $font-display, sans-serif;
margin-bottom: 20px; margin-bottom: 20px;
} }

8
app/javascript/flavours/glitch/styles/forms.scss
View File

@ -1,7 +1,7 @@
$no-columns-breakpoint: 600px; $no-columns-breakpoint: 600px;
code { code {
font-family: 'mastodon-font-monospace', monospace; font-family: $font-monospace, monospace;
font-weight: 400; font-weight: 400;
} }
@ -474,7 +474,7 @@ code {
width: 100%; width: 100%;
border: none; border: none;
padding: 10px; padding: 10px;
font-family: 'mastodon-font-monospace', monospace; font-family: $font-monospace, monospace;
background: $ui-base-color; background: $ui-base-color;
color: $primary-text-color; color: $primary-text-color;
font-size: 14px; font-size: 14px;
@ -718,7 +718,7 @@ code {
.form_admin_settings_custom_css, .form_admin_settings_custom_css,
.form_admin_settings_closed_registrations_message { .form_admin_settings_closed_registrations_message {
textarea { textarea {
font-family: 'mastodon-font-monospace', monospace; font-family: $font-monospace, monospace;
} }
} }
@ -742,7 +742,7 @@ code {
border: 0; border: 0;
padding: 10px; padding: 10px;
font-size: 14px; font-size: 14px;
font-family: 'mastodon-font-monospace', monospace; font-family: $font-monospace, monospace;
} }
button { button {

2
app/javascript/flavours/glitch/styles/tables.scss
View File

@ -90,7 +90,7 @@
} }
samp { samp {
font-family: 'mastodon-font-monospace', monospace; font-family: $font-monospace, monospace;
} }
button.table-action-link { button.table-action-link {

4
app/javascript/flavours/glitch/styles/variables.scss
View File

@ -51,6 +51,10 @@ $media-modal-media-max-height: 80%;
$no-gap-breakpoint: 415px; $no-gap-breakpoint: 415px;
$font-sans-serif: 'mastodon-font-sans-serif' !default;
$font-display: 'mastodon-font-display' !default;
$font-monospace: 'mastodon-font-monospace' !default;
// Avatar border size (8% default, 100% for rounded avatars) // Avatar border size (8% default, 100% for rounded avatars)
$ui-avatar-border-size: 8%; $ui-avatar-border-size: 8%;