SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
thororen1234 2025-12-10 14:07:51 -05:00
commit 10aae9eba3
No known key found for this signature in database
39 changed files with 144 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/api/Notifications/styles.css
View file

@ -47,13 +47,13 @@
.vc-notification-close-btn { .vc-notification-close-btn {
all: unset; all: unset;
cursor: pointer; cursor: pointer;
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
opacity: 0.5; opacity: 0.5;
transition: opacity 0.2s ease-in-out, color 0.2s ease-in-out; transition: opacity 0.2s ease-in-out, color 0.2s ease-in-out;
} }
.vc-notification-close-btn:hover { .vc-notification-close-btn:hover {
color: var(--interactive-icon-hover); color: var(--interactive-icon-hover, var(--interactive-hover));
opacity: 1; opacity: 1;
} }
@ -137,5 +137,5 @@
.vc-notification-log-danger-btn { .vc-notification-log-danger-btn {
color: var(--white-500); color: var(--white-500);
background-color: var(--redesign-button-danger-background); background-color: var(--redesign-button-danger-background, var(--button-danger-background));
} }

83
src/components/Button.css
View file

@ -10,7 +10,7 @@
text-align: start; text-align: start;
transition: 50ms ease-in; transition: 50ms ease-in;
transition-property: background-color, color, border-color, opacity; transition-property: background-color, color, border-color, opacity;
background: var(--control-secondary-background-default); background: var(--control-secondary-background-default, var(--control-background-secondary-default));
color: var(--text-default); color: var(--text-default);
white-space: nowrap; white-space: nowrap;
@ -26,7 +26,7 @@
&:focus-visible { &:focus-visible {
/* stylelint-disable-next-line custom-property-pattern */ /* stylelint-disable-next-line custom-property-pattern */
box-shadow: 0 0 0 4px var(--__adaptive-focus-ring-color, var(--focus-primary, #00b0f4)); box-shadow: 0 0 0 4px var(--__adaptive-focus-ring-color, var(--border-focus, var(--focus-primary, #00b0f4)));
} }
} }
@ -63,85 +63,84 @@
} }
.vc-btn-primary { .vc-btn-primary {
background-color: var(--control-primary-background-default); background-color: var(--control-primary-background-default, var(--control-background-primary-default));
border-color: var(--control-primary-border-default); border-color: var(--control-primary-border-default, var(--control-border-primary-default));
color: var(--control-primary-text-default); color: var(--control-primary-text-default, var(--control-text-primary-default));
&:hover { &:hover {
background-color: var(--control-primary-background-hover); background-color: var(--control-primary-background-hover, var(--control-background-primary-hover));
border-color: var(--control-primary-border-hover); border-color: var(--control-primary-border-hover, var(--control-border-primary-hover));
color: var(--control-primary-text-hover); color: var(--control-primary-text-hover, var(--control-text-primary-hover));
} }
} }
.vc-btn-secondary, .vc-btn-secondary,
.vc-btn-link { .vc-btn-link {
background-color: var(--control-secondary-background-default); background-color: var(--control-secondary-background-default, var(--control-background-secondary-default));
border-color: var(--control-secondary-border-default); border-color: var(--control-secondary-border-default, var(--control-border-secondary-default));
color: var(--control-secondary-text-default); color: var(--control-secondary-text-default, var(--control-text-secondary-default));
&:hover { &:hover {
background-color: var(--control-secondary-background-hover); background-color: var(--control-secondary-background-hover, var(--control-background-secondary-hover));
border-color: var(--control-secondary-border-hover); border-color: var(--control-secondary-border-hover, var(--control-border-secondary-hover));
color: var(--control-secondary-text-hover); color: var(--control-secondary-text-hover, var(--control-text-secondary-hover));
} }
} }
.vc-btn-dangerPrimary { .vc-btn-dangerPrimary {
background-color: var(--control-critical-primary-background-default); background-color: var(--control-critical-primary-background-default, var(--control-background-critical-primary-default));
border-color: var(--control-critical-primary-border-default); border-color: var(--control-critical-primary-border-default, var(--control-border-critical-primary-default));
color: var(--control-critical-primary-text-default); color: var(--control-critical-primary-text-default, var(--control-text-critical-primary-default));
&:hover { &:hover {
background-color: var(--control-critical-primary-background-hover); background-color: var(--control-critical-primary-background-hover, var(--control-background-critical-primary-hover));
border-color: var(--control-secondary-background-hover); border-color: var(--control-critical-primary-border-hover, var(--control-border-critical-primary-hover));
color: var(--control-secondary-background-hover); color: var(--control-critical-primary-text-hover, var(--control-text-critical-primary-hover));
} }
} }
.vc-btn-dangerSecondary { .vc-btn-dangerSecondary {
background-color: var(--control-critical-secondary-background-default); background-color: var(--control-critical-secondary-background-default, var(--control-background-critical-secondary-default));
border-color: var(--control-critical-secondary-border-default); border-color: var(--control-critical-secondary-border-default, var(--control-border-critical-secondary-default));
color: var(--control-critical-secondary-text-default); color: var(--control-critical-secondary-text-default, var(--control-text-critical-secondary-default));
&:hover { &:hover {
background-color: var(--control-critical-secondary-background-hover); background-color: var(--control-critical-secondary-background-hover, var(--control-background-critical-secondary-hover));
border-color: var(--control-critical-secondary-border-hover); border-color: var(--control-critical-secondary-border-hover, var(--control-border-critical-secondary-hover));
color: var(--control-critical-secondary-text-hover); color: var(--control-critical-secondary-text-hover, var(--control-text-critical-secondary-hover));
} }
} }
.vc-btn-overlayPrimary { .vc-btn-overlayPrimary {
background-color: var(--control-overlay-primary-background-default); background-color: var(--control-overlay-primary-background-default, var(--control-background-overlay-primary-default));
border-color: var(--control-overlay-primary-border-default); border-color: var(--control-overlay-primary-border-default, var(--control-border-overlay-primary-default));
color: var(--control-overlay-primary-text-default); color: var(--control-overlay-primary-text-default, var(--control-text-overlay-primary-default));
&:hover { &:hover {
background-color: var(--control-overlay-primary-background-hover); background-color: var(--control-overlay-primary-background-hover, var(--control-background-overlay-primary-hover));
border-color: var(--control-overlay-primary-border-hover); border-color: var(--control-overlay-primary-border-hover, var(--control-border-overlay-primary-hover));
color: var(--control-overlay-primary-text-hover); color: var(--control-overlay-primary-text-hover, var(--control-text-overlay-primary-hover));
} }
} }
.vc-btn-positive { .vc-btn-positive {
background-color: var(--redesign-button-positive-background); background-color: var(--redesign-button-positive-background, var(--button-positive-background));
border-color: var(--redesign-button-positive-background); color: var(--white);
color: var(--redesign-button-positive-text);
&:hover { &:hover {
background-color: var(--redesign-button-positive-pressed-background); background-color: var(--redesign-button-positive-pressed-background, var(--button-positive-background-hover));
} }
} }
.vc-btn-none { .vc-btn-none {
background-color: transparent; background-color: transparent;
border-color: transparent; border-color: transparent;
color: var(--control-icon-icon-only-default); color: var(--control-icon-only-icon-default, var(--control-icon-icon-only-default));
&:hover { &:hover {
background-color: var(--control-icon-only-background-hover); background-color: var(--control-icon-only-background-hover, var(--control-background-icon-only-hover));
border-color: var(--control-icon-only-border-hover); border-color: var(--control-icon-only-border-hover, var(--control-border-icon-only-hover));
color: var(--control-icon-only-icon-hover); color: var(--control-icon-only-icon-hover, var(--control-icon-icon-only-hover));
} }
} }
@ -178,7 +177,7 @@
&:focus-visible { &:focus-visible {
/* stylelint-disable-next-line custom-property-pattern */ /* stylelint-disable-next-line custom-property-pattern */
box-shadow: 0 0 0 4px var(--__adaptive-focus-ring-color, var(--focus-primary, #00b0f4)); box-shadow: 0 0 0 4px var(--__adaptive-focus-ring-color, var(--border-focus, var(--focus-primary, #00b0f4)));
} }
} }
@ -187,7 +186,7 @@
} }
.vc-text-btn-secondary { .vc-text-btn-secondary {
color: var(--text-strong); color: var(--text-strong, var(--text-default));
} }
.vc-text-btn-danger { .vc-text-btn-danger {

6
src/components/Card.css
View file

@ -1,5 +1,5 @@
.vc-card-base { .vc-card-base {
background: var(--background-surface-high); background: var(--card-background-default, var(--card-primary-bg));
border-radius: var(--radius-sm, 8px) border-radius: var(--radius-sm, 8px)
} }
@ -8,11 +8,11 @@
} }
.vc-card-warning { .vc-card-warning {
border: 1px solid var(--text-status-idle); border: 1px solid var(--icon-status-idle, var(--info-warning-foreground));
} }
.vc-card-danger { .vc-card-danger {
border: 1px solid var(--text-status-dnd); border: 1px solid var(--icon-status-dnd, var(--info-danger-foreground));
} }
.vc-card-defaultPadding { .vc-card-defaultPadding {

4
src/components/Switch.css
View file

@ -15,7 +15,7 @@
.vc-switch-checked { .vc-switch-checked {
background: var(--brand-500); background: var(--brand-500);
border-color: var(--control-primary-border-default); border-color: var(--control-primary-border-default, var(--control-border-primary-default));
} }
.vc-switch-disabled { .vc-switch-disabled {
@ -25,7 +25,7 @@
.vc-switch-focusVisible { .vc-switch-focusVisible {
/* stylelint-disable-next-line custom-property-pattern */ /* stylelint-disable-next-line custom-property-pattern */
box-shadow: 0 0 0 4px var(--__adaptive-focus-ring-color, var(--focus-primary, #00b0f4)); box-shadow: 0 0 0 4px var(--__adaptive-focus-ring-color, var(--border-focus, var(--focus-primary, #00b0f4)));
} }
.vc-switch-slider { .vc-switch-slider {

31
src/components/ThemeSettings/themesStyles.css
View file

@ -4,37 +4,10 @@
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
} }
.vc-settings-theme-card { .vc-settings-csp-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: var(--background-base-lower-alt); gap: 8px;
color: var(--interactive-icon-active);
border-radius: 8px;
padding: 1em;
width: 100%;
transition: 0.1s ease-out;
transition-property: box-shadow, transform, background, opacity;
}
.vc-settings-theme-card-text {
text-overflow: ellipsis;
height: 1.2em;
margin-bottom: 2px;
white-space: nowrap;
overflow: hidden;
}
.vc-settings-theme-author::before {
content: "by ";
}
.vc-settings-theme-link-input {
width: 100%;
}
.vc-settings-theme-add-card {
padding: 1em;
margin-bottom: 16px;
} }
.vc-settings-usercss-ie-buttons > div { .vc-settings-usercss-ie-buttons > div {

4
src/components/settings/AddonCard.css
View file

@ -1,6 +1,6 @@
.vc-addon-card { .vc-addon-card {
background-color: var(--background-surface-high); background-color: var(--card-background-default, var(--card-primary-bg));
color: var(--interactive-icon-active); color: var(--interactive-icon-active, var(--interactive-active));
border: 1px solid var(--border-subtle); border: 1px solid var(--border-subtle);
border-radius: 8px; border-radius: 8px;
display: block; display: block;

6
src/components/settings/QuickAction.css
View file

@ -14,7 +14,7 @@
.vc-settings-quickActions-pill { .vc-settings-quickActions-pill {
all: unset; all: unset;
background: var(--redesign-button-secondary-background); background: var(--redesign-button-secondary-background, var(--button-secondary-background));
color: var(--text-default); color: var(--text-default);
display: flex; display: flex;
align-items: center; align-items: center;
@ -26,13 +26,13 @@
} }
.vc-settings-quickActions-pill:hover { .vc-settings-quickActions-pill:hover {
background: var(--redesign-button-secondary-pressed-background); background: var(--redesign-button-secondary-pressed-background, var(--button-secondary-background-hover));
transform: translateY(-1px); transform: translateY(-1px);
box-shadow: var(--elevation-high); box-shadow: var(--elevation-high);
} }
.vc-settings-quickActions-pill:focus-visible { .vc-settings-quickActions-pill:focus-visible {
outline: 2px solid var(--focus-primary); outline: 2px solid var(--border-focus, var(--focus-primary));
outline-offset: 2px; outline-offset: 2px;
} }

2
src/components/settings/tabs/patchHelper/FullPatchInput.tsx
View file

@ -74,7 +74,7 @@ export function FullPatchInput({ setFind, setParsedFind, setMatch, setReplacemen
onChange={setPatch} onChange={setPatch}
onBlur={update} onBlur={update}
/> />
{error !== "" && <Paragraph style={{ color: "var(--text-feedback-critical)" }}>{error}</Paragraph>} {error !== "" && <Paragraph style={{ color: "var(--text-feedback-critical, var(--text-danger))" }}>{error}</Paragraph>}
</> </>
); );
} }

2
src/components/settings/tabs/patchHelper/PatchPreview.tsx
View file

@ -142,7 +142,7 @@ export function PatchPreview({ module, match, replacement, setReplacementError }
)} )}
{compileResult && ( {compileResult && (
<Paragraph style={{ color: compileResult[0] ? "var(--status-positive)" : "var(--text-feedback-critical)" }}> <Paragraph style={{ color: compileResult[0] ? "var(--status-positive)" : "var(--text-feedback-critical, var(--text-danger))" }}>
{compileResult[1]} {compileResult[1]}
</Paragraph> </Paragraph>
)} )}

6
src/components/settings/tabs/plugins/UIElements.css
View file

@ -1,13 +1,13 @@
.vc-plugin-ui-elements-button { .vc-plugin-ui-elements-button {
display: flex; display: flex;
align-items: center; align-items: center;
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
margin-top: 0.5em; margin-top: 0.5em;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
background-color: var(--background-mod-subtle); background-color: var(--background-mod-subtle, var(--background-modifier-hover));
color: var(--interactive-icon-hover); color: var(--interactive-icon-hover, var(--interactive-hover));
} }
} }

2
src/components/settings/tabs/plugins/components/styles.css
View file

@ -31,5 +31,5 @@
} }
.vc-plugins-setting-error { .vc-plugins-setting-error {
color: var(--text-feedback-critical); color: var(--text-feedback-critical, var(--text-danger, #FF5C5C));
} }

11
src/components/settings/tabs/plugins/styles.css
View file

@ -29,16 +29,16 @@
padding: 0; padding: 0;
background: transparent; background: transparent;
margin-right: 8px; margin-right: 8px;
color: var(--icon-secondary); color: var(--icon-muted, var(--icon-secondary));
transition: background-color .2s ease; transition: background-color .2s ease;
&:hover { &:hover {
color: var(--interactive-icon-hover) color: var(--interactive-icon-hover, var(--interactive-hover))
} }
} }
.vc-plugins-settings-button:hover { .vc-plugins-settings-button:hover {
color: var(--interactive-icon-hover); color: var(--interactive-icon-hover, var(--interactive-hover));
} }
.vc-plugins-filter-controls { .vc-plugins-filter-controls {
@ -78,8 +78,9 @@
.vc-plugins-restart-card { .vc-plugins-restart-card {
padding: 1em; padding: 1em;
background: var(--background-feedback-warning); background: var(--icon-status-idle, var(--info-warning-foreground)) !important;
border: 1px solid var(--text-status-idle); border: 1px solid var(--icon-status-idle, var(--info-warning-foreground)) !important;
;
color: var(--text-status-idle); color: var(--text-status-idle);
} }

4
src/components/settings/tabs/styles.css
View file

@ -49,7 +49,7 @@
display: inline-block !important; display: inline-block !important;
color: var(--text-default) !important; color: var(--text-default) !important;
padding: 0.5em 1em; padding: 0.5em 1em;
border: 1px solid var(--input-border); border: 1px solid var(--input-border-default, var(--input-border));
max-height: unset; max-height: unset;
background-color: transparent; background-color: transparent;
box-sizing: border-box; box-sizing: border-box;
@ -76,7 +76,7 @@
.vc-cloud-erase-data-danger-btn { .vc-cloud-erase-data-danger-btn {
color: var(--white-500); color: var(--white-500);
background-color: var(--redesign-button-danger-background); background-color: var(--redesign-button-danger-background, var(--button-danger-background));
} }
.vc-settings-modal { .vc-settings-modal {

24
src/equicordplugins/musicControls/spotify/spotifyStyles.css
View file

@ -1,6 +1,6 @@
#vc-spotify-player { #vc-spotify-player {
padding: 12px; padding: 12px;
background: var(--bg-overlay-floating, var(--background-base-low, var(--background-base-lower-alt))); background: var(--background-base-low);
margin: 0; margin: 0;
border-top-left-radius: 10px; border-top-left-radius: 10px;
border-top-right-radius: 10px; border-top-right-radius: 10px;
@ -12,19 +12,11 @@
--vc-spotify-green-80: color-mix(in hsl, var(--vc-spotify-green), transparent 80%); --vc-spotify-green-80: color-mix(in hsl, var(--vc-spotify-green), transparent 80%);
} }
.theme-light #vc-spotify-player {
background: var(--bg-overlay-3, var(--background-base-lower-alt));
}
.theme-dark #vc-spotify-player {
background: var(--bg-overlay-1, var(--background-base-lower-alt));
}
.vc-spotify-button { .vc-spotify-button {
margin: 0 2px; margin: 0 2px;
border-radius: var(--radius-sm); border-radius: var(--radius-sm);
background: none; background: none;
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
padding: 0; padding: 0;
width: 32px; width: 32px;
height: 32px; height: 32px;
@ -34,8 +26,8 @@
} }
.vc-spotify-button:hover { .vc-spotify-button:hover {
color: var(--interactive-icon-hover); color: var(--interactive-icon-hover, var(--interactive-hover));
background-color: var(--background-mod-strong); background-color: var(--background-mod-strong, var(--background-modifier-selected));
} }
.vc-spotify-button-icon { .vc-spotify-button-icon {
@ -179,7 +171,7 @@
} }
#vc-spotify-progress-bar > [class^="slider"] [class^="barFill"] { #vc-spotify-progress-bar > [class^="slider"] [class^="barFill"] {
background-color: var(--interactive-icon-active); background-color: var(--interactive-icon-active, var(--interactive-active));
} }
#vc-spotify-progress-bar > [class^="slider"]:hover [class^="barFill"] { #vc-spotify-progress-bar > [class^="slider"]:hover [class^="barFill"] {
@ -192,9 +184,9 @@
width: 16px !important; width: 16px !important;
margin-top: calc(17px/-2 + var(--bar-offset)/2); margin-top: calc(17px/-2 + var(--bar-offset)/2);
margin-left: -0.5px; margin-left: -0.5px;
background-color: var(--interactive-icon-active); background-color: var(--interactive-icon-active, var(--interactive-active));
border-color: var(--interactive-icon-default); border-color: var(--interactive-icon-default, var(--interactive-normal));
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
opacity: 0; opacity: 0;
transition: opacity 0.1s; transition: opacity 0.1s;
} }

