Skip to content

Commit

Permalink
Merge pull request #102 from FedeIlLeone/main
Browse files Browse the repository at this point in the history 
Activity cards and popout, other improvements, fixes and cleanup
  • Loading branch information
@LuckFire
LuckFire authored Sep 6, 2024
2 parents a96d3ed + b129b76 commit 034efca
Show file tree
Hide file tree
Showing 45 changed files with 869 additions and 1,222 deletions.
512 changes: 213 additions & 299 deletions clients/amoled-cord.theme.css
View file

Large diffs are not rendered by default.

512 changes: 213 additions & 299 deletions clients/amoled-cord.user.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "amoled-cord",
"version": "4.1.5",
"version": "4.1.6",
"description": "A basically pitch black theme for Discord. Lights out, baby!",
"author": "LuckFire",
"scripts": {
Expand Down
510 changes: 212 additions & 298 deletions src/amoled-cord.css
View file

Large diffs are not rendered by default.

152 changes: 72 additions & 80 deletions src/core/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ html.theme-dark .theme-light .root_f9a4c9,
--background-mobile-primary: var(--black) !important;
--background-mobile-secondary: var(--primary-830) !important;
--background-modifier-accent: hsl(var(--primary-760-hsl)/0.48) !important;
--background-modifier-accent-2: hsl(var(--primary-760-hsl)/0.48) !important;
--background-modifier-active: hsl(var(--primary-760-hsl)/0.48) !important;
--background-modifier-hover: hsl(var(--primary-760-hsl)/0.4) !important;
--background-modifier-selected: hsl(var(--primary-760-hsl)/0.6) !important;
Expand All @@ -84,6 +85,8 @@ html.theme-dark .theme-light .root_f9a4c9,
--bg-base-secondary: var(--primary-830) !important;
--bg-base-tertiary: var(--primary-860) !important;
--bg-mod-faint: var(--black) !important;
--bg-mod-strong: hsl(var(--primary-760-hsl)/0.54) !important;
--bg-mod-subtle: hsl(var(--primary-760-hsl)/0.48) !important;
--bg-surface-overlay: var(--primary-830) !important;
--bg-surface-raised: var(--black) !important;
--button-outline-primary-background: var(--primary-700) !important;
Expand All @@ -92,53 +95,36 @@ html.theme-dark .theme-light .root_f9a4c9,
--button-outline-primary-border: var(--primary-700) !important;
--button-outline-primary-border-active: var(--primary-600) !important;
--button-outline-primary-border-hover: var(--primary-630) !important;
--button-outline-primary-text: var(--white) !important;
--button-outline-primary-text-active: var(--white) !important;
--button-outline-primary-text-hover: var(--white) !important;
--button-secondary-background: var(--primary-700) !important;
--button-secondary-background-active: var(--primary-600) !important;
--button-secondary-background-disabled: var(--primary-700) !important;
--button-secondary-background-hover: var(--primary-630) !important;
--channel-icon: var(--primary-400) !important;
--card-primary-bg: var(--primary-800) !important;
--card-primary-pressed-bg: var(--primary-860) !important;
--card-secondary-bg: var(--primary-830) !important;
--card-secondary-pressed-bg: var(--primary-860) !important;
--channel-text-area-placeholder: var(--primary-400) !important;
--channels-default: var(--primary-360) !important;
--channeltextarea-background: var(--primary-830) !important;
--chat-background: var(--black) !important;
--chat-border: var(--primary-700) !important;
--chat-input-container-background: var(--primary-600) !important;
--deprecated-card-bg: hsl(var(--primary-700-hsl)/0.6) !important;
--deprecated-card-editable-bg: hsl(var(--primary-700-hsl)/0.3) !important;
--deprecated-quickswitcher-input-background: var(--primary-400) !important;
--deprecated-quickswitcher-input-placeholder: hsl(var(--white-hsl)/0.3) !important;
--deprecated-store-bg: var(--black) !important;
--deprecated-text-input-bg: var(--primary-700) !important;
--deprecated-text-input-border: hsl(var(--black-hsl)/0.3) !important;
--deprecated-text-input-border-disabled: var(--primary-700) !important;
--deprecated-text-input-border-hover: var(--primary-900) !important;
--deprecated-text-input-prefix: var(--primary-200) !important;
--header-primary: var(--primary-130) !important;
--header-secondary: var(--primary-345) !important;
--deprecated-text-input-bg: var(--primary-800) !important;
--deprecated-text-input-border-disabled: var(--primary-800) !important;
--home-background: var(--black) !important;
--home-card-resting-border: hsl(var(--transparent-hsl)/0) !important;
--input-background: var(--primary-800) !important;
--input-placeholder-text: var(--input-placeholder-text-dark) !important;
--interactive-active: var(--primary-130) !important;
--interactive-hover: var(--primary-230) !important;
--interactive-muted: var(--primary-500) !important;
--interactive-normal: var(--primary-345) !important;
--input-focused-border: hsl(var(--white-hsl)/0.03) !important;
--live-stage-tile-border: hsl(var(--primary-860-hsl)/0.6) !important;
--modal-background: var(--primary-860) !important;
--modal-footer-background: var(--primary-900) !important;
--scrollbar-auto-scrollbar-color-track: var(--primary-860) !important;
--scrollbar-auto-scrollbar-color-thumb: var(--primary-800) !important;
--scrollbar-auto-scrollbar-color-track: var(--primary-860) !important;
--scrollbar-auto-thumb: var(--primary-800) !important;
--scrollbar-auto-track: var(--primary-860) !important;
--scrollbar-thin-thumb: var(--primary-800) !important;
--scrollbar-thin-track: transparent !important;
--spoiler-hidden-background: var(--primary-700) !important;
--spoiler-revealed-background: var(--primary-660) !important;
--scrollbar-thin-track: hsl(var(--black-hsl)/0) !important;
--text-muted: var(--primary-345) !important;
--text-normal: var(--primary-300) !important;
--textbox-markdown-syntax: var(--primary-360) !important;

--elevation-stroke: 0 0 0 1px hsl(var(--primary-600-hsl)/0.15) !important;
--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;
Expand All @@ -147,10 +133,6 @@ html.theme-dark .theme-light .root_f9a4c9,

--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) {
Expand Down Expand Up @@ -211,6 +193,11 @@ html.theme-dark .theme-light .root_f9a4c9,
hsl(var(--primary-760-hsl) / 0.48) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.48) var(--theme-base-color-amount, 0%)
) !important;
--background-modifier-accent-2: color-mix(
in oklab,
hsl(var(--primary-760-hsl) / 0.48) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.48) var(--theme-base-color-amount, 0%)
) !important;
--background-modifier-active: color-mix(
in oklab,
hsl(var(--primary-760-hsl) / 0.48) 100%,
Expand Down Expand Up @@ -255,117 +242,122 @@ html.theme-dark .theme-light .root_f9a4c9,
in oklab,
var(--black) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
);
) !important;
--bg-base-secondary: color-mix(
in oklab,
var(--primary-830) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
);
) !important;
--bg-base-tertiary: color-mix(
in oklab,
var(--primary-860) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
);
) !important;
--bg-mod-faint: color-mix(
in oklab,
var(--black) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--bg-surface-overlay: color-mix(
--bg-mod-strong: color-mix(
in oklab,
var(--primary-830) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
hsl(var(--primary-760-hsl) / 0.54) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.54) var(--theme-base-color-amount, 0%)
) !important;
--bg-surface-raised: color-mix(
--bg-mod-subtle: color-mix(
in oklab,
var(--black) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
hsl(var(--primary-760-hsl) / 0.48) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.48) var(--theme-base-color-amount, 0%)
) !important;
--channeltextarea-background: color-mix(
--bg-surface-overlay: color-mix(
in oklab,
var(--primary-830) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--chat-background: color-mix(
--bg-surface-raised: color-mix(
in oklab,
var(--black) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--chat-border: color-mix(
--card-primary-bg: color-mix(
in oklab,
var(--primary-700) 100%,
var(--primary-800) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--chat-input-container-background: color-mix(
--card-primary-pressed-bg: color-mix(
in oklab,
var(--primary-600) 100%,
var(--primary-860) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-card-bg: color-mix(
--card-secondary-bg: color-mix(
in oklab,
hsl(var(--primary-700-hsl) / 0.6) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.6) var(--theme-base-color-amount, 0%)
var(--primary-830) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-card-editable-bg: color-mix(
--card-secondary-pressed-bg: color-mix(
in oklab,
hsl(var(--primary-700-hsl) / 0.3) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.3) var(--theme-base-color-amount, 0%)
var(--primary-860) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-quickswitcher-input-background: color-mix(
--channel-text-area-placeholder: color-mix(
in oklab,
var(--primary-400) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
var(--theme-text-color, black) var(--theme-text-color-amount, 0%)
) !important;
--deprecated-quickswitcher-input-placeholder: color-mix(
--channeltextarea-background: color-mix(
in oklab,
hsl(var(--white-hsl) / 0.3) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.3) var(--theme-base-color-amount, 0%)
var(--primary-830) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-store-bg: color-mix(
--chat-background: color-mix(
in oklab,
var(--black) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-text-input-bg: color-mix(
--chat-border: color-mix(
in oklab,
var(--primary-700) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-text-input-border: color-mix(
--chat-input-container-background: color-mix(
in oklab,
hsl(var(--black-hsl) / 0.3) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.3) var(--theme-base-color-amount, 0%)
var(--primary-600) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-text-input-border-disabled: color-mix(
--deprecated-store-bg: color-mix(
in oklab,
var(--primary-700) 100%,
var(--black) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-text-input-border-hover: color-mix(
--deprecated-text-input-bg: color-mix(
in oklab,
var(--primary-900) 100%,
var(--primary-800) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--deprecated-text-input-prefix: color-mix(
--deprecated-text-input-border-disabled: color-mix(
in oklab,
var(--primary-200) 100%,
var(--primary-800) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--home-background: color-mix(
in oklab,
var(--black) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--home-card-resting-border: color-mix(
in oklab,
hsl(var(--transparent-hsl) / 0) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0) var(--theme-base-color-amount, 0%)
) !important;
--input-background: color-mix(
in oklab,
var(--primary-800) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
) !important;
--input-focused-border: color-mix(
in oklab,
hsl(var(--white-hsl) / 0.03) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.03) var(--theme-base-color-amount, 0%)
) !important;
--live-stage-tile-border: color-mix(
in oklab,
hsl(var(--primary-860-hsl) / 0.6) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0.6) var(--theme-base-color-amount, 0%)
) !important;
--modal-background: color-mix(
in oklab,
var(--primary-860) 100%,
Expand Down Expand Up @@ -403,18 +395,18 @@ html.theme-dark .theme-light .root_f9a4c9,
) !important;
--scrollbar-thin-track: color-mix(
in oklab,
transparent,
hsl(var(--black-hsl) / 0) 100%,
hsl(var(--theme-base-color-hsl, 0 0% 0%) / 0) var(--theme-base-color-amount, 0%)
) !important;
--spoiler-hidden-background: color-mix(
--text-muted: color-mix(
in oklab,
var(--primary-700) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
var(--primary-345) 100%,
var(--theme-text-color, black) var(--theme-text-color-amount, 0%)
) !important;
--spoiler-revealed-background: color-mix(
--text-normal: color-mix(
in oklab,
var(--primary-660) 100%,
var(--theme-base-color, black) var(--theme-base-color-amount, 0%)
var(--primary-300) 100%,
var(--theme-text-color, black) var(--theme-text-color-amount, 0%)
) !important;
}
}
1 change: 0 additions & 1 deletion src/theme/app/_index.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@forward 'loading';
// @forward 'notice';
// @forward 'scrollerbar';
@forward 'toolbar';
10 changes: 0 additions & 10 deletions src/theme/app/_scrollerbar.scss
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/theme/chat/_container.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:is(.theme-dark, .theme-midnight) #app-mount .chat_a7d72e {
:is(.theme-dark, .theme-midnight) #app-mount .chat_a7d72e, .container_d1c246 {
.wrapper_f7e168 {
background-color: var(--background-tertiary);
}
Expand Down
37 changes: 17 additions & 20 deletions src/theme/chat/_forums.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
:is(.theme-dark, .theme-midnight) #app-mount .container_a6d69a {
.mainCard_a6d69a, .container_a03b48, .container_ddbb27, .container_a039eb {
// Theme cards and ignore hovers/active/open states on list/gallery views
.mainCard_a6d69a:not(
.container_a57509:is(.isOpen_a57509, :hover, :active),
.container_d331f1:is(.isOpen_d331f1, :active)
),
.container_a03b48,
.container_ddbb27,
.container_a039eb {
background-color: var(--background-tertiary);
}
.matchingPostsRow_a6d69a {
Expand All @@ -8,26 +15,16 @@
.loadingCard_a6d69a {
background-color: var(--background-tertiary);
}
.container_a57509 {
&:hover {
background-color: var(--background-modifier-hover);
}
&:active {
background-color: var(--background-modifier-active);
}
&.isOpen_a57509 {
background-color: var(--background-modifier-selected);
}
.textContentFooter_a57509 {
background: transparent;
}
.sortDropdown_a6d69a, .tag_a6d69a:not(.selected_c993da), .tagsButton_a6d69a {
background-color: var(--background-secondary);
}
.container_d331f1 {
&:active {
background-color: var(--background-modifier-active);
}
&.isOpen_d331f1 {
background-color: var(--background-modifier-selected);
.pill_c993da.clickable_c993da:not(.disabled_c993da):hover {
background-color: var(--background-secondary);
}
.textContentFooter_a57509 {
background: linear-gradient(to top, hsl(var(--black-hsl)/1), hsl(var(--black-hsl)/0.97) 36px, hsl(var(--black-hsl)/0.4));
&.noTags_a57509 {
background: linear-gradient(to top, hsl(var(--black-hsl)/1), hsl(var(--black-hsl)/0));
}
}
}
Loading

0 comments on commit 034efca

Please sign in to comment.