Skip to content

Commit

Permalink
Merge pull request #81 from FedeIlLeone/fix-user-profiles
Browse files Browse the repository at this point in the history 
fix: user profiles
  • Loading branch information
@LuckFire
LuckFire authored Apr 17, 2024
2 parents 1b848d8 + 7d55da7 commit ca5bd3b
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 61 deletions.
31 changes: 16 additions & 15 deletions clients/amoled-cord.theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,24 +191,29 @@ html.theme-dark .theme-light .root_a28985,
--elevation-low: 0 1px 0 hsl(var(--primary-630-hsl)/0.2),0 1.5px 0 hsl(var(--primary-600-hsl)/0.05),0 2px 0 hsl(var(--primary-630-hsl)/0.05) !important;
--elevation-medium: 0 4px 4px hsl(var(--black-500-hsl)/0.16) !important;
--elevation-high: 0 8px 16px hsl(var(--black-500-hsl)/0.24) !important;
--profile-gradient-primary-color: var(--background-floating);
--profile-gradient-secondary-color: var(--background-floating);
--profile-gradient-overlay-color: transparent;
--profile-gradient-button-color: var(--button-secondary-background);
--profile-avatar-border-color: var(--background-floating);
--profile-message-input-border-color: var(--background-modifier-accent);
--profile-body-background-color: var(--background-primary);
--profile-body-background-hover: var(--background-modifier-hover);
--profile-body-divider-color: var(--background-modifier-accent);
--profile-role-pill-background-color: var(--background-floating);
--profile-role-pill-border-color: var(--interactive-normal);
--search-popout-option-fade: linear-gradient(90deg,hsl(var(--primary-830-hsl)/0),hsl(var(--primary-830-hsl)/1) 80%) !important;
--search-popout-option-fade-hover: linear-gradient(90deg,hsl(var(--primary-800-hsl)/0),var(--primary-800) 50%) !important;
--legacy-elevation-low: 0 1px 5px 0 hsl(var(--black-500-hsl)/0.3);
--legacy-elevation-high: 0 2px 10px 0 hsl(var(--black-500-hsl)/0.2);
--legacy-elevation-border: 0 0 0 1px hsl(var(--primary-700-hsl)/0.6);
}

.theme-dark:not(.custom-profile-theme) {
--profile-gradient-primary-color: var(--background-floating) !important;
--profile-gradient-secondary-color: var(--background-floating) !important;
--profile-gradient-overlay-color: transparent !important;
--profile-gradient-button-color: var(--button-secondary-background) !important;
--profile-avatar-border-color: var(--background-floating) !important;
--profile-body-background-color: var(--background-primary) !important;
--profile-body-background-hover: var(--background-modifier-hover) !important;
--profile-body-divider-color: var(--background-modifier-accent) !important;
--profile-body-border-color: var(--border-faint) !important;
--profile-message-input-border-color: var(--background-modifier-accent) !important;
--profile-note-background-color: var(--background-tertiary) !important;
--profile-role-pill-background-color: var(--background-floating) !important;
--profile-role-pill-border-color: var(--interactive-normal) !important;
}

:is(.theme-dark, .theme-midnight) #app-mount .container__827e6 {
background-color: var(--background-primary);
}
Expand Down Expand Up @@ -367,10 +372,6 @@ html.theme-dark .theme-light .root_a28985,
background-color: var(--modal-footer-background);
}

:is(.theme-dark, .theme-midnight) .theme-light .root_a28985 {
color: var(--primary-300);
}

:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 .message_ff43e6 {
background-color: var(--background-primary);
}
Expand Down
31 changes: 16 additions & 15 deletions clients/amoled-cord.user.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,24 +190,29 @@
--elevation-low: 0 1px 0 hsl(var(--primary-630-hsl)/0.2),0 1.5px 0 hsl(var(--primary-600-hsl)/0.05),0 2px 0 hsl(var(--primary-630-hsl)/0.05) !important;
--elevation-medium: 0 4px 4px hsl(var(--black-500-hsl)/0.16) !important;
--elevation-high: 0 8px 16px hsl(var(--black-500-hsl)/0.24) !important;
--profile-gradient-primary-color: var(--background-floating);
--profile-gradient-secondary-color: var(--background-floating);
--profile-gradient-overlay-color: transparent;
--profile-gradient-button-color: var(--button-secondary-background);
--profile-avatar-border-color: var(--background-floating);
--profile-message-input-border-color: var(--background-modifier-accent);
--profile-body-background-color: var(--background-primary);
--profile-body-background-hover: var(--background-modifier-hover);
--profile-body-divider-color: var(--background-modifier-accent);
--profile-role-pill-background-color: var(--background-floating);
--profile-role-pill-border-color: var(--interactive-normal);
--search-popout-option-fade: linear-gradient(90deg,hsl(var(--primary-830-hsl)/0),hsl(var(--primary-830-hsl)/1) 80%) !important;
--search-popout-option-fade-hover: linear-gradient(90deg,hsl(var(--primary-800-hsl)/0),var(--primary-800) 50%) !important;
--legacy-elevation-low: 0 1px 5px 0 hsl(var(--black-500-hsl)/0.3);
--legacy-elevation-high: 0 2px 10px 0 hsl(var(--black-500-hsl)/0.2);
--legacy-elevation-border: 0 0 0 1px hsl(var(--primary-700-hsl)/0.6);
}

.theme-dark:not(.custom-profile-theme) {
--profile-gradient-primary-color: var(--background-floating) !important;
--profile-gradient-secondary-color: var(--background-floating) !important;
--profile-gradient-overlay-color: transparent !important;
--profile-gradient-button-color: var(--button-secondary-background) !important;
--profile-avatar-border-color: var(--background-floating) !important;
--profile-body-background-color: var(--background-primary) !important;
--profile-body-background-hover: var(--background-modifier-hover) !important;
--profile-body-divider-color: var(--background-modifier-accent) !important;
--profile-body-border-color: var(--border-faint) !important;
--profile-message-input-border-color: var(--background-modifier-accent) !important;
--profile-note-background-color: var(--background-tertiary) !important;
--profile-role-pill-background-color: var(--background-floating) !important;
--profile-role-pill-border-color: var(--interactive-normal) !important;
}

:is(.theme-dark, .theme-midnight) #app-mount .container__827e6 {
background-color: var(--background-primary);
}
Expand Down Expand Up @@ -366,10 +371,6 @@
background-color: var(--modal-footer-background);
}

:is(.theme-dark, .theme-midnight) .theme-light .root_a28985 {
color: var(--primary-300);
}

:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 .message_ff43e6 {
background-color: var(--background-primary);
}
Expand Down
31 changes: 16 additions & 15 deletions src/amoled-cord.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,24 +178,29 @@ html.theme-dark .theme-light .root_a28985,
--elevation-low: 0 1px 0 hsl(var(--primary-630-hsl)/0.2),0 1.5px 0 hsl(var(--primary-600-hsl)/0.05),0 2px 0 hsl(var(--primary-630-hsl)/0.05) !important;
--elevation-medium: 0 4px 4px hsl(var(--black-500-hsl)/0.16) !important;
--elevation-high: 0 8px 16px hsl(var(--black-500-hsl)/0.24) !important;
--profile-gradient-primary-color: var(--background-floating);
--profile-gradient-secondary-color: var(--background-floating);
--profile-gradient-overlay-color: transparent;
--profile-gradient-button-color: var(--button-secondary-background);
--profile-avatar-border-color: var(--background-floating);
--profile-message-input-border-color: var(--background-modifier-accent);
--profile-body-background-color: var(--background-primary);
--profile-body-background-hover: var(--background-modifier-hover);
--profile-body-divider-color: var(--background-modifier-accent);
--profile-role-pill-background-color: var(--background-floating);
--profile-role-pill-border-color: var(--interactive-normal);
--search-popout-option-fade: linear-gradient(90deg,hsl(var(--primary-830-hsl)/0),hsl(var(--primary-830-hsl)/1) 80%) !important;
--search-popout-option-fade-hover: linear-gradient(90deg,hsl(var(--primary-800-hsl)/0),var(--primary-800) 50%) !important;
--legacy-elevation-low: 0 1px 5px 0 hsl(var(--black-500-hsl)/0.3);
--legacy-elevation-high: 0 2px 10px 0 hsl(var(--black-500-hsl)/0.2);
--legacy-elevation-border: 0 0 0 1px hsl(var(--primary-700-hsl)/0.6);
}