6
src/plugins/_core/settings.tsx
View file

@ -52,11 +52,13 @@ interface SettingsLayoutNode {
type: number; type: number;
key?: string; key?: string;
legacySearchKey?: string; legacySearchKey?: string;
getLegacySearchKey?(): string;
useLabel?(): string; useLabel?(): string;
useTitle?(): string; useTitle?(): string;
buildLayout?(): SettingsLayoutNode[]; buildLayout?(): SettingsLayoutNode[];
icon?(): ReactNode; icon?(): ReactNode;
render?(): ReactNode; render?(): ReactNode;
StronglyDiscouragedCustomComponent?(): ReactNode;
} }
interface EntryOptions { interface EntryOptions {
@ -175,7 +177,9 @@ export default definePlugin({
return ({ return ({
key, key,
type: LayoutTypes.SIDEBAR_ITEM, type: LayoutTypes.SIDEBAR_ITEM,
// FIXME
legacySearchKey: title.toUpperCase(), legacySearchKey: title.toUpperCase(),
getLegacySearchKey: () => title.toUpperCase(),
useTitle: () => title, useTitle: () => title,
icon: () => <Icon width={20} height={20} />, icon: () => <Icon width={20} height={20} />,
buildLayout: () => [ buildLayout: () => [
@ -188,6 +192,8 @@ export default definePlugin({
key: key + "_pane", key: key + "_pane",
type: LayoutTypes.PANE, type: LayoutTypes.PANE,
buildLayout: () => [], buildLayout: () => [],
// FIXME
StronglyDiscouragedCustomComponent: () => <Component />,
render: () => <Component />, render: () => <Component />,
useTitle: () => panelTitle useTitle: () => panelTitle
} }

2
src/plugins/betterSessions/index.tsx
View file

@ -140,7 +140,7 @@ export default definePlugin({
overflow: "hidden", overflow: "hidden",
borderRadius: "50%", borderRadius: "50%",
backgroundColor: "var(--interactive-icon-default)", backgroundColor: "var(--interactive-icon-default, var(--interactive-normal))",
color: "var(--background-base-lower)", color: "var(--background-base-lower)",
}} }}
> >

2
src/plugins/clientTheme/clientTheme.css
View file

@ -16,7 +16,7 @@
} }
.vc-clientTheme-container [class^="swatch"] { .vc-clientTheme-container [class^="swatch"] {
border: thin solid var(--input-border) !important; border: thin solid var(--input-border-default, var(--input-border)) !important;
} }
.vc-clientTheme-buttons-container { .vc-clientTheme-buttons-container {

4
src/plugins/copyFileContents/style.css
View file

@ -1,9 +1,9 @@
.vc-cfc-button { .vc-cfc-button {
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
cursor: pointer; cursor: pointer;
padding-left: 4px; padding-left: 4px;
} }
.vc-cfc-button:hover { .vc-cfc-button:hover {
color: var(--interactive-icon-hover); color: var(--interactive-icon-hover, var(--interactive-hover));
} }

2
src/plugins/customRPC/index.tsx
View file

@ -278,7 +278,7 @@ export default definePlugin({
<Divider className={Margins.top8} /> <Divider className={Margins.top8} />
<div style={{ width: "284px", ...profileThemeStyle, marginTop: 8, borderRadius: 8, background: "var(--background-mod-faint)" }}> <div style={{ width: "284px", ...profileThemeStyle, marginTop: 8, borderRadius: 8, background: "var(--background-mod-muted, var(--background-mod-faint))" }}>
{activity && <ActivityView {activity && <ActivityView
activity={activity} activity={activity}
user={UserStore.getCurrentUser()} user={UserStore.getCurrentUser()}

2
src/plugins/customRPC/settings.css
View file

@ -27,5 +27,5 @@
} }
.vc-customRPC-settings-error { .vc-customRPC-settings-error {
color: var(--text-feedback-critical); color: var(--text-feedback-critical, var(--text-danger));
} }

2
src/plugins/decor/ui/styles.css
View file

@ -1,6 +1,6 @@
.vc-decor-danger-btn { .vc-decor-danger-btn {
color: var(--white-500); color: var(--white-500);
background-color: var(--redesign-button-danger-background); background-color: var(--redesign-button-danger-background, var(--button-danger-background));
} }
.vc-decor-change-decoration-modal-content { .vc-decor-change-decoration-modal-content {

2
src/plugins/friendsSince/index.tsx
View file

@ -71,7 +71,7 @@ export default definePlugin({
width="16" width="16"
height="16" height="16"
viewBox="0 0 24 24" viewBox="0 0 24 24"
fill="var(--interactive-icon-default)" fill="var(--interactive-icon-default, var(--interactive-normal))"
> >
<path d="M13 10a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" /> <path d="M13 10a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z" />
<path d="M3 5v-.75C3 3.56 3.56 3 4.25 3s1.24.56 1.33 1.25C6.12 8.65 9.46 12 13 12h1a8 8 0 0 1 8 8 2 2 0 0 1-2 2 .21.21 0 0 1-.2-.15 7.65 7.65 0 0 0-1.32-2.3c-.15-.2-.42-.06-.39.17l.25 2c.02.15-.1.28-.25.28H9a2 2 0 0 1-2-2v-2.22c0-1.57-.67-3.05-1.53-4.37A15.85 15.85 0 0 1 3 5Z" /> <path d="M3 5v-.75C3 3.56 3.56 3 4.25 3s1.24.56 1.33 1.25C6.12 8.65 9.46 12 13 12h1a8 8 0 0 1 8 8 2 2 0 0 1-2 2 .21.21 0 0 1-.2-.15 7.65 7.65 0 0 0-1.32-2.3c-.15-.2-.42-.06-.39.17l.25 2c.02.15-.1.28-.25.28H9a2 2 0 0 1-2-2v-2.22c0-1.57-.67-3.05-1.53-4.37A15.85 15.85 0 0 1 3 5Z" />

2
src/plugins/ignoreActivities/index.tsx
View file

@ -66,7 +66,7 @@ function ToggleActivityComponent(activity: IgnoredActivity, isPlaying = false) {
const { ignoredActivities } = s; const { ignoredActivities } = s;
if (ignoredActivities.some(act => act.id === activity.id)) return ToggleIconOff(activity, "var(--status-danger)"); if (ignoredActivities.some(act => act.id === activity.id)) return ToggleIconOff(activity, "var(--status-danger)");
return ToggleIconOn(activity, isPlaying ? "var(--green-300)" : "var(--interactive-icon-default)"); return ToggleIconOn(activity, isPlaying ? "var(--green-300)" : "var(--interactive-icon-default, var(--interactive-normal))");
} }
function handleActivityToggle(e: React.MouseEvent<HTMLButtonElement, MouseEvent>, activity: IgnoredActivity) { function handleActivityToggle(e: React.MouseEvent<HTMLButtonElement, MouseEvent>, activity: IgnoredActivity) {

2
src/plugins/memberCount/style.css
View file

@ -47,7 +47,7 @@
.vc-membercount-total-count { .vc-membercount-total-count {
fill: none; fill: none;
stroke: var(--status-offline); stroke: var(--icon-status-offline, var(--status-offline));
stroke-width: 4px; stroke-width: 4px;
width: 15px; width: 15px;
height: 15px; height: 15px;

2
src/plugins/messageLogger/deleteStyleText.css
View file

@ -1,6 +1,6 @@
.messagelogger-deleted { .messagelogger-deleted {
--text-default: var(--status-danger, #f04747); --text-default: var(--status-danger, #f04747);
--interactive-icon-default: var(--status-danger, #f04747); --interactive-icon-default: var(--interactive-normal, var(--status-danger, #f04747));
--text-muted: var(--status-danger, #f04747); --text-muted: var(--status-danger, #f04747);
--embed-title: var(--red-460, #be3535); --embed-title: var(--red-460, #be3535);
--text-link: var(--red-460, #be3535); --text-link: var(--red-460, #be3535);

14
src/plugins/permissionsViewer/styles.css
View file

@ -66,11 +66,11 @@
} }
.vc-permviewer-modal-list-item:hover { .vc-permviewer-modal-list-item:hover {
background-color: var(--background-mod-subtle); background-color: var(--background-mod-subtle, var(--background-modifier-hover));
} }
.vc-permviewer-modal-list-item-active { .vc-permviewer-modal-list-item-active {
background-color: var(--background-mod-strong); background-color: var(--background-mod-strong, var(--background-modifier-selected));
} }
.vc-permviewer-modal-list-item-text { .vc-permviewer-modal-list-item-text {
@ -100,7 +100,7 @@
.vc-permviewer-modal-divider { .vc-permviewer-modal-divider {
width: 2px; width: 2px;
background-color: var(--border-subtle); background-color: var(--background-mod-normal, var(--background-modifier-active));
} }
.vc-permviewer-modal-perms { .vc-permviewer-modal-perms {
@ -114,7 +114,7 @@
align-items: center; align-items: center;
gap: 5px; gap: 5px;
padding: 10px 2px 10px 10px; padding: 10px 2px 10px 10px;
border-bottom: 2px solid var(--border-subtle); border-bottom: 2px solid var(--background-mod-normal, var(--background-modifier-active));
} }
.vc-permviewer-modal-perms-item:last-child { .vc-permviewer-modal-perms-item:last-child {
@ -122,7 +122,7 @@
} }
.vc-permviewer-modal-perms-item-icon { .vc-permviewer-modal-perms-item-icon {
border: 1px solid var(--background-mod-strong); border: 1px solid var(--background-mod-strong, var(--background-modifier-selected));
width: 24px; width: 24px;
height: 24px; height: 24px;
} }
@ -135,13 +135,13 @@
} }
.vc-permviewer-modal-perms-item .vc-info-icon:hover { .vc-permviewer-modal-perms-item .vc-info-icon:hover {
color: var(--interactive-icon-active); color: var(--interactive-icon-active, var(--interactive-active));
} }
/* copy pasted from discord cause impossible to webpack find */ /* copy pasted from discord cause impossible to webpack find */
.vc-permviewer-role-button { .vc-permviewer-role-button {
border-radius: var(--radius-sm); border-radius: var(--radius-sm);
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
border: 1px solid var(--user-profile-border); border: 1px solid var(--user-profile-border);
/* stylelint-disable-next-line value-no-vendor-prefix */ /* stylelint-disable-next-line value-no-vendor-prefix */
width: -moz-fit-content; width: -moz-fit-content;

6
src/plugins/pictureInPicture/styles.css
View file

@ -1,8 +1,8 @@
.vc-pip-button { .vc-pip-button {
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
} }
.vc-pip-button:hover { .vc-pip-button:hover {
background-color: var(--background-mod-subtle); background-color: var(--background-mod-subtle, var(--background-modifier-hover));
color: var(--interactive-icon-hover); color: var(--interactive-icon-hover, var(--interactive-hover));
} }

2
src/plugins/pinDms/styles.css
View file

@ -28,7 +28,7 @@
.vc-pindms-collapse-icon { .vc-pindms-collapse-icon {
width: 16px; width: 16px;
height: 16px; height: 16px;
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
transform: rotate(90deg) transform: rotate(90deg)
} }

2
src/plugins/plainFolderIcon/style.css
View file

@ -6,5 +6,5 @@
transform: translateZ(0); transform: translateZ(0);
/* The new icons are fully transparent. Add a sane default to match the old behavior */ /* The new icons are fully transparent. Add a sane default to match the old behavior */
background-color: color-mix(in oklab, var(--custom-folder-color, var(--bg-brand)) 40%, transparent); background-color: color-mix(in oklab, var(--custom-folder-color, var(--badge-background-default, var(--bg-brand))) 40%, transparent);
} }

4
src/plugins/readAllNotificationsButton/style.css
View file

@ -1,5 +1,5 @@
.vc-ranb-button { .vc-ranb-button {
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
padding: 0 0.5em; padding: 0 0.5em;
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
@ -8,5 +8,5 @@
} }
.vc-ranb-button:hover { .vc-ranb-button:hover {
color: var(--interactive-icon-active); color: var(--interactive-icon-active, var(--interactive-active));
} }

11
src/plugins/reviewDB/style.css
View file

@ -9,13 +9,14 @@
} }
.vc-rdb-input { .vc-rdb-input {
padding-left: 12px; padding-inline: 12px;
margin-top: 6px; margin-top: 6px;
margin-bottom: 12px; margin-bottom: 12px;
resize: none; resize: none;
overflow: hidden; overflow: hidden;
background: transparent; background: transparent;
border: 1px solid var(--profile-message-input-border-color); border: 1px solid var(--input-border-default, var(--border-muted));
box-sizing: border-box;
} }
.vc-rdb-modal-footer-wrapper { .vc-rdb-modal-footer-wrapper {
@ -40,7 +41,7 @@
.vc-rdb-modal-footer .vc-rdb-input { .vc-rdb-modal-footer .vc-rdb-input {
margin-bottom: 0; margin-bottom: 0;
background: var(--input-background); background: var(--input-background-default, var(--input-background));
} }
.vc-rdb-modal-footer [class|="pageControlContainer"] { .vc-rdb-modal-footer [class|="pageControlContainer"] {
@ -61,8 +62,8 @@
padding-right: 32px !important; padding-right: 32px !important;
} }
.vc-rdb-review-container:hover { .vc-rdb-review:hover {
background: var(--background-message-hover) !important; background: var(--message-background-hover, var(--background-message-hover)) !important;
border-radius: 8px; border-radius: 8px;
} }

4
src/plugins/sendTimestamps/styles.css
View file

@ -1,11 +1,11 @@
.vc-st-date-picker { .vc-st-date-picker {
background-color: var(--input-background); background-color: var(--input-background-default, var(--input-background));
color: var(--text-default); color: var(--text-default);
width: 95%; width: 95%;
padding: 8px 8px 8px 12px; padding: 8px 8px 8px 12px;
margin: 1em 0; margin: 1em 0;
outline: none; outline: none;
border: 1px solid var(--input-background); border: 1px solid var(--input-background-default, var(--input-background));
border-radius: 4px; border-radius: 4px;
font-weight: 500; font-weight: 500;
font-style: inherit; font-style: inherit;

6
src/plugins/serverInfo/styles.css
View file

@ -48,7 +48,7 @@
.vc-gp-tab { .vc-gp-tab {
border-bottom: 2px solid transparent; border-bottom: 2px solid transparent;
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
cursor: pointer; cursor: pointer;
line-height: 14px; line-height: 14px;
} }
@ -58,7 +58,7 @@
} }
.vc-gp-tab:where(.vc-gp-selected, :hover, :focus) { .vc-gp-tab:where(.vc-gp-selected, :hover, :focus) {
border-bottom-color: var(--interactive-icon-active); border-bottom-color: var(--interactive-icon-active, var(--interactive-active));
} }
.vc-gp-info { .vc-gp-info {
@ -165,5 +165,5 @@
} }
.vc-gp-scroller [class^="listRow"]:hover { .vc-gp-scroller [class^="listRow"]:hover {
background-color: var(--background-mod-subtle); background-color: var(--background-mod-subtle, var(--background-modifier-hover));
} }

2
src/plugins/showConnections/VerifiedIcon.tsx
View file

@ -25,7 +25,7 @@ const VerifiedIconComponent = findComponentByCodeLazy("#{intl::CONNECTIONS_ROLE_
export function VerifiedIcon() { export function VerifiedIcon() {
const color = useToken(ColorMap.colors.INTERACTIVE_MUTED).hex(); const color = useToken(ColorMap.colors.INTERACTIVE_MUTED).hex();
const forcedIconColor = useToken(ColorMap.colors.INTERACTIVE_ACTIVE).hex(); const forcedIconColor = useToken(ColorMap.colors.INTERACTIVE_ICON_ACTIVE ?? ColorMap.colors.INTERACTIVE_ACTIVE).hex();
return ( return (
<VerifiedIconComponent <VerifiedIconComponent

8
src/plugins/showHiddenChannels/style.css
View file

@ -27,7 +27,7 @@
.vc-shc-topic-container { .vc-shc-topic-container {
color: var(--text-default); color: var(--text-default);
background: var(--bg-overlay-5, var(--background-base-lower)); background: var(--background-base-lower);
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;
max-width: 70vw; max-width: 70vw;
@ -37,7 +37,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
background: var(--bg-overlay-5, var(--background-base-lower)); background: var(--background-base-lower);
border-radius: 8px; border-radius: 8px;
padding: 0.75em; padding: 0.75em;
margin-left: 0.75em; margin-left: 0.75em;
@ -46,7 +46,7 @@
.vc-shc-tags-container { .vc-shc-tags-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: var(--bg-overlay-5, var(--background-base-lower)); background: var(--background-base-lower);
border-radius: 5px; border-radius: 5px;
padding: 0.75em; padding: 0.75em;
gap: 0.75em; gap: 0.75em;
@ -65,7 +65,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
background: var(--bg-overlay-5, var(--background-base-lower)); background: var(--background-base-lower);
border-radius: 5px; border-radius: 5px;
padding: 0.75em; padding: 0.75em;
max-width: 70vw; max-width: 70vw;

2
src/plugins/textReplace/index.tsx
View file

@ -95,7 +95,7 @@ function renderFindError(find: string) {
return null; return null;
} catch (e) { } catch (e) {
return ( return (
<span style={{ color: "var(--text-feedback-critical)" }}> <span style={{ color: "var(--text-feedback-critical, var(--text-danger))" }}>
{String(e)} {String(e)}
</span> </span>
); );

4
src/plugins/userVoiceShow/style.css
View file

@ -1,5 +1,5 @@
.vc-uvs-speaker { .vc-uvs-speaker {
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -10,7 +10,7 @@
} }
.vc-uvs-clickable:hover { .vc-uvs-clickable:hover {
color: var(--interactive-icon-hover); color: var(--interactive-icon-hover, var(--interactive-hover));
} }
.vc-uvs-profile-speaker { .vc-uvs-profile-speaker {

4
src/plugins/voiceDownload/style.css
View file

@ -1,12 +1,12 @@
.vc-voice-download { .vc-voice-download {
width: 24px; width: 24px;
height: 24px; height: 24px;
color: var(--interactive-icon-default); color: var(--interactive-icon-default, var(--interactive-normal));
margin-left: 12px; margin-left: 12px;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
} }
.vc-voice-download:hover { .vc-voice-download:hover {
color: var(--interactive-icon-active); color: var(--interactive-icon-active, var(--interactive-active));
} }

4
src/plugins/voiceMessages/styles.css
View file

@ -21,7 +21,7 @@
} }
.vc-vmsg-preview-indicator { .vc-vmsg-preview-indicator {
background: var(--redesign-button-secondary-background); background: var(--redesign-button-secondary-background, var(--button-secondary-background));
width: 16px; width: 16px;
height: 16px; height: 16px;
border-radius: 50%; border-radius: 50%;
@ -50,5 +50,5 @@
} }
.vc-vmsg-error { .vc-vmsg-error {
color: var(--text-feedback-critical); color: var(--text-feedback-critical, var(--text-danger, #FF5C5C));
} }