upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #33564 from nextcloud/fix/theming-selector

Browse source
This commit is contained in:
John Molakvoæ 2022-08-17 15:19:46 +02:00 committed by GitHub
commit e32314e129
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/theming/lib/Controller/ThemingController.php
View file

@ -331,7 +331,7 @@ class ThemingController extends Controller {
} else {
// If not set, we'll rely on the body class
$compiler = new Compiler();
$compiledCss = $compiler->compileString("body[data-theme-$themeId] { $variables $customCss }");
$compiledCss = $compiler->compileString("[data-theme-$themeId] { $variables $customCss }");
$css = $compiledCss->getCss();;
}

4
core/src/icons.js
View file

@ -322,12 +322,12 @@ css += generateVariablesAliases(true)
css += '}}'
// DARK THEME
css += 'body[data-themes*=light] {'
css += '[data-themes*=light] {'
css += generateVariablesAliases()
css += '}'
// DARK THEME
css += 'body[data-themes*=dark] {'
css += '[data-themes*=dark] {'
css += generateVariablesAliases(true)
css += '}'

4
dist/icons.css vendored
View file

@ -1585,7 +1585,7 @@ body .nav-icon-systemtagsfilter {
--icon-view-previous-dark: var(--original-icon-view-previous-white);
}
}
body[data-themes*=light] {
[data-themes*=light] {
--icon-add-dark: var(--original-icon-add-dark);
--icon-add-white: var(--original-icon-add-white);
--icon-address-dark: var(--original-icon-address-dark);
@ -1794,7 +1794,7 @@ body[data-themes*=light] {
--icon-view-previous-white: var(--original-icon-view-previous-white);
}
body[data-themes*=dark] {
[data-themes*=dark] {
--icon-add-white: var(--original-icon-add-dark);
--icon-add-dark: var(--original-icon-add-white);
--icon-address-white: var(--original-icon-address-dark);