mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 07:09:03 +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
44 lines
1.7 KiB
SCSS
44 lines
1.7 KiB
SCSS
@font-face {
|
|
font-family: 'mastodon-font-sans-serif';
|
|
src: local('Roboto Italic'),
|
|
url('~fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
|
|
url('~fonts/roboto/roboto-italic-webfont.woff') format('woff'),
|
|
url('~fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
|
|
url('~fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') format('svg');
|
|
font-weight: normal;
|
|
font-style: italic;
|
|
}
|
|
|
|
@font-face {
|
|
font-family: 'mastodon-font-sans-serif';
|
|
src: local('Roboto Bold'),
|
|
url('~fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
|
|
url('~fonts/roboto/roboto-bold-webfont.woff') format('woff'),
|
|
url('~fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
|
|
url('~fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') format('svg');
|
|
font-weight: bold;
|
|
font-style: normal;
|
|
}
|
|
|
|
@font-face {
|
|
font-family: 'mastodon-font-sans-serif';
|
|
src: local('Roboto Medium'),
|
|
url('~fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
|
|
url('~fonts/roboto/roboto-medium-webfont.woff') format('woff'),
|
|
url('~fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
|
|
url('~fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') format('svg');
|
|
font-weight: 500;
|
|
font-style: normal;
|
|
}
|
|
|
|
@font-face {
|
|
font-family: 'mastodon-font-sans-serif';
|
|
src: local('Roboto'),
|
|
url('~fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
|
|
url('~fonts/roboto/roboto-regular-webfont.woff') format('woff'),
|
|
url('~fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
|
|
url('~fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') format('svg');
|
|
font-weight: normal;
|
|
font-style: normal;
|
|
}
|