Rid the world of $(res)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2026-02-04 14:40:59 +00:00
parent 9b55c1cdba
commit 41444bce9b
No known key found for this signature in database
GPG Key ID: A2B008A5F49F5D0D
21 changed files with 17 additions and 32 deletions

View File

@ -55,7 +55,7 @@ Please see LICENSE files in the repository root for full details.
.mx_RoomView_messagePanelSearchSpinner {
flex: 1;
background-image: url("$(res)/img/typing-indicator-2x.gif");
background-image: url("/res/img/typing-indicator-2x.gif");
background-position: center 367px;
background-size: 25px;
background-repeat: no-repeat;

View File

@ -30,7 +30,7 @@ Please see LICENSE files in the repository root for full details.
inset: -9px;
mask:
/* mask to dither resulting combined gradient */
url("$(res)/img/noise.png"),
url("/res/img/noise.png"),
/* gradient to apply different amounts of dithering to different parts of the gradient */
linear-gradient(
to bottom,

View File

@ -13,7 +13,7 @@ Please see LICENSE files in the repository root for full details.
line-height: 0;
&.mx_DecoratedRoomAvatar_cutout .mx_BaseAvatar {
mask-image: url("$(res)/img/element-icons/roomlist/decorated-avatar-mask.svg");
mask-image: url("/res/img/element-icons/roomlist/decorated-avatar-mask.svg");
mask-position: center;
mask-size: contain;
mask-repeat: no-repeat;

View File

@ -21,11 +21,11 @@
}
.mx_RoomAvatarView_RoomAvatar_icon {
mask-image: url("$(res)/img/element-icons/roomlist/room-avatar-view-icon-mask.svg");
mask-image: url("/res/img/element-icons/roomlist/room-avatar-view-icon-mask.svg");
}
.mx_RoomAvatarView_RoomAvatar_presence {
mask-image: url("$(res)/img/element-icons/roomlist/room-avatar-view-presence-mask.svg");
mask-image: url("/res/img/element-icons/roomlist/room-avatar-view-presence-mask.svg");
}
.mx_RoomAvatarView_icon {

View File

@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
.mx_AnalyticsLearnMoreDialog {
max-width: 500px;
.mx_AnalyticsLearnMore_image_holder {
background-image: url("$(res)/img/element-shiny.svg");
background-image: url("/res/img/element-shiny.svg");
background-repeat: no-repeat;
background-position: center top;
height: 112px;

View File

@ -19,6 +19,6 @@
position: absolute;
mask-repeat: repeat-y;
mask-size: auto 96px;
mask-image: url("$(res)/img/element-icons/roomlist/room-list-item-skeleton.svg");
mask-image: url("/res/img/element-icons/roomlist/room-list-item-skeleton.svg");
}
}

View File

@ -379,7 +379,7 @@ Please see LICENSE files in the repository root for full details.
position: absolute;
mask-repeat: repeat-y;
mask-size: auto 48px;
mask-image: url("$(res)/img/element-icons/roomlist/skeleton-ui.svg");
mask-image: url("/res/img/element-icons/roomlist/skeleton-ui.svg");
}
}

View File

@ -49,7 +49,7 @@ Please see LICENSE files in the repository root for full details.
}
.mx_WhoIsTypingTile_label > span {
background-image: url("$(res)/img/typing-indicator-2x.gif");
background-image: url("/res/img/typing-indicator-2x.gif");
background-size: 25px;
background-position: left bottom;
background-repeat: no-repeat;

View File

@ -110,7 +110,7 @@ Please see LICENSE files in the repository root for full details.
content: "";
width: 40px;
height: 40px;
background-image: url("$(res)/img/voip/paused.svg");
background-image: url("/res/img/voip/paused.svg");
background-position: center;
background-size: cover;
}

View File

@ -1,5 +1,4 @@
@import "../../../../res/css/_font-sizes.pcss";
@import "../../legacy-light/css/_paths.pcss";
@import "../../legacy-light/css/_fonts.pcss";
@import "../../legacy-light/css/_legacy-light.pcss";
@import "../../legacy-dark/css/_legacy-dark.pcss";

