diff --git a/app/javascript/fonts/montserrat/Montserrat-Medium.ttf b/app/javascript/fonts/montserrat/Montserrat-Medium.ttf deleted file mode 100644 index 88d70b89c3..0000000000 Binary files a/app/javascript/fonts/montserrat/Montserrat-Medium.ttf and /dev/null differ diff --git a/app/javascript/fonts/montserrat/Montserrat-Regular.ttf b/app/javascript/fonts/montserrat/Montserrat-Regular.ttf deleted file mode 100644 index 29ca85d4a8..0000000000 Binary files a/app/javascript/fonts/montserrat/Montserrat-Regular.ttf and /dev/null differ diff --git a/app/javascript/fonts/montserrat/Montserrat-Regular.woff b/app/javascript/fonts/montserrat/Montserrat-Regular.woff deleted file mode 100644 index af3b5ec44a..0000000000 Binary files a/app/javascript/fonts/montserrat/Montserrat-Regular.woff and /dev/null differ diff --git a/app/javascript/fonts/montserrat/Montserrat-Regular.woff2 b/app/javascript/fonts/montserrat/Montserrat-Regular.woff2 deleted file mode 100644 index 3d75434ddf..0000000000 Binary files a/app/javascript/fonts/montserrat/Montserrat-Regular.woff2 and /dev/null differ diff --git a/app/javascript/styles/fonts/montserrat.scss b/app/javascript/styles/fonts/montserrat.scss deleted file mode 100644 index ea7e04536a..0000000000 --- a/app/javascript/styles/fonts/montserrat.scss +++ /dev/null @@ -1,19 +0,0 @@ -@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; -} diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss index 9f2a1a3afa..1a7dd36d26 100644 --- a/app/javascript/styles/mastodon/about.scss +++ b/app/javascript/styles/mastodon/about.scss @@ -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; diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss index 81459f5ba5..f8b0889406 100644 --- a/app/javascript/styles/mastodon/containers.scss +++ b/app/javascript/styles/mastodon/containers.scss @@ -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; } } diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss index 0a881bc108..0f5c1c82a3 100644 --- a/app/javascript/styles/mastodon/dashboard.scss +++ b/app/javascript/styles/mastodon/dashboard.scss @@ -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; } diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss index f463419c82..614f02366d 100644 --- a/app/javascript/styles/mastodon/variables.scss +++ b/app/javascript/styles/mastodon/variables.scss @@ -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;