gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Use @/ absolute paths instead of relative paths in CSS (#34806)

Browse source
This commit is contained in:
Claire 2025-05-26 09:27:44 +02:00 • committed by GitHub
parent e0f15a6875
commit 558c73a21e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/styles/fonts/roboto-mono.scss
View file

@ -2,11 +2,10 @@
font-family: mastodon-font-monospace; font-family: mastodon-font-monospace;
src: src:
local('Roboto Mono'), local('Roboto Mono'),
url('../fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'), 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.woff') format('woff'),
url('../fonts/roboto-mono/robotomono-regular-webfont.ttf') url('@/fonts/roboto-mono/robotomono-regular-webfont.ttf') format('truetype'),
format('truetype'), url('@/fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular')
url('../fonts/roboto-mono/robotomono-regular-webfont.svg#roboto_monoregular')
format('svg'); format('svg');
font-weight: 400; font-weight: 400;
font-display: swap; font-display: swap;

32
app/javascript/styles/fonts/roboto.scss
View file

@ -2,10 +2,10 @@
font-family: mastodon-font-sans-serif; font-family: mastodon-font-sans-serif;
src: src:
local('Roboto Italic'), local('Roboto Italic'),
url('../fonts/roboto/roboto-italic-webfont.woff2') format('woff2'), url('@/fonts/roboto/roboto-italic-webfont.woff2') format('woff2'),
url('../fonts/roboto/roboto-italic-webfont.woff') format('woff'), url('@/fonts/roboto/roboto-italic-webfont.woff') format('woff'),
url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'), url('@/fonts/roboto/roboto-italic-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont') url('@/fonts/roboto/roboto-italic-webfont.svg#roboto-italic-webfont')
format('svg'); format('svg');
font-weight: normal; font-weight: normal;
font-display: swap; font-display: swap;
@ -16,10 +16,10 @@
font-family: mastodon-font-sans-serif; font-family: mastodon-font-sans-serif;
src: src:
local('Roboto Bold'), local('Roboto Bold'),
url('../fonts/roboto/roboto-bold-webfont.woff2') format('woff2'), url('@/fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
url('../fonts/roboto/roboto-bold-webfont.woff') format('woff'), url('@/fonts/roboto/roboto-bold-webfont.woff') format('woff'),
url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'), url('@/fonts/roboto/roboto-bold-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont') url('@/fonts/roboto/roboto-bold-webfont.svg#roboto-bold-webfont')
format('svg'); format('svg');
font-weight: bold; font-weight: bold;
font-display: swap; font-display: swap;
@ -30,10 +30,10 @@
font-family: mastodon-font-sans-serif; font-family: mastodon-font-sans-serif;
src: src:
local('Roboto Medium'), local('Roboto Medium'),
url('../fonts/roboto/roboto-medium-webfont.woff2') format('woff2'), url('@/fonts/roboto/roboto-medium-webfont.woff2') format('woff2'),
url('../fonts/roboto/roboto-medium-webfont.woff') format('woff'), url('@/fonts/roboto/roboto-medium-webfont.woff') format('woff'),
url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'), url('@/fonts/roboto/roboto-medium-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont') url('@/fonts/roboto/roboto-medium-webfont.svg#roboto-medium-webfont')
format('svg'); format('svg');
font-weight: 500; font-weight: 500;
font-display: swap; font-display: swap;
@ -44,10 +44,10 @@
font-family: mastodon-font-sans-serif; font-family: mastodon-font-sans-serif;
src: src:
local('Roboto'), local('Roboto'),
url('../fonts/roboto/roboto-regular-webfont.woff2') format('woff2'), url('@/fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
url('../fonts/roboto/roboto-regular-webfont.woff') format('woff'), url('@/fonts/roboto/roboto-regular-webfont.woff') format('woff'),
url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'), url('@/fonts/roboto/roboto-regular-webfont.ttf') format('truetype'),
url('../fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont') url('@/fonts/roboto/roboto-regular-webfont.svg#roboto-regular-webfont')
format('svg'); format('svg');
font-weight: normal; font-weight: normal;
font-display: swap; font-display: swap;

4
app/javascript/styles/mastodon/admin.scss
View file

@ -1438,8 +1438,8 @@ a.sparkline {
inset-inline-start: 10px; inset-inline-start: 10px;
border-radius: 4px; border-radius: 4px;
background: background:
url('../images/warning-stripes.svg') repeat-y left, url('@/images/warning-stripes.svg') repeat-y left,
url('../images/warning-stripes.svg') repeat-y right, url('@/images/warning-stripes.svg') repeat-y right,
var(--background-color); var(--background-color);
} }

2
app/javascript/styles/mastodon/components.scss
View file

@ -641,7 +641,7 @@ body > [data-popper-placement] {
align-items: stretch; align-items: stretch;
&__border { &__border {
background: url('../images/warning-stripes.svg') repeat-y; background: url('@/images/warning-stripes.svg') repeat-y;
width: 5px; width: 5px;
flex: 0 0 auto; flex: 0 0 auto;

2
app/javascript/styles/mastodon/rich_text.scss
View file

@ -44,7 +44,7 @@
content: ''; content: '';
width: 24px; width: 24px;
height: 20px; height: 20px;
mask-image: url('../images/quote.svg'); mask-image: url('@/images/quote.svg');
background-color: var(--rich-text-decorations-color); background-color: var(--rich-text-decorations-color);
position: absolute; position: absolute;
inset-inline-start: 0; inset-inline-start: 0;