View File

@ -1,5 +1,4 @@
@import "../../../../res/css/_font-sizes.pcss";
@import "../../light/css/_paths.pcss";
@import "../../light/css/_fonts.pcss";
@import "../../light/css/_light.pcss";
@import "_dark.pcss";

View File

@ -1,5 +1,4 @@
@import "../../../../res/css/_font-sizes.pcss";
@import "../../legacy-light/css/_paths.pcss";
@import "../../legacy-light/css/_fonts.pcss";
@import "../../legacy-light/css/_legacy-light.pcss";
@import "_legacy-dark.pcss";

View File

@ -23,17 +23,17 @@
font-family: "Nunito";
font-style: normal;
font-weight: 400;
src: url("$(res)/fonts/Nunito/Nunito-Regular.ttf") format("truetype");
src: url("/res/fonts/Nunito/Nunito-Regular.ttf") format("truetype");
}
@font-face {
font-family: "Nunito";
font-style: normal;
font-weight: 600;
src: url("$(res)/fonts/Nunito/Nunito-SemiBold.ttf") format("truetype");
src: url("/res/fonts/Nunito/Nunito-SemiBold.ttf") format("truetype");
}
@font-face {
font-family: "Nunito";
font-style: normal;
font-weight: 700;
src: url("$(res)/fonts/Nunito/Nunito-Bold.ttf") format("truetype");
src: url("/res/fonts/Nunito/Nunito-Bold.ttf") format("truetype");
}

View File

@ -1,3 +0,0 @@
/* Path from root SCSS file (such as `light.pcss`) to `res` dir in the source tree */
/* This value is overridden by external themes in `element-web`. */
$res: ../../..;

View File

@ -1,5 +1,4 @@
@import "../../../../res/css/_font-sizes.pcss";
@import "_paths.pcss";
@import "_fonts.pcss";
@import "_legacy-light.pcss";
@import "../../../../res/css/_components.pcss";

View File

@ -1,5 +1,4 @@
@import "../../../../res/css/_font-sizes.pcss";
@import "../../legacy-light/css/_paths.pcss";
@import "../../legacy-light/css/_fonts.pcss";
@import "../../legacy-light/css/_legacy-light.pcss";
@import "_custom.pcss";

View File

@ -1,5 +1,4 @@
@import "../../../../res/css/_font-sizes.pcss";
@import "../../light/css/_paths.pcss";
@import "../../light/css/_fonts.pcss";
@import "../../light/css/_light.pcss";
@import "_light-high-contrast.pcss";

View File

@ -5,16 +5,16 @@
@font-face {
font-family: "Twemoji";
font-weight: 400;
src: url("$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
src: url("/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
}
/* For at least Chrome on Windows 10, we have to explictly add extra weights for the emoji to appear in bold messages, etc. */
@font-face {
font-family: "Twemoji";
font-weight: 600;
src: url("$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
src: url("/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
}
@font-face {
font-family: "Twemoji";
font-weight: 700;
src: url("$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
src: url("/res/fonts/Twemoji_Mozilla/TwemojiMozilla-colr.woff2") format("woff2");
}

View File

@ -1,3 +0,0 @@
/* Path from root SCSS file (such as `light.pcss`) to `res` dir in the source tree */
/* This value is overridden by external themes in `element-web`. */
$res: ../../..;

View File

@ -1,5 +1,4 @@
@import "../../../../res/css/_font-sizes.pcss";
@import "_paths.pcss";
@import "_fonts.pcss";
@import "_light.pcss";
@import "_mods.pcss";

View File

@ -8,14 +8,12 @@ Please see LICENSE files in the repository root for full details.
/* TODO: Match the user's theme: https://github.com/element-hq/element-web/issues/12794 */
@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css");
/* Path to `res` dir in the source tree */
$res: ../../../res;
@font-face {
font-family: "Nunito";
font-style: normal;
font-weight: 400;
src: url("$(res)/fonts/Nunito/Nunito-Regular.ttf") format("truetype");
src: url("/res/fonts/Nunito/Nunito-Regular.ttf") format("truetype");
}
$dark-fg: #edf3ff;