alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate font-family into variable (#8763) 

This will allow easier customization of font family instead of going
through all occurrences of 'mastodon-font-sans-serif'.
signup-info-prompt
Minku Lee 2018-09-24 03:41:24 +09:00 committed by Eugen Rochko
parent ef11347281
commit d0d65b5a28
10 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/styles/mailer.scss
View File

@ -169,7 +169,7 @@ p {
font-family: Helvetica, Arial, sans-serif;
@media only screen {
font-family: 'mastodon-font-sans-serif', sans-serif !important;
font-family: $font-sans-serif, sans-serif !important;
}
}

46
app/javascript/styles/mastodon/about.scss
View File

@ -16,7 +16,7 @@ $small-breakpoint: 960px;
}
.rich-formatting {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
@ -31,7 +31,7 @@ $small-breakpoint: 960px;
p,
li {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
@ -62,7 +62,7 @@ $small-breakpoint: 960px;
}
h1 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 26px;
line-height: 30px;
font-weight: 500;
@ -70,7 +70,7 @@ $small-breakpoint: 960px;
color: $secondary-text-color;
small {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
display: block;
font-size: 18px;
font-weight: 400;
@ -79,7 +79,7 @@ $small-breakpoint: 960px;
}
h2 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 22px;
line-height: 26px;
font-weight: 500;
@ -88,7 +88,7 @@ $small-breakpoint: 960px;
}
h3 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 18px;
line-height: 24px;
font-weight: 500;
@ -97,7 +97,7 @@ $small-breakpoint: 960px;
}
h4 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 16px;
line-height: 24px;
font-weight: 500;
@ -106,7 +106,7 @@ $small-breakpoint: 960px;
}
h5 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 14px;
line-height: 24px;
font-weight: 500;
@ -115,7 +115,7 @@ $small-breakpoint: 960px;
}
h6 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 12px;
line-height: 24px;
font-weight: 500;
@ -180,7 +180,7 @@ $small-breakpoint: 960px;
&__section {
flex: 1 0 0;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
font-size: 16px;
line-height: 28px;
color: $primary-text-color;
@ -221,7 +221,7 @@ $small-breakpoint: 960px;
bottom: -40px;
.panel-header {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 14px;
line-height: 24px;
font-weight: 500;
@ -450,7 +450,7 @@ $small-breakpoint: 960px;
p,
li {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
@ -499,7 +499,7 @@ $small-breakpoint: 960px;
}
h1 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 26px;
line-height: 30px;
font-weight: 500;
@ -507,7 +507,7 @@ $small-breakpoint: 960px;
color: $secondary-text-color;
small {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
display: block;
font-size: 18px;
font-weight: 400;
@ -516,7 +516,7 @@ $small-breakpoint: 960px;
}
h2 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 22px;
line-height: 26px;
font-weight: 500;
@ -525,7 +525,7 @@ $small-breakpoint: 960px;
}
h3 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 18px;
line-height: 24px;
font-weight: 500;
@ -534,7 +534,7 @@ $small-breakpoint: 960px;
}
h4 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 16px;
line-height: 24px;
font-weight: 500;
@ -543,7 +543,7 @@ $small-breakpoint: 960px;
}
h5 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 14px;
line-height: 24px;
font-weight: 500;
@ -552,7 +552,7 @@ $small-breakpoint: 960px;
}
h6 {
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-size: 12px;
line-height: 24px;
font-weight: 500;
@ -619,7 +619,7 @@ $small-breakpoint: 960px;
.hero .heading {
padding-bottom: 20px;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
@ -670,7 +670,7 @@ $small-breakpoint: 960px;
text-decoration: none;
padding: 12px 16px;
line-height: 32px;
font-family: 'mastodon-font-display', sans-serif;
font-family: $font-display, sans-serif;
font-weight: 500;
font-size: 14px;
@ -743,7 +743,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: $font-sans-serif, sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
@ -1012,7 +1012,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: $font-sans-serif, sans-serif;
font-size: 13px;
line-height: 18px;
font-weight: 400;

2
app/javascript/styles/mastodon/admin.scss
View File

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

6
app/javascript/styles/mastodon/basics.scss
View File

@ -6,7 +6,7 @@
}
body {
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
background: darken($ui-base-color, 8%);
font-size: 13px;
line-height: 18px;
@ -29,8 +29,8 @@ body {
// 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;
// $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", $font-sans-serif, sans-serif;
}
&.app-body {

4
app/javascript/styles/mastodon/components.scss
View File

@ -552,7 +552,7 @@
.character-counter {
cursor: default;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-family: $font-sans-serif, sans-serif;
font-size: 14px;
font-weight: 600;
color: $lighter-text-color;
@ -5122,7 +5122,7 @@ noscript {
width: 100%;
border: none;
padding: 10px;
font-family: 'mastodon-font-monospace', monospace;
font-family: $font-monospace, monospace;
background: $ui-base-color;
color: $primary-text-color;
font-size: 14px;

4
app/javascript/styles/mastodon/containers.scss
View File

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

2
app/javascript/styles/mastodon/dashboard.scss
View File

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

8
app/javascript/styles/mastodon/forms.scss
View File

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

2
app/javascript/styles/mastodon/tables.scss
View File

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

4
app/javascript/styles/mastodon/variables.scss
View File

@ -48,3 +48,7 @@ $media-modal-media-max-width: 100%;
$media-modal-media-max-height: 80%;
$no-gap-breakpoint: 415px;
$font-sans-serif: 'mastodon-font-sans-serif' !default;
$font-display: 'mastodon-font-display' !default;
$font-monospace: 'mastodon-font-monospace' !default;