Skip to content

[stable28] Fix header menu icon color #45552

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
susnux merged 2 commits into from
May 29, 2024
Merged

[stable28] Fix header menu icon color #45552

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59b85b8
fix(theming): When selected a background image make header color inde…
susnux May 21, 2024
b97cd77
chore: Compile assets
susnux May 21, 2024
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
Next Next commit
fix(theming): When selected a background image make header color inde… 
…pendent of primary color

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux @backportbot
susnux authored and backportbot[bot] committed May 28, 2024
commit 59b85b811b131a4cf7a3555d1bd466e2990010ea
1 change: 1 addition & 0 deletions apps/theming/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
--background-invert-if-dark: no;
--background-invert-if-bright: invert(100%);
--background-image-invert-if-bright: no;
--background-image-color-text: #ffffff;
--primary-invert-if-bright: no;
--primary-invert-if-dark: invert(100%);
--color-primary: #00679e;
Expand Down
4 changes: 4 additions & 0 deletions apps/theming/lib/Themes/CommonThemeTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ protected function generateGlobalBackgroundVariables(): array {
$variables['--image-background'] = 'no';
// If no background image is set, we need to check against the shown primary colour
$variables['--background-image-invert-if-bright'] = $isPrimaryBright ? 'invert(100%)' : 'no';
$variables['--background-image-color-text'] = $isPrimaryBright ? '#000000' : '#ffffff';
}

if ($hasCustomLogoHeader) {
Expand Down Expand Up @@ -143,6 +144,7 @@ protected function generateUserBackgroundVariables(): array {
'--color-background-plain' => $this->primaryColor,
// If no background image is set, we need to check against the shown primary colour
'--background-image-invert-if-bright' => $isPrimaryBright ? 'invert(100%)' : 'no',
'--background-image-color-text' => $isPrimaryBright ? '#000000' : '#ffffff',
];
}

Expand All @@ -161,6 +163,7 @@ protected function generateUserBackgroundVariables(): array {
// --image-background is not defined in this case
'--color-background-plain' => $this->primaryColor,
'--background-image-invert-if-bright' => $isPrimaryBright ? 'invert(100%)' : 'no',
'--background-image-color-text' => $isPrimaryBright ? '#000000' : '#ffffff',
];
}

Expand All @@ -170,6 +173,7 @@ protected function generateUserBackgroundVariables(): array {
'--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')",
'--color-background-plain' => $this->primaryColor,
'--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no',
'--background-image-color-text' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? '#000000' : '#ffffff',
];
}
}
Expand Down
1 change: 1 addition & 0 deletions apps/theming/lib/Themes/DefaultTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ public function getCSSVariables(): array {
'--background-invert-if-dark' => 'no',
'--background-invert-if-bright' => 'invert(100%)',
'--background-image-invert-if-bright' => 'no',
'--background-image-color-text' => '#ffffff',
];

// Primary variables
Expand Down
1 change: 1 addition & 0 deletions core/css/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
#header {
/* Header menu */
$header-menu-entry-height: 44px;
--color-primary-text: var(--background-image-color-text, #ffffff);

.header-right > div > .menu {
background-color: var(--color-main-background);
Expand Down