Skip to content

fix(theming): unwanted variables and colours calc fixes #38063

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 6 commits into from
May 5, 2023
Merged

fix(theming): unwanted variables and colours calc fixes #38063

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6ebb0d
fix(theming): calc primary element from current main background
skjnldsv May 4, 2023
74461a9
fix(theming): ensure image background is not defined if admin disable…
skjnldsv May 4, 2023
4d3b49b
fix(theming): replace `color-primary-text-dark` with `color-primary-e…
skjnldsv May 4, 2023
9ab7a19
fix(theming): remove unnecessary `color-primary-element-default-hover…
skjnldsv May 4, 2023
b603a3e
fix(theming): do not show the image default background on user themin…
skjnldsv May 4, 2023
4c71d8f
fix(theming): replace elementColor dark value with better contrast `#…
skjnldsv May 4, 2023
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
Prev Previous commit
fix(theming): replace elementColor dark value with better contrast `#… 
…8c8c8c`

Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed May 4, 2023
commit 4c71d8f8a418c1b2a2a1679b1f0fb2b8e221f651
6 changes: 2 additions & 4 deletions apps/theming/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,12 @@
--color-primary-light: #e5f0f5;
--color-primary-light-text: #002a41;
--color-primary-light-hover: #dbe5ea;
--color-primary-element-text-dark: #ededed;
--color-primary-element: #006aa3;
--color-primary-element-default-hover: #329bd3;
--color-primary-element-text: #ffffff;
--color-primary-element-hover: #3287b5;
--color-primary-element-text: #ffffff;
--color-primary-element-light: #e5f0f5;
--color-primary-element-light-text: #002a41;
--color-primary-element-light-hover: #dbe5ea;
--color-primary-element-light-text: #002a41;
--color-primary-element-text-dark: #ededed;
--gradient-primary-background: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%);
--image-background-default: url('/apps/theming/img/background/kamil-porembinski-clouds.jpg');
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/lib/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function elementColor($color, bool $brightBackground = true) {

if (!$brightBackground && $luminance < 0.2) {
// If the color is too dark in dark mode, we fall back to a brighter gray
return '#555555';
return '#8c8c8c';
}

return $color;
Expand Down
4 changes: 2 additions & 2 deletions apps/theming/tests/CapabilitiesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function dataGetCapabilities() {
'color-text' => '#ffffff',
'color-element' => '#000000',
'color-element-bright' => '#000000',
'color-element-dark' => '#555555',
'color-element-dark' => '#8c8c8c',
'logo' => 'http://localhost/logo5',
'background' => '#000000',
'background-plain' => true,
Expand All @@ -127,7 +127,7 @@ public function dataGetCapabilities() {
'color-text' => '#ffffff',
'color-element' => '#000000',
'color-element-bright' => '#000000',
'color-element-dark' => '#555555',
'color-element-dark' => '#8c8c8c',
'logo' => 'http://localhost/logo5',
'background' => '#000000',
'background-plain' => true,
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/tests/UtilTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function testElementColorDefault() {

public function testElementColorOnDarkBackground() {
$elementColor = $this->util->elementColor("#000000", false);
$this->assertEquals('#555555', $elementColor);
$this->assertEquals('#8c8c8c', $elementColor);
}

public function testElementColorOnBrightBackground() {
Expand Down