Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiger Ton
mastodon
Commits
a7037d05
Commit
a7037d05
authored
3 years ago
by
Eugen Rochko
Browse files
Options
Download
Email Patches
Plain Diff
Remove the Montserrat font
parent
8f6c67bf
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
app/javascript/fonts/montserrat/Montserrat-Medium.ttf
+0
-0
app/javascript/fonts/montserrat/Montserrat-Medium.ttf
app/javascript/fonts/montserrat/Montserrat-Regular.ttf
+0
-0
app/javascript/fonts/montserrat/Montserrat-Regular.ttf
app/javascript/fonts/montserrat/Montserrat-Regular.woff
+0
-0
app/javascript/fonts/montserrat/Montserrat-Regular.woff
app/javascript/fonts/montserrat/Montserrat-Regular.woff2
+0
-0
app/javascript/fonts/montserrat/Montserrat-Regular.woff2
app/javascript/styles/fonts/montserrat.scss
+0
-19
app/javascript/styles/fonts/montserrat.scss
app/javascript/styles/mastodon/about.scss
+0
-85
app/javascript/styles/mastodon/about.scss
app/javascript/styles/mastodon/containers.scss
+0
-2
app/javascript/styles/mastodon/containers.scss
app/javascript/styles/mastodon/dashboard.scss
+0
-1
app/javascript/styles/mastodon/dashboard.scss
app/javascript/styles/mastodon/variables.scss
+0
-1
app/javascript/styles/mastodon/variables.scss
with
0 additions
and
108 deletions
+0
-108
app/javascript/fonts/montserrat/Montserrat-Medium.ttf
deleted
100644 → 0
+
0
-
0
View file @
8f6c67bf
File deleted
This diff is collapsed.
Click to expand it.
app/javascript/fonts/montserrat/Montserrat-Regular.ttf
deleted
100644 → 0
+
0
-
0
View file @
8f6c67bf
File deleted
This diff is collapsed.
Click to expand it.
app/javascript/fonts/montserrat/Montserrat-Regular.woff
deleted
100644 → 0
+
0
-
0
View file @
8f6c67bf
File deleted
This diff is collapsed.
Click to expand it.
app/javascript/fonts/montserrat/Montserrat-Regular.woff2
deleted
100644 → 0
+
0
-
0
View file @
8f6c67bf
File deleted
This diff is collapsed.
Click to expand it.
app/javascript/styles/fonts/montserrat.scss
deleted
100644 → 0
+
0
-
19
View file @
8f6c67bf
@font-face
{
font-family
:
'mastodon-font-display'
;
src
:
local
(
'Montserrat'
)
,
url('../fonts/montserrat/Montserrat-Regular.woff2')
format
(
'woff2'
)
,
url('../fonts/montserrat/Montserrat-Regular.woff')
format
(
'woff'
)
,
url('../fonts/montserrat/Montserrat-Regular.ttf')
format
(
'truetype'
);
font-weight
:
400
;
font-display
:
swap
;
font-style
:
normal
;
}
@font-face
{
font-family
:
'mastodon-font-display'
;
src
:
local
(
'Montserrat Medium'
)
,
url('../fonts/montserrat/Montserrat-Medium.ttf')
format
(
'truetype'
);
font-weight
:
500
;
font-display
:
swap
;
font-style
:
normal
;
}
This diff is collapsed.
Click to expand it.
app/javascript/styles/mastodon/about.scss
+
0
-
85
View file @
a7037d05
...
...
@@ -71,7 +71,6 @@ $small-breakpoint: 960px;
h4
,
h5
,
h6
{
font-family
:
$font-display
,
sans-serif
;
margin-top
:
1
.275em
;
margin-bottom
:
.85em
;
font-weight
:
500
;
...
...
@@ -229,7 +228,6 @@ $small-breakpoint: 960px;
}
strong
{
font-family
:
$font-display
,
sans-serif
;
font-weight
:
500
;
font-size
:
32px
;
line-height
:
48px
;
...
...
@@ -239,81 +237,6 @@ $small-breakpoint: 960px;
text-align
:
center
;
}
}
.panel
{
position
:
absolute
;
width
:
280px
;
box-sizing
:
border-box
;
background
:
darken
(
$ui-base-color
,
8%
);
padding
:
20px
;
padding-top
:
10px
;
border-radius
:
4px
4px
0
0
;
right
:
0
;
bottom
:
-40px
;
.panel-header
{
font-family
:
$font-display
,
sans-serif
;
font-size
:
14px
;
line-height
:
24px
;
font-weight
:
500
;
color
:
$darker-text-color
;
padding-bottom
:
5px
;
margin-bottom
:
15px
;
border-bottom
:
1px
solid
lighten
(
$ui-base-color
,
4%
);
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
overflow
:
hidden
;
a
,
span
{
font-weight
:
400
;
color
:
darken
(
$darker-text-color
,
10%
);
}
a
{
text-decoration
:
none
;
}
}
}
.owner
{
text-align
:
center
;
.avatar
{
width
:
80px
;
height
:
80px
;
margin
:
0
auto
;
margin-bottom
:
15px
;
img
{
display
:
block
;
width
:
80px
;
height
:
80px
;
border-radius
:
48px
;
}
}
.name
{
font-size
:
14px
;
a
{
display
:
block
;
color
:
$primary-text-color
;
text-decoration
:
none
;
&
:hover
{
.display_name
{
text-decoration
:
underline
;
}
}
}
.username
{
display
:
block
;
color
:
$darker-text-color
;
}
}
}
}
.landing-page
{
...
...
@@ -345,7 +268,6 @@ $small-breakpoint: 960px;
}
h1
{
font-family
:
$font-display
,
sans-serif
;
font-size
:
26px
;
line-height
:
30px
;
font-weight
:
500
;
...
...
@@ -353,7 +275,6 @@ $small-breakpoint: 960px;
color
:
$secondary-text-color
;
small
{
font-family
:
$font-sans-serif
,
sans-serif
;
display
:
block
;
font-size
:
18px
;
font-weight
:
400
;
...
...
@@ -362,7 +283,6 @@ $small-breakpoint: 960px;
}
h2
{
font-family
:
$font-display
,
sans-serif
;
font-size
:
22px
;
line-height
:
26px
;
font-weight
:
500
;
...
...
@@ -371,7 +291,6 @@ $small-breakpoint: 960px;
}
h3
{
font-family
:
$font-display
,
sans-serif
;
font-size
:
18px
;
line-height
:
24px
;
font-weight
:
500
;
...
...
@@ -380,7 +299,6 @@ $small-breakpoint: 960px;
}
h4
{
font-family
:
$font-display
,
sans-serif
;
font-size
:
16px
;
line-height
:
24px
;
font-weight
:
500
;
...
...
@@ -389,7 +307,6 @@ $small-breakpoint: 960px;
}
h5
{
font-family
:
$font-display
,
sans-serif
;
font-size
:
14px
;
line-height
:
24px
;
font-weight
:
500
;
...
...
@@ -398,7 +315,6 @@ $small-breakpoint: 960px;
}
h6
{
font-family
:
$font-display
,
sans-serif
;
font-size
:
12px
;
line-height
:
24px
;
font-weight
:
500
;
...
...
@@ -754,7 +670,6 @@ $small-breakpoint: 960px;
width
:
50%
;
strong
{
font-family
:
$font-display
,
sans-serif
;
font-size
:
15px
;
font-weight
:
700
;
display
:
block
;
...
...
This diff is collapsed.
Click to expand it.
app/javascript/styles/mastodon/containers.scss
+
0
-
2
View file @
a7037d05
...
...
@@ -35,7 +35,6 @@
outline
:
0
;
padding
:
12px
16px
;
line-height
:
32px
;
font-family
:
$font-display
,
sans-serif
;
font-weight
:
500
;
font-size
:
14px
;
}
...
...
@@ -702,7 +701,6 @@
font-size
:
18px
;
margin-bottom
:
5px
;
color
:
$primary-text-color
;
font-family
:
$font-display
,
sans-serif
;
}
}
...
...
This diff is collapsed.
Click to expand it.
app/javascript/styles/mastodon/dashboard.scss
+
0
-
1
View file @
a7037d05
...
...
@@ -39,7 +39,6 @@
font-size
:
24px
;
line-height
:
21px
;
color
:
$primary-text-color
;
font-family
:
$font-display
,
sans-serif
;
margin-bottom
:
20px
;
line-height
:
30px
;
}
...
...
This diff is collapsed.
Click to expand it.
app/javascript/styles/mastodon/variables.scss
+
0
-
1
View file @
a7037d05
...
...
@@ -54,5 +54,4 @@ $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
;
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets