|
@@ -89,7 +89,7 @@ discard block |
|
|
block discarded – undo |
|
89
|
89
|
$variables = []; |
|
90
|
90
|
|
|
91
|
91
|
// Default last fallback values |
|
92
|
|
- $variables['--image-background-default'] = "url('" . $this->themingDefaults->getBackground() . "')"; |
|
|
92
|
+ $variables['--image-background-default'] = "url('".$this->themingDefaults->getBackground()."')"; |
|
93
|
93
|
$variables['--color-background-plain'] = $this->defaultPrimaryColor; |
|
94
|
94
|
|
|
95
|
95
|
// If primary as background has been request or if we have a custom primary colour |
|
@@ -106,7 +106,7 @@ discard block |
|
|
block discarded – undo |
|
106
|
106
|
if ($this->imageManager->hasImage($image)) { |
|
107
|
107
|
$imageUrl = $this->imageManager->getImageUrl($image); |
|
108
|
108
|
// --image-background is overridden by user theming |
|
109
|
|
- $variables["--image-$image"] = "url('" . $imageUrl . "')"; |
|
|
109
|
+ $variables["--image-$image"] = "url('".$imageUrl."')"; |
|
110
|
110
|
} |
|
111
|
111
|
} |
|
112
|
112
|
|
|
@@ -126,7 +126,7 @@ discard block |
|
|
block discarded – undo |
|
126
|
126
|
&& !$this->themingDefaults->isUserThemingDisabled() |
|
127
|
127
|
&& $this->appManager->isEnabledForUser(Application::APP_ID)) { |
|
128
|
128
|
$backgroundImage = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT); |
|
129
|
|
- $currentVersion = (int)$this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0'); |
|
|
129
|
+ $currentVersion = (int) $this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0'); |
|
130
|
130
|
$isPrimaryBright = $this->util->invertTextColor($this->primaryColor); |
|
131
|
131
|
|
|
132
|
132
|
// The user removed the background |
|
@@ -141,9 +141,9 @@ discard block |
|
|
block discarded – undo |
|
141
|
141
|
|
|
142
|
142
|
// The user uploaded a custom background |
|
143
|
143
|
if ($backgroundImage === BackgroundService::BACKGROUND_CUSTOM) { |
|
144
|
|
- $cacheBuster = substr(sha1($user->getUID() . '_' . $currentVersion), 0, 8); |
|
|
144
|
+ $cacheBuster = substr(sha1($user->getUID().'_'.$currentVersion), 0, 8); |
|
145
|
145
|
return [ |
|
146
|
|
- '--image-background' => "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "?v=$cacheBuster')", |
|
|
146
|
+ '--image-background' => "url('".$this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground')."?v=$cacheBuster')", |
|
147
|
147
|
'--color-background-plain' => $this->themingDefaults->getColorPrimary(), |
|
148
|
148
|
]; |
|
149
|
149
|
} |
|
@@ -151,7 +151,7 @@ discard block |
|
|
block discarded – undo |
|
151
|
151
|
// The user picked a shipped background |
|
152
|
152
|
if (isset(BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage])) { |
|
153
|
153
|
return [ |
|
154
|
|
- '--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')", |
|
|
154
|
+ '--image-background' => "url('".$this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage")."')", |
|
155
|
155
|
'--color-background-plain' => $this->themingDefaults->getColorPrimary(), |
|
156
|
156
|
'--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no', |
|
157
|
157
|
]; |
nextcloud /
server
