mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 03:43:08 +00:00
ce84d163cc
Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes.
14 lines
494 B
SCSS
14 lines
494 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;
|
|
}
|