gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Separate font-family into variable (#8763)

Browse source 
This will allow easier customization of font family instead of going
through all occurrences of 'mastodon-font-sans-serif'.
This commit is contained in:
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
Download patch file Download diff file Expand all files Collapse all files

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;