mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 01:08:08 +01: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.
51 lines
1.8 KiB
SCSS
51 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;
|
|
}
|