mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-11 13:10:37 +00:00
25a46d9e59
Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.
13 lines
486 B
SCSS
13 lines
486 B
SCSS
@font-face {
|
|
font-family: mastodon-font-monospace;
|
|
src:
|
|
local('Roboto Mono'),
|
|
url('~fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'),
|
|
url('~fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'),
|
|
url('~fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
|
|
url('~fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular') format('svg');
|
|
font-weight: 400;
|
|
font-display: swap;
|
|
font-style: normal;
|
|
}
|