diff options
| author | John Molakvoæ <skjnldsv@protonmail.com> | 2022-04-28 11:30:36 +0200 |
|---|---|---|
| committer | John Molakvoæ <skjnldsv@protonmail.com> | 2022-04-28 18:12:29 +0200 |
| commit | 5e8a3eb66c312e46e35824ada4bb4e4642279912 (patch) | |
| tree | f5ad8f026c72cecd47ca56ef3baf709623ee73ff /apps | |
| parent | 7c5bb555e72dc2ebe285d46776dba735a4005a3f (diff) | |
| download | nextcloud-server-5e8a3eb66c312e46e35824ada4bb4e4642279912.tar.gz nextcloud-server-5e8a3eb66c312e46e35824ada4bb4e4642279912.zip | |
Fix header apps icons
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/theming/css/default.css | 4 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 4bd9fb13bb8..a2b4b4c7b60 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -52,6 +52,6 @@ --header-menu-item-height: 44px; --header-menu-profile-item-height: 66px; --breakpoint-mobile: 1024px; - --primary-invert-if-bright: unset; - --background-invert-if-dark: unset; + --primary-invert-if-bright: no; + --background-invert-if-dark: no; } diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 9c3dcf56faf..a98d9099d95 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -177,8 +177,11 @@ class DefaultTheme implements ITheme { // to be used for legacy reasons only. Use inline // svg with proper css variable instead or material // design icons. - '--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'unset', - '--background-invert-if-dark' => 'unset', + // ⚠️ Using 'no' as a value to make sure we specify an + // invalid one with no fallback. 'unset' could here fallback to some + // other theme with media queries + '--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'no', + '--background-invert-if-dark' => 'no', ]; // Register image variables only if custom-defined @@ -187,7 +190,7 @@ class DefaultTheme implements ITheme { if ($this->imageManager->hasImage($image)) { // If primary as background has been request, let's not define the background image if ($image === 'background' && $backgroundDeleted) { - $variables["--image-background-plain"] = true; + $variables["--image-background-plain"] = 'true'; continue; } else if ($image === 'background') { $variables['--image-background-size'] = 'cover'; @@ -197,7 +200,7 @@ class DefaultTheme implements ITheme { } if ($hasCustomLogoHeader) { - $variables["--image-logoheader-custom"] = true; + $variables["--image-logoheader-custom"] = 'true'; } return $variables; |