Skip to content

Fix dark theme primary mix #32146

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
skjnldsv merged 2 commits into from
Apr 26, 2022
Merged

Fix dark theme primary mix #32146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9b77bc
Fix dark theme primary mix
skjnldsv Apr 26, 2022
4dc96dd
Fix mix factor
skjnldsv Apr 26, 2022
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
16 changes: 8 additions & 8 deletions apps/theming/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:root {
:root {
--color-main-background: #ffffff;
--color-main-background-rgb: 255,255,255;
--color-main-background-translucent: rgba(var(--color-main-background-rgb), .97);
Expand All @@ -10,25 +10,25 @@
--color-placeholder-dark: #cccccc;
--color-primary: #0082c9;
--color-primary-text: #ffffff;
--color-primary-hover: #198ece;
--color-primary-light: #72bae1;
--color-primary-hover: #329bd3;
--color-primary-light: #e5f2f9;
--color-primary-light-text: #0082c9;
--color-primary-light-hover: #0f567d;
--color-primary-light-hover: #1e2b32;
--color-primary-text-dark: #ededed;
--color-primary-element: #0082c9;
--color-primary-element-hover: #198ece;
--color-primary-element-light: #17adff;
--color-primary-element-lighter: #6cb7df;
--color-primary-element-lighter: #d8ecf6;
--color-main-text: #222222;
--color-text-maxcontrast: #767676;
--color-text-light: #222222;
--color-text-lighter: #767676;
--color-error: #e9322d;
--color-error-hover: #eb4642;
--color-error-hover: #ed5a56;
--color-warning: #eca700;
--color-warning-hover: #edaf19;
--color-warning-hover: #efb832;
--color-success: #46ba61;
--color-success-hover: #58c070;
--color-success-hover: #6ac780;
--color-loading-light: #cccccc;
--color-loading-dark: #444444;
--color-box-shadow-rgb: 77,77,77;
Expand Down
5 changes: 5 additions & 0 deletions apps/theming/lib/Themes/DarkTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ public function getCSSVariables(): array {
'--color-placeholder-light' => $this->util->lighten($colorMainBackground, 10),
'--color-placeholder-dark' => $this->util->lighten($colorMainBackground, 20),

'--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60),
'--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, -80),
'--color-primary-element-hover' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 80),
'--color-primary-element-lighter' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, -70),

'--color-text-maxcontrast' => $this->util->darken($colorMainText, 30),
'--color-text-light' => $this->util->darken($colorMainText, 10),
'--color-text-lighter' => $this->util->darken($colorMainText, 20),
Expand Down
14 changes: 7 additions & 7 deletions apps/theming/lib/Themes/DefaultTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,16 @@ public function getCSSVariables(): array {
// primary related colours
'--color-primary' => $this->primaryColor,
'--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff',
'--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 80),
'--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, 10),
'--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60),
'--color-primary-light' => $this->util->mix($this->primaryColor, $colorMainBackground, -80),
'--color-primary-light-text' => $this->primaryColor,
'--color-primary-light-hover' => $this->util->mix($this->primaryColor, $colorMainText, 10),
'--color-primary-light-hover' => $this->util->mix($this->primaryColor, $colorMainText, -80),
'--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7),
// used for buttons, inputs...
'--color-primary-element' => $this->util->elementColor($this->primaryColor),
'--color-primary-element-hover' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 80),
'--color-primary-element-light' => $this->util->lighten($this->util->elementColor($this->primaryColor), 15),
'--color-primary-element-lighter' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, 15),
'--color-primary-element-lighter' => $this->util->mix($this->util->elementColor($this->primaryColor), $colorMainBackground, -70),

// max contrast for WCAG compliance
'--color-main-text' => $colorMainText,
Expand All @@ -127,11 +127,11 @@ public function getCSSVariables(): array {

// info/warning/success feedback colours
'--color-error' => '#e9322d',
'--color-error-hover' => $this->util->mix('#e9322d', $colorMainBackground, 80),
'--color-error-hover' => $this->util->mix('#e9322d', $colorMainBackground, 60),
'--color-warning' => '#eca700',
'--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 80),
'--color-warning-hover' => $this->util->mix('#eca700', $colorMainBackground, 60),
'--color-success' => '#46ba61',
'--color-success-hover' => $this->util->mix('#46ba61', $colorMainBackground, 80),
'--color-success-hover' => $this->util->mix('#46ba61', $colorMainBackground, 60),

// used for the icon loading animation
'--color-loading-light' => '#cccccc',
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/tests/Themes/DefaultThemeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public function testThemindDisabledFallbackCss() {
$variables .= " $variable: $value;" . PHP_EOL;
};

$css = ":root { " . PHP_EOL . "$variables}" . PHP_EOL;
$css = ":root {" . PHP_EOL . "$variables}" . PHP_EOL;
$fallbackCss = file_get_contents(__DIR__ . '/../../css/default.css');

$this->assertEquals($css, $fallbackCss);
Expand Down
1 change: 0 additions & 1 deletion core/css/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ kbd {
&,
> a {
background-color: var(--color-primary-light);
color: var(--color-primary-text);
}
}

Expand Down