Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weimann <mail@michael-weimann.eu>2018-08-28 16:58:27 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-10-02 09:37:54 +0300
commitd855c38e078f2cd0bec86d5a20fc2f448799433b (patch)
tree68f4adfc1ff3a97273fbc47e9584d922e70c4b61 /apps/theming/lib/ThemingDefaults.php
parent92049c3ceb4121c6e424e8ba902cc6ebc663c690 (diff)
Moves the logo files to logo
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
Diffstat (limited to 'apps/theming/lib/ThemingDefaults.php')
-rw-r--r--apps/theming/lib/ThemingDefaults.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 5a14e8a7903..7a26b46516f 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -217,9 +217,9 @@ class ThemingDefaults extends \OC_Defaults {
if(!$logo || !$logoExists) {
if($useSvg) {
- $logo = $this->urlGenerator->imagePath('core', 'logo.svg');
+ $logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
} else {
- $logo = $this->urlGenerator->imagePath('core', 'logo.png');
+ $logo = $this->urlGenerator->imagePath('core', 'logo/logo.png');
}
return $logo . '?v=' . $cacheBusterCounter;
}
@@ -312,9 +312,9 @@ class ThemingDefaults extends \OC_Defaults {
$primaryColor = $this->getColorPrimary();
$luminance = $this->util->calculateLuminance($primaryColor);
if ($logoMime === '' & $luminance > 0.8) {
- return $this->imageManager->getImageUrl('logo-blue');
+ return $this->imageManager->getImageUrl('logo-blue', true);
} else {
- return $this->imageManager->getImageUrl('logo');
+ return $this->imageManager->getImageUrl('logo', true);
}
}