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.
52 lines
1.8 KiB
SCSS
52 lines
1.8 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-display: swap;
|
|
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-display: swap;
|
|
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-display: swap;
|
|
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-display: swap;
|
|
font-style: normal;
|
|
}
|