.theme-dark:not(.custom-profile-theme) {
--profile-gradient-primary-color: var(--background-floating) !important;
--profile-gradient-secondary-color: var(--background-floating) !important;
--profile-gradient-overlay-color: transparent !important;
--profile-gradient-button-color: var(--button-secondary-background) !important;
--profile-avatar-border-color: var(--background-floating) !important;
--profile-body-background-color: var(--background-primary) !important;
--profile-body-background-hover: var(--background-modifier-hover) !important;
--profile-body-divider-color: var(--background-modifier-accent) !important;
--profile-body-border-color: var(--border-faint) !important;
--profile-message-input-border-color: var(--background-modifier-accent) !important;
--profile-note-background-color: var(--background-tertiary) !important;
--profile-role-pill-background-color: var(--background-floating) !important;
--profile-role-pill-border-color: var(--interactive-normal) !important;
}

:is(.theme-dark, .theme-midnight) #app-mount .container__827e6 {
background-color: var(--background-primary);
}
Expand Down Expand Up @@ -354,10 +359,6 @@ html.theme-dark .theme-light .root_a28985,
background-color: var(--modal-footer-background);
}

:is(.theme-dark, .theme-midnight) .theme-light .root_a28985 {
color: var(--primary-300);
}

:is(.theme-dark, .theme-midnight) #app-mount .root_a28985 .message_ff43e6 {
background-color: var(--background-primary);
}
Expand Down
28 changes: 16 additions & 12 deletions src/core/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,22 +186,26 @@ html.theme-dark .theme-light .root_a28985,
--elevation-medium: 0 4px 4px hsl(var(--black-500-hsl)/0.16) !important;
--elevation-high: 0 8px 16px hsl(var(--black-500-hsl)/0.24) !important;

--profile-gradient-primary-color: var(--background-floating);
--profile-gradient-secondary-color: var(--background-floating);
--profile-gradient-overlay-color: transparent;
--profile-gradient-button-color: var(--button-secondary-background);
--profile-avatar-border-color: var(--background-floating);
--profile-message-input-border-color: var(--background-modifier-accent);
--profile-body-background-color: var(--background-primary);
--profile-body-background-hover: var(--background-modifier-hover);
--profile-body-divider-color: var(--background-modifier-accent);
--profile-role-pill-background-color: var(--background-floating);
--profile-role-pill-border-color: var(--interactive-normal);

--search-popout-option-fade: linear-gradient(90deg,hsl(var(--primary-830-hsl)/0),hsl(var(--primary-830-hsl)/1) 80%) !important;
--search-popout-option-fade-hover: linear-gradient(90deg,hsl(var(--primary-800-hsl)/0),var(--primary-800) 50%) !important;

--legacy-elevation-low: 0 1px 5px 0 hsl(var(--black-500-hsl)/0.3);
--legacy-elevation-high: 0 2px 10px 0 hsl(var(--black-500-hsl)/0.2);
--legacy-elevation-border: 0 0 0 1px hsl(var(--primary-700-hsl)/0.6);
}

.theme-dark:not(.custom-profile-theme) {
--profile-gradient-primary-color: var(--background-floating) !important;
--profile-gradient-secondary-color: var(--background-floating) !important;
--profile-gradient-overlay-color: transparent !important;
--profile-gradient-button-color: var(--button-secondary-background) !important;
--profile-avatar-border-color: var(--background-floating) !important;
--profile-body-background-color: var(--background-primary) !important;
--profile-body-background-hover: var(--background-modifier-hover) !important;
--profile-body-divider-color: var(--background-modifier-accent) !important;
--profile-body-border-color: var(--border-faint) !important;
--profile-message-input-border-color: var(--background-modifier-accent) !important;
--profile-note-background-color: var(--background-tertiary) !important;
--profile-role-pill-background-color: var(--background-floating) !important;
--profile-role-pill-border-color: var(--interactive-normal) !important;
}
3 changes: 0 additions & 3 deletions src/theme/modals/_add-join-server.scss
View file

This file was deleted.

1 change: 0 additions & 1 deletion src/theme/modals/_index.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@forward 'accept-invite';
@forward 'account-switcher';
@forward 'add-join-server';
@forward 'delete';
@forward 'generic';
@forward 'invite';
Expand Down

0 comments on commit ca5bd3b

Please sign in to comment.