mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
a9eaa780f5
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
18 lines
541 B
SCSS
18 lines
541 B
SCSS
@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-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-style: normal;
|
|
}
|