From 558c73a21e247a553030ed9799ce2f3b51c8d94a Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 26 May 2025 09:27:44 +0200 Subject: [PATCH] Use `@/` absolute paths instead of relative paths in CSS (#34806) --- app/javascript/styles/fonts/roboto-mono.scss | 9 +++--- app/javascript/styles/fonts/roboto.scss | 32 +++++++++---------- app/javascript/styles/mastodon/admin.scss | 4 +-- .../styles/mastodon/components.scss | 2 +- app/javascript/styles/mastodon/rich_text.scss | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/javascript/styles/fonts/roboto-mono.scss b/app/javascript/styles/fonts/roboto-mono.scss index d07aae07ab..d51cb01c91 100644 --- a/app/javascript/styles/fonts/roboto-mono.scss +++ b/app/javascript/styles/fonts/roboto-mono.scss @@ -2,11 +2,10 @@ 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') + 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; diff --git a/app/javascript/styles/fonts/roboto.scss b/app/javascript/styles/fonts/roboto.scss index 2a7b8fb90c..ea4b842b0c 100644 --- a/app/javascript/styles/fonts/roboto.scss +++ b/app/javascript/styles/fonts/roboto.scss @@ -2,10 +2,10 @@ 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') + 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; @@ -16,10 +16,10 @@ 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') + 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; @@ -30,10 +30,10 @@ 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') + 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; @@ -44,10 +44,10 @@ 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') + 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; diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 962fd2d20e..ef57fbbd71 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -1438,8 +1438,8 @@ a.sparkline { inset-inline-start: 10px; border-radius: 4px; background: - url('../images/warning-stripes.svg') repeat-y left, - url('../images/warning-stripes.svg') repeat-y right, + url('@/images/warning-stripes.svg') repeat-y left, + url('@/images/warning-stripes.svg') repeat-y right, var(--background-color); } diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index b68edcae69..40a68a79cf 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -641,7 +641,7 @@ body > [data-popper-placement] { align-items: stretch; &__border { - background: url('../images/warning-stripes.svg') repeat-y; + background: url('@/images/warning-stripes.svg') repeat-y; width: 5px; flex: 0 0 auto; diff --git a/app/javascript/styles/mastodon/rich_text.scss b/app/javascript/styles/mastodon/rich_text.scss index 52412274b6..4ac3f025fe 100644 --- a/app/javascript/styles/mastodon/rich_text.scss +++ b/app/javascript/styles/mastodon/rich_text.scss @@ -44,7 +44,7 @@ content: ''; width: 24px; height: 20px; - mask-image: url('../images/quote.svg'); + mask-image: url('@/images/quote.svg'); background-color: var(--rich-text-decorations-color); position: absolute; inset-inline-start: 0;