Skip to content

Revert "First first run wizzard" #33556

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 3 commits into from
Aug 16, 2022
Merged

Revert "First first run wizzard" #33556

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c6be33
Revert "First first run wizzard"
skjnldsv Aug 16, 2022
0ea23ca
Revert "Fix unit tests for the theming app"
skjnldsv Aug 16, 2022
5f3229e
Automatically enable plain background if primary colour is set
skjnldsv Aug 16, 2022
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
Revert "First first run wizzard" 
This reverts commit ba3f533.
  • Loading branch information
@skjnldsv
skjnldsv committed Aug 16, 2022
commit 4c6be330ef927c2f9881fc54b2e090ec254f3af6
17 changes: 9 additions & 8 deletions apps/theming/lib/Themes/DefaultTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,17 @@ public function getCSSVariables(): array {

$backgroundDeleted = $this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor';
foreach(['logo', 'logoheader', 'favicon', 'background'] as $image) {
// If primary as background has been request, let's not define the background image
if ($image === 'background' && $backgroundDeleted) {
$variables["--image-background-plain"] = 'true';
continue;
} else if ($image === 'background') {
$variables['--image-background-size'] = 'cover';
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';
continue;
} else if ($image === 'background') {
$variables['--image-background-size'] = 'cover';
}
$variables["--image-$image"] = "url('".$this->imageManager->getImageUrl($image)."')";
}
$variables["--image-$image"] = "url('".$this->imageManager->getImageUrl($image)."')";
}
$variables["--image-login-background"] = $variables["--image-background"];

if ($hasCustomLogoHeader) {
$variables["--image-logoheader-custom"] = 'true';
Expand Down