Skip to content

Simplify css var setup to remove conflicts, overrides, and duplicates #4170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 17, 2025
Merged

Simplify css var setup to remove conflicts, overrides, and duplicates #4170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fa2b97
remove "experimental" color vars, remove conflicting styles from fron…
Prospector Aug 14, 2025
5966e58
Merge remote-tracking branch 'origin/main' into prospector/css-var-cl…
Prospector Aug 14, 2025
4d667e5
lint
Prospector Aug 15, 2025
e01dde7
Merge branch 'main' into prospector/css-var-cleanup
IMB11 Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions apps/frontend/src/assets/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
html {
@extend .dark-mode;
--dark-color-text: #b0bac5;
--dark-color-text-dark: #ecf9fb;
--color-text-secondary: var(--color-icon);
Expand All @@ -16,7 +15,6 @@ html {
--gap-24: calc(3 * var(--gap-8));

--radius-card: 1rem;
--radius-max: 999999999px;

--radius-btn: 0.75rem;
--radius-btn-large: 1rem;
Expand All @@ -42,28 +40,19 @@ html {
}

.light-mode {
--color-secondary: #6b7280;
--color-icon: var(--color-secondary);
--color-text: hsl(221, 39%, 11%);
--color-text-inactive: hsl(215, 14%, 34%);
--color-text-dark: #1a202c;
--color-heading: #2c313d;
--color-bg: #e5e7eb;
--color-raised-bg: #ffffff;
--color-divider: hsl(220, 13%, 91%);
--color-divider-dark: #c8cdd3;

--color-text-inverted: var(--color-bg);
--color-bg-inverted: var(--color-text);

--color-brand: var(--color-green);
--color-brand-highlight: rgba(0, 175, 92, 0.25);
--color-brand-shadow: rgba(0, 175, 92, 0.7);
--color-brand-inverted: #ffffff;

--tab-underline-hovered: #e2e8f0;

--color-button-bg: hsl(220, 13%, 91%);
--color-button-text: var(--color-text-dark);
--color-button-bg-hover: #d9dce0;
--color-button-text-hover: #1b1e24;
Expand All @@ -80,17 +69,9 @@ html {

--color-kbd-shadow: rgba(0, 0, 0, 0.25);

--color-ad: #d6e6f9;
--color-ad-raised: #b1c8e4;
--color-ad-contrast: var(--color-text);
--color-ad-highlight: #088cdb;

--color-grey-link: var(--color-text);
--color-grey-link-hover: var(--color-heading);
--color-grey-link-active: var(--color-text-dark);
--color-link: #0d60bb;
--color-link-hover: #1a76e7;
--color-link-active: #146fd7;

--color-warning-bg: hsl(355, 70%, 88%);
--color-warning-text: hsl(342, 70%, 35%);
Expand All @@ -110,21 +91,6 @@ html {
--color-table-border: #dfe2e5;
--color-table-alternate-row: #f2f4f7;

--shadow-inset-lg: inset 0px -2px 2px hsla(221, 39%, 11%, 0.1);
--shadow-inset: inset 0px -2px 2px hsla(221, 39%, 11%, 0.05);
--shadow-inset-sm: inset 0px -1px 2px hsla(221, 39%, 11%, 0.15);

--shadow-raised-lg: 0px 2px 4px hsla(221, 39%, 11%, 0.2);
--shadow-raised:
0.3px 0.5px 0.6px hsl(var(--shadow-color) / 0.15),
1px 2px 2.2px -1.7px hsl(var(--shadow-color) / 0.12),
4.4px 8.8px 9.7px -3.4px hsl(var(--shadow-color) / 0.09);
--shadow-floating:
hsla(0, 0%, 0%, 0) 0px 0px 0px 0px, hsla(0, 0%, 0%, 0) 0px 0px 0px 0px,
hsla(0, 0%, 0%, 0.1) 0px 4px 6px -1px, hsla(0, 0%, 0%, 0.1) 0px 2px 4px -1px;

--shadow-card: rgba(50, 50, 100, 0.1) 0px 2px 4px 0px;

--landing-maze-bg: url('https://cdn.modrinth.com/landing-new/landing-light.webp');
--landing-maze-gradient-bg: url('https://cdn.modrinth.com/landing-new/landing-lower-light.webp');
--landing-maze-outer-bg: linear-gradient(180deg, #f0f0f0 0%, #ffffff 100%);
Expand Down Expand Up @@ -182,28 +148,19 @@ html {
.dark-mode,
.oled-mode,
.retro-mode {
--color-secondary: #96a2b0;
--color-icon: var(--color-secondary);
--color-text: var(--dark-color-text);
--color-text-inactive: #929aa3;
--color-text-dark: var(--dark-color-text-dark);
--color-heading: #c4cfdd;
--color-bg: #16181c;
--color-raised-bg: #26292f;
--color-divider: #474b54;
--color-divider-dark: #646c75;

--color-text-inverted: var(--color-bg);
--color-bg-inverted: var(--color-text);

--color-brand: var(--color-green);
--color-brand-highlight: rgba(27, 217, 106, 0.25);
--color-brand-shadow: rgba(27, 217, 106, 0.7);
--color-brand-inverted: #000;

--tab-underline-hovered: #414146;

--color-button-bg: hsl(222, 13%, 30%);
--color-button-text: var(--color-text);
--color-button-bg-hover: #494f58;
--color-button-text-hover: #ffffff;
Expand All @@ -220,15 +177,6 @@ html {

--color-kbd-shadow: rgba(0, 0, 0, 0.35);

--color-ad: #1f324a;
--color-ad-raised: #2e4057;
--color-ad-contrast: var(--color-text);
--color-ad-highlight: #088cdb;

--color-link: #74b6f3;
--color-link-hover: #92c0f5;
--color-link-active: #b5d5fd;

--color-warning-bg: hsl(355, 70%, 20%);
--color-warning-text: hsl(342, 70%, 75%);

Expand All @@ -247,18 +195,6 @@ html {
--color-table-border: #4f5864;
--color-table-alternate-row: #202228;

--shadow-inset-lg: inset 0px -2px 2px hsla(221, 39%, 11%, 0.1);
--shadow-inset: inset 0px -2px 2px hsla(221, 39%, 11%, 0.05);
--shadow-inset-sm: inset 0px -1px 1px hsla(221, 39%, 11%, 0.25);

--shadow-raised-lg: 0px 2px 4px hsla(221, 39%, 11%, 0.2);
--shadow-raised: 0px -2px 4px hsla(221, 39%, 11%, 0.1);
--shadow-floating:
hsla(0, 0%, 0%, 0) 0px 0px 0px 0px, hsla(0, 0%, 0%, 0) 0px 0px 0px 0px,
hsla(0, 0%, 0%, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;

--shadow-card: rgba(0, 0, 0, 0.25) 0px 2px 4px 0px;

--landing-maze-bg: url('https://cdn.modrinth.com/landing-new/landing.webp');
--landing-maze-gradient-bg:
linear-gradient(0deg, #31375f 0%, rgba(8, 14, 55, 0) 100%),
Expand Down Expand Up @@ -318,17 +254,12 @@ html {
}

.oled-mode {
--color-bg: #000000;
--color-raised-bg: #101013;

--color-button-bg: #222329;
--color-button-bg-hover: #2d2d32;
--color-button-bg-active: #3c3c40;
--color-table-alternate-row: #19191c;
--color-divider-dark: #2c3134;

--color-warning-banner-bg: hsl(0, 45%, 11%);
--color-ad: #0d1828;
}

.retro-mode {
Expand Down
65 changes: 9 additions & 56 deletions packages/assets/styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.light-properties {
--color-bg: #e5e7eb;
--color-bg: #ebebeb;
--color-raised-bg: #ffffff;
--color-super-raised-bg: #e9e9e9;
--color-button-bg: hsl(220, 13%, 91%);
--color-button-bg: #f5f5f5;
--color-button-border: rgba(161, 161, 161, 0.35);
--color-scrollbar: #96a2b0;

--color-divider: #babfc5;
--color-divider-dark: #c8cdd3;

--color-base: hsl(221, 39%, 11%);
--color-secondary: #6b7280;
--color-base: #2c2e31;
--color-secondary: #484d54;
--color-contrast: #1a202c;
--color-accent-contrast: #ffffff;

Expand Down Expand Up @@ -119,6 +119,10 @@ html {
--color-ad-raised: rgba(190, 140, 243, 0.5);
--color-ad-contrast: black;
--color-ad-highlight: var(--color-purple);

--color-link: var(--color-blue) !important;
--color-link-hover: var(--color-blue) !important; // DEPRECATED, use filters in future
--color-link-active: var(--color-blue) !important; // DEPRECATED, use filters in future
}

.light-mode,
Expand All @@ -132,7 +136,7 @@ html {
--color-bg: #16181c;
--color-raised-bg: #26292f;
--color-super-raised-bg: #40434a;
--color-button-bg: hsl(222, 13%, 30%);
--color-button-bg: #33363d;
--color-button-border: rgba(193, 190, 209, 0.12);
--color-scrollbar: var(--color-button-bg);

Expand Down Expand Up @@ -212,8 +216,6 @@ html {
--color-platform-nilloader: #f45e9a;

--hover-brightness: 1.25;

--experimental-color-button-bg: #33363d;
}

.oled-mode {
Expand Down Expand Up @@ -241,52 +243,3 @@ html {
.retro-mode {
--brand-gradient-strong-bg: #3a3b38;
}

.experimental-styles-within {
--color-link: var(--color-blue) !important;
--color-link-hover: var(--color-blue) !important; // DEPRECATED, use filters in future
--color-link-active: var(--color-blue) !important; // DEPRECATED, use filters in future
}

.light-experiments {
--color-bg: #ebebeb;
--color-raised-bg: #ffffff;
--color-button-bg: #f5f5f5;
--color-base: #2c2e31;
--color-secondary: #484d54;
--color-accent-contrast: #ffffff;
}

.light-mode,
.light {
.experimental-styles-within,
&.experimental-styles-within {
@extend .light-experiments;
}
}

.experimental-styles-within {
.light-mode,
.light {
@extend .light-experiments;
}
}

.dark-experiments {
--color-button-bg: var(--experimental-color-button-bg);
}

.dark-mode:not(.oled-mode),
.dark:not(.oled-mode) {
.experimental-styles-within,
&.experimental-styles-within {
@extend .dark-experiments;
}
}

.experimental-styles-within {
.dark-mode:not(.oled-mode),
.dark:not(.oled-mode) {
@extend .dark-experiments;
}
}
2 changes: 1 addition & 1 deletion packages/ui/src/composables/stripe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const useStripe = (
appearance: {
variables: {
colorPrimary: styles.getPropertyValue('--color-brand'),
colorBackground: styles.getPropertyValue('--experimental-color-button-bg'),
colorBackground: styles.getPropertyValue('--color-button-bg'),
colorText: styles.getPropertyValue('--color-base'),
colorTextPlaceholder: styles.getPropertyValue('--color-secondary'),
colorDanger: styles.getPropertyValue('--color-red'),
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/billing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const createStripeElements = (stripe, paymentMethods, options) => {
appearance: {
variables: {
colorPrimary: styles.getPropertyValue('--color-brand'),
colorBackground: styles.getPropertyValue('--experimental-color-button-bg'),
colorBackground: styles.getPropertyValue('--color-button-bg'),
colorText: styles.getPropertyValue('--color-base'),
colorTextPlaceholder: styles.getPropertyValue('--color-secondary'),
colorDanger: styles.getPropertyValue('--color-red'),
Expand Down