diff options
| author | Simon L <szaimen@e.mail.de> | 2023-11-30 11:09:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 11:09:58 +0100 |
| commit | 0561b11a4eaf3687956abd9cb73a305c198211ed (patch) | |
| tree | 42b1bedbe9e09bea0f65757be5a79abaa1003a48 /apps | |
| parent | a1434af01e787ede6231b895d0d6056654b41342 (diff) | |
| parent | 32ec76e8d913fa871d7e313610209da52cecc638 (diff) | |
| download | nextcloud-server-0561b11a4eaf3687956abd9cb73a305c198211ed.tar.gz nextcloud-server-0561b11a4eaf3687956abd9cb73a305c198211ed.zip | |
Merge pull request #41920 from nextcloud/backport/41855/stable28
[stable28] fix(theming): Fix color inverted icons based on theming and dark mode
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/src/views/Navigation.vue | 4 | ||||
| -rw-r--r-- | apps/theming/css/default.css | 1 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/CommonThemeTrait.php | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/apps/files/src/views/Navigation.vue b/apps/files/src/views/Navigation.vue index 7544c8991a0..b9432ae923a 100644 --- a/apps/files/src/views/Navigation.vue +++ b/apps/files/src/views/Navigation.vue @@ -245,6 +245,10 @@ export default { background-position: center; } +.app-navigation::v-deep .app-navigation-entry.active .button-vue.icon-collapse:not(:hover) { + color: var(--color-primary-element-text); +} + .app-navigation > ul.app-navigation__list { // Use flex gap value for more elegant spacing padding-bottom: var(--default-grid-baseline, 4px); diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index 3e36e03f894..190ec0fb9cf 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -68,6 +68,7 @@ --background-invert-if-bright: invert(100%); --background-image-invert-if-bright: no; --primary-invert-if-bright: no; + --primary-invert-if-dark: invert(100%); --color-primary: #00679e; --color-primary-default: #0082c9; --color-primary-text: #ffffff; diff --git a/apps/theming/lib/Themes/CommonThemeTrait.php b/apps/theming/lib/Themes/CommonThemeTrait.php index 6f2d31ff6b1..5a389c8533f 100644 --- a/apps/theming/lib/Themes/CommonThemeTrait.php +++ b/apps/theming/lib/Themes/CommonThemeTrait.php @@ -54,6 +54,7 @@ trait CommonThemeTrait { // 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', + '--primary-invert-if-dark' => $this->util->invertTextColor($this->primaryColor) ? 'no' : 'invert(100%)', '--color-primary' => $this->primaryColor, '--color-primary-default' => $this->defaultPrimaryColor, |