diff options
Diffstat (limited to 'apps/theming/lib')
| -rw-r--r-- | apps/theming/lib/ImageManager.php | 7 | ||||
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php index 6a42c22aba5..46598673f14 100644 --- a/apps/theming/lib/ImageManager.php +++ b/apps/theming/lib/ImageManager.php @@ -80,12 +80,13 @@ class ImageManager { } switch ($key) { + case 'logo-blue': + // the blue logo is only available as svg + return $this->urlGenerator->getAbsoluteURL('svg/core/logo/logo/0082C9') . '?v=' . $cacheBusterCounter; case 'logo': case 'logoheader': case 'favicon': - return $this->urlGenerator->imagePath('core', 'logo.png') . '?v=' . $cacheBusterCounter; - case 'logo-blue': - return $this->urlGenerator->imagePath('core', 'logo-blue.png') . '?v=' . $cacheBusterCounter; + return $this->urlGenerator->imagePath('core', 'logo/logo.png') . '?v=' . $cacheBusterCounter; case 'background': return $this->urlGenerator->imagePath('core', 'background.png') . '?v=' . $cacheBusterCounter; } 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); } } |