mirror of
https://github.com/Equicord/Equicord.git
synced 2025-06-21 04:17:01 -04:00
Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
a1cc1bb826
15 changed files with 590 additions and 823 deletions
|
@ -51,6 +51,7 @@ export function SettingTextComponent({ option, pluginSettings, definedSettings,
|
|||
onChange={handleChange}
|
||||
placeholder={option.placeholder ?? "Enter a value"}
|
||||
disabled={option.disabled?.call(definedSettings) ?? false}
|
||||
maxLength={null}
|
||||
{...option.componentProps}
|
||||
/>
|
||||
{error && <Forms.FormText style={{ color: "var(--text-danger)" }}>{error}</Forms.FormText>}
|
||||
|
|
|
@ -128,8 +128,8 @@ function EquicordSettings() {
|
|||
isEquicordDonor(user?.id) && isVencordDonor(user?.id)
|
||||
? "All Vencord users can see your Vencord donor badge, and Equicord users can see your Equicord donor badge. To change your Vencord donor badge, contact @vending.machine. For your Equicord donor badge, make a ticket in Equicord's server."
|
||||
: isVencordDonor(user?.id)
|
||||
? "All Vencord users can see your badge! You can change it at any time by messaging @vending.machine."
|
||||
: "All Equicord users can see your badge! You can change it at any time by making a ticket in Equicord's server."
|
||||
? "All Vencord users can see your badge! You can manage your perks by messaging @vending.machine."
|
||||
: "All Equicord users can see your badge! You can manage your perks by making a ticket in Equicord's server."
|
||||
}
|
||||
cardImage={VENNIE_DONATOR_IMAGE}
|
||||
backgroundImage={DONOR_BACKGROUND_IMAGE}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
}
|
||||
|
||||
.visual-refresh .vc-addon-card {
|
||||
background-color: var(--button-secondary-background);
|
||||
background-color: var(--card-primary-bg);
|
||||
border: 1px solid var(--border-subtle);
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,8 @@
|
|||
}
|
||||
|
||||
.visual-refresh .vc-addon-card:hover {
|
||||
background-color: var(--button-secondary-background-hover);
|
||||
/* same as non-hover, here to overwrite the non-refresh hover background */
|
||||
background-color: var(--card-primary-bg);
|
||||
}
|
||||
|
||||
.vc-addon-header {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue