From 92049c3ceb4121c6e424e8ba902cc6ebc663c690 Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Tue, 28 Aug 2018 12:01:32 +0200
Subject: [PATCH 1/6] Switches the default logo color depending on the primary
 color

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
 apps/theming/css/theming.scss              |  11 +--
 apps/theming/lib/ImageManager.php          |   2 +
 apps/theming/lib/ThemingDefaults.php       |  20 +++++-
 apps/theming/tests/ThemingDefaultsTest.php |  67 +++++++++++++++++-
 core/img/logo-blue.png                     | Bin 0 -> 6112 bytes
 core/img/logo-blue.svg                     |  76 +++++++++++++++++++++
 6 files changed, 168 insertions(+), 8 deletions(-)
 create mode 100644 core/img/logo-blue.png
 create mode 100644 core/img/logo-blue.svg

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index f12ce4d907..b1b8896d0c 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -98,20 +98,21 @@
 	background-image: url(./img/core/filetypes/folder-drag-accept.svg?v=#{$theming-cachebuster}) !important;
 }
 
+#theming-preview-logo,
+#header .logo {
+	background-image: $image-logo;
+}
+
 /* override styles for login screen in guest.css */
 @if variable_exists('theming-logo-mime') and $theming-logo-mime != '' {
 	#theming-preview-logo,
 	#header .logo {
-		background-image: $image-logo;
 		background-size: contain;
 	}
+
 	#body-login #header .logo {
 		margin-bottom: 22px;
 	}
-} @else {
-	#theming-preview-logo {
-		background-image: $image-logo;
-	}
 }
 
 @if variable_exists('theming-background-mime') and $theming-background-mime != ''  {
diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php
index dfbdb582da..6a42c22aba 100644
--- a/apps/theming/lib/ImageManager.php
+++ b/apps/theming/lib/ImageManager.php
@@ -84,6 +84,8 @@ class ImageManager {
 			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;
 			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 1df7a9f17b..5a14e8a790 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -275,7 +275,7 @@ class ThemingDefaults extends \OC_Defaults {
 			'theming-favicon-mime' => "'" . $this->config->getAppValue('theming', 'faviconMime') . "'"
 		];
 
-		$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
+		$variables['image-logo'] = "url('". $this->getLogoUrl() ."')";
 		$variables['image-logoheader'] = "'".$this->imageManager->getImageUrl('logoheader')."'";
 		$variables['image-favicon'] = "'".$this->imageManager->getImageUrl('favicon')."'";
 		$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
@@ -300,6 +300,24 @@ class ThemingDefaults extends \OC_Defaults {
 		return $variables;
 	}
 
+	/**
+	 * Returns the logo url.
+	 * If there is a custom logo, it just returns it.
+	 * For the default logo it returns the white or blue one depending on the color luminance.
+	 *
+	 * @return string
+	 */
+	private function getLogoUrl() {
+		$logoMime = $this->config->getAppValue('theming', 'logoMime');
+		$primaryColor = $this->getColorPrimary();
+		$luminance = $this->util->calculateLuminance($primaryColor);
+		if ($logoMime === '' & $luminance > 0.8) {
+			return $this->imageManager->getImageUrl('logo-blue');
+		} else {
+			return $this->imageManager->getImageUrl('logo');
+		}
+	}
+
 	/**
 	 * Check if the image should be replaced by the theming app
 	 * and return the new image location then
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index 5d075709dc..fc3a737c3c 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -632,6 +632,66 @@ class ThemingDefaultsTest extends TestCase {
 		$this->assertEquals(['foo'=>'bar'], $this->template->getScssVariables());
 	}
 
+	/**
+	 * Provides test data for the get logo scss variable test.
+	 *
+	 * @return array
+	 */
+	public function provideTestGetImageLogoScssVariableTestData(): array {
+		return [
+			// default logo
+			['', '#000000', 0.0, 'logo'],
+			['', '#cccccc', 0.8, 'logo'],
+			['', '#dddddd', 0.81, 'logo-blue'],
+			['', '#ffffff', 1.0, 'logo-blue'],
+
+			// custom logo
+			['image/png', '#000000', 0.0, 'logo'],
+			['image/png', '#cccccc', 0.8, 'logo'],
+			['image/png', '#dddddd', 0.81, 'logo'],
+			['image/png', '#ffffff', 1.0, 'logo'],
+		];
+	}
+
+	/**
+	 * Tests chat the logo url scss variable has the expected value
+	 * depending on color and custom logo presence.
+	 *
+	 * @dataProvider provideTestGetImageLogoScssVariableTestData
+	 * @param string $themingLogoMime The custom logo mime type
+	 * @param string $primaryColor The primary theme color
+	 * @param float $luminance The calculated luminance
+	 * @param string $expected The expected requested logo
+	 * @return void
+	 */
+	public function testGetImageLogoScssVariable(
+		string $themingLogoMime,
+		string $primaryColor,
+		float $luminance,
+		string $expected
+	) {
+		$this->config->expects($this->at(5))
+			->method('getAppValue')
+			->with('theming', 'logoMime')
+			->willReturn($themingLogoMime);
+		$this->config->expects($this->at(6))
+			->method('getAppValue')
+			->with('theming', 'color', $this->defaults->getColorPrimary())
+			->willReturn($primaryColor);
+
+		$this->util
+			->method('calculateLuminance')
+			->with($primaryColor)
+			->willReturn($luminance);
+
+		$this->imageManager->expects($this->at(0))
+			->method('getImageUrl')
+			->with($expected)
+			->willReturn('custom-logo?v=0');
+
+		$this->template->getScssVariables();
+	}
+
 	public function testGetScssVariables() {
 		$this->config->expects($this->at(0))->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('0');
 		$this->config->expects($this->at(1))->method('getAppValue')->with('theming', 'logoMime', false)->willReturn('jpeg');
@@ -639,10 +699,13 @@ class ThemingDefaultsTest extends TestCase {
 		$this->config->expects($this->at(3))->method('getAppValue')->with('theming', 'logoheaderMime', false)->willReturn('jpeg');
 		$this->config->expects($this->at(4))->method('getAppValue')->with('theming', 'faviconMime', false)->willReturn('jpeg');
 
-		$this->config->expects($this->at(5))->method('getAppValue')->with('theming', 'color', null)->willReturn($this->defaults->getColorPrimary());
+		$this->config->expects($this->at(5))->method('getAppValue')->with('theming', 'logoMime', false)->willReturn('jpeg');
 		$this->config->expects($this->at(6))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
-		$this->config->expects($this->at(7))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
+
+		$this->config->expects($this->at(7))->method('getAppValue')->with('theming', 'color', null)->willReturn($this->defaults->getColorPrimary());
 		$this->config->expects($this->at(8))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
+		$this->config->expects($this->at(9))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
+		$this->config->expects($this->at(10))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
 
 		$this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false);
 		$this->util->expects($this->any())->method('elementColor')->with($this->defaults->getColorPrimary())->willReturn('#aaaaaa');
diff --git a/core/img/logo-blue.png b/core/img/logo-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1b7352b3f670df14fbc7ddc841744bda21f848e
GIT binary patch
literal 6112
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

literal 0
HcmV?d00001

diff --git a/core/img/logo-blue.svg b/core/img/logo-blue.svg
new file mode 100644
index 0000000000..66b17330d1
--- /dev/null
+++ b/core/img/logo-blue.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   height="128"
+   width="256"
+   viewBox="0 0 256 128"
+   id="svg10"
+   sodipodi:docname="logo-blue.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="1.4296875"
+     inkscape:cx="128"
+     inkscape:cy="64"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <g
+     stroke="#fff"
+     stroke-width="22"
+     fill="none"
+     id="g8"
+     style="stroke:#0082c9;stroke-opacity:1">
+    <circle
+       cy="64"
+       cx="40"
+       r="26"
+       id="circle2"
+       style="stroke:#0082c9;stroke-opacity:1" />
+    <circle
+       cy="64"
+       cx="216"
+       r="26"
+       id="circle4"
+       style="stroke:#0082c9;stroke-opacity:1" />
+    <circle
+       cy="64"
+       cx="128"
+       r="46"
+       id="circle6"
+       style="stroke:#0082c9;stroke-opacity:1" />
+  </g>
+</svg>

From d855c38e078f2cd0bec86d5a20fc2f448799433b Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Tue, 28 Aug 2018 15:58:27 +0200
Subject: [PATCH 2/6] Moves the logo files to logo

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
 apps/theming/lib/ImageManager.php              |   7 ++++---
 apps/theming/lib/ThemingDefaults.php           |   8 ++++----
 apps/theming/tests/ImageManagerTest.php        |   6 +++---
 apps/theming/tests/ThemingDefaultsTest.php     |   4 ++--
 core/Controller/LoginController.php            |   2 +-
 core/Controller/SvgController.php              |   5 ++---
 core/css/guest.css                             |   2 +-
 core/img/logo-blue.png                         | Bin 6112 -> 0 bytes
 core/img/logo.svg                              |   1 -
 core/img/{ => logo}/logo-icon-175px.png        | Bin
 core/img/{ => logo}/logo-mail.png              | Bin
 core/img/{ => logo}/logo.png                   | Bin
 core/img/{logo-blue.svg => logo/logo.svg}      |  17 ++++++-----------
 lib/private/legacy/defaults.php                |   4 ++--
 tests/lib/Files/Cache/ScannerTest.php          |   4 ++--
 tests/lib/Files/Cache/UpdaterLegacyTest.php    |   8 ++++----
 tests/lib/Files/Cache/WatcherTest.php          |   2 +-
 .../lib/Files/ObjectStore/NoopScannerTest.php  |   2 +-
 tests/lib/Files/ViewTest.php                   |   4 ++--
 19 files changed, 35 insertions(+), 41 deletions(-)
 delete mode 100644 core/img/logo-blue.png
 delete mode 100644 core/img/logo.svg
 rename core/img/{ => logo}/logo-icon-175px.png (100%)
 rename core/img/{ => logo}/logo-mail.png (100%)
 rename core/img/{ => logo}/logo.png (100%)
 rename core/img/{logo-blue.svg => logo/logo.svg} (82%)

diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php
index 6a42c22aba..46598673f1 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 5a14e8a790..7a26b46516 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);
 		}
 	}
 
diff --git a/apps/theming/tests/ImageManagerTest.php b/apps/theming/tests/ImageManagerTest.php
index 38f5fb0496..fc9eac7f14 100644
--- a/apps/theming/tests/ImageManagerTest.php
+++ b/apps/theming/tests/ImageManagerTest.php
@@ -144,9 +144,9 @@ class ImageManagerTest extends TestCase {
 			->willReturnOnConsecutiveCalls(0, false);
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
-			->with('core', 'logo.png')
-			->willReturn('logo.png');
-		$this->assertEquals('logo.png?v=0', $this->imageManager->getImageUrl('logo'));
+			->with('core', 'logo/logo.png')
+			->willReturn('logo/logo.png');
+		$this->assertEquals('logo/logo.png?v=0', $this->imageManager->getImageUrl('logo'));
 	}
 
 	public function testGetImageUrlAbsolute() {
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index fc3a737c3c..3da39fbbf2 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -593,11 +593,11 @@ class ThemingDefaultsTest extends TestCase {
 	}
 
 	public function testGetLogoDefaultWithSvg() {
-		$this->getLogoHelper('logo.svg', true);
+		$this->getLogoHelper('logo/logo.svg', true);
 	}
 
 	public function testGetLogoDefaultWithoutSvg() {
-		$this->getLogoHelper('logo.png', false);
+		$this->getLogoHelper('logo/logo.png', false);
 	}
 
 	public function testGetLogoCustom() {
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 09b6fe5438..fed97177ee 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -194,7 +194,7 @@ class LoginController extends Controller {
 		Util::addHeader('meta', ['property' => 'og:site_name', 'content' => Util::sanitizeHTML($this->defaults->getName())]);
 		Util::addHeader('meta', ['property' => 'og:url', 'content' => $this->urlGenerator->getAbsoluteURL('/')]);
 		Util::addHeader('meta', ['property' => 'og:type', 'content' => 'website']);
-		Util::addHeader('meta', ['property' => 'og:image', 'content' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core','favicon-touch.png'))]);
+		Util::addHeader('meta', ['property' => 'og:image', 'content' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-touch.png'))]);
 
 		return new TemplateResponse(
 			$this->appName, 'login', $parameters, 'guest'
diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php
index 1fad9c39c3..f0fc1dac4d 100644
--- a/core/Controller/SvgController.php
+++ b/core/Controller/SvgController.php
@@ -91,7 +91,7 @@ class SvgController extends Controller {
 
 		$appRootPath = $this->appManager->getAppPath($app);
 		$appPath = substr($appRootPath, strlen($this->serverRoot));
-		
+
 		if (!$appPath) {
 			return new NotFoundResponse();
 		}
@@ -119,8 +119,7 @@ class SvgController extends Controller {
 		}
 
 		// add fill (fill is not present on black elements)
-		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;])+)\/>/mi';
-
+		$fillRe = '/<((circle|rect|path)((!fill)[a-z0-9 =".\-#():;])+)\/>/mi';
 		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
 
 		// replace any fill or stroke colors
diff --git a/core/css/guest.css b/core/css/guest.css
index fc926688c4..52386e904c 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -69,7 +69,7 @@ body {
 }
 
 #header .logo {
-	background-image: url('../img/logo.svg?v=1');
+	background-image: url('../img/logo/logo.svg?v=1');
 	background-repeat: no-repeat;
 	background-size: 175px;
 	background-position: center;
diff --git a/core/img/logo-blue.png b/core/img/logo-blue.png
deleted file mode 100644
index e1b7352b3f670df14fbc7ddc841744bda21f848e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6112
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

diff --git a/core/img/logo.svg b/core/img/logo.svg
deleted file mode 100644
index 1d52d93b0f..0000000000
--- a/core/img/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="128" width="256" viewBox="0 0 256 128" ><g stroke="#fff" stroke-width="22" fill="none"><circle cy="64" cx="40" r="26"/><circle cy="64" cx="216" r="26"/><circle cy="64" cx="128" r="46"/></g></svg>
diff --git a/core/img/logo-icon-175px.png b/core/img/logo/logo-icon-175px.png
similarity index 100%
rename from core/img/logo-icon-175px.png
rename to core/img/logo/logo-icon-175px.png
diff --git a/core/img/logo-mail.png b/core/img/logo/logo-mail.png
similarity index 100%
rename from core/img/logo-mail.png
rename to core/img/logo/logo-mail.png
diff --git a/core/img/logo.png b/core/img/logo/logo.png
similarity index 100%
rename from core/img/logo.png
rename to core/img/logo/logo.png
diff --git a/core/img/logo-blue.svg b/core/img/logo/logo.svg
similarity index 82%
rename from core/img/logo-blue.svg
rename to core/img/logo/logo.svg
index 66b17330d1..dda265dfa1 100644
--- a/core/img/logo-blue.svg
+++ b/core/img/logo/logo.svg
@@ -12,7 +12,7 @@
    width="256"
    viewBox="0 0 256 128"
    id="svg10"
-   sodipodi:docname="logo-blue.svg"
+   sodipodi:docname="logo.svg"
    inkscape:version="0.92.3 (2405546, 2018-03-11)">
   <metadata
      id="metadata16">
@@ -22,7 +22,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -43,7 +42,7 @@
      showgrid="false"
      inkscape:zoom="1.4296875"
      inkscape:cx="128"
-     inkscape:cy="64"
+     inkscape:cy="91.978142"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
@@ -52,25 +51,21 @@
      stroke="#fff"
      stroke-width="22"
      fill="none"
-     id="g8"
-     style="stroke:#0082c9;stroke-opacity:1">
+     id="g8">
     <circle
        cy="64"
        cx="40"
        r="26"
-       id="circle2"
-       style="stroke:#0082c9;stroke-opacity:1" />
+       id="circle2" />
     <circle
        cy="64"
        cx="216"
        r="26"
-       id="circle4"
-       style="stroke:#0082c9;stroke-opacity:1" />
+       id="circle4" />
     <circle
        cy="64"
        cx="128"
        r="46"
-       id="circle6"
-       style="stroke:#0082c9;stroke-opacity:1" />
+       id="circle6" />
   </g>
 </svg>
diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php
index 3a22c91a8d..0c95c1b81b 100644
--- a/lib/private/legacy/defaults.php
+++ b/lib/private/legacy/defaults.php
@@ -315,9 +315,9 @@ class OC_Defaults {
 		}
 
 		if($useSvg) {
-			$logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo.svg');
+			$logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo/logo.svg');
 		} else {
-			$logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo.png');
+			$logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo/logo.png');
 		}
 	    return $logo . '?v=' . hash('sha1', implode('.', \OCP\Util::getVersion()));
 	}
diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php
index 075716f803..736df2174d 100644
--- a/tests/lib/Files/Cache/ScannerTest.php
+++ b/tests/lib/Files/Cache/ScannerTest.php
@@ -60,7 +60,7 @@ class ScannerTest extends \Test\TestCase {
 		$this->assertEquals($cachedData['mimetype'], 'text/plain');
 		$this->assertNotEquals($cachedData['parent'], -1); //parent folders should be scanned automatically
 
-		$data = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
+		$data = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$this->storage->file_put_contents('foo.png', $data);
 		$this->scanner->scanFile('foo.png');
 
@@ -98,7 +98,7 @@ class ScannerTest extends \Test\TestCase {
 
 	private function fillTestFolders() {
 		$textData = "dummy file data\n";
-		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$this->storage->mkdir('folder');
 		$this->storage->file_put_contents('foo.txt', $textData);
 		$this->storage->file_put_contents('foo.png', $imgData);
diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php
index 707ed70af2..66fa8d5193 100644
--- a/tests/lib/Files/Cache/UpdaterLegacyTest.php
+++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php
@@ -42,7 +42,7 @@ class UpdaterLegacyTest extends \Test\TestCase {
 
 		$this->storage = new \OC\Files\Storage\Temporary(array());
 		$textData = "dummy file data\n";
-		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$this->storage->mkdir('folder');
 		$this->storage->file_put_contents('foo.txt', $textData);
 		$this->storage->file_put_contents('foo.png', $imgData);
@@ -84,7 +84,7 @@ class UpdaterLegacyTest extends \Test\TestCase {
 
 	public function testWrite() {
 		$textSize = strlen("dummy file data\n");
-		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$this->cache->put('foo.txt', array('mtime' => 100, 'storage_mtime' => 150));
 		$rootCachedData = $this->cache->get('');
 		$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
@@ -145,7 +145,7 @@ class UpdaterLegacyTest extends \Test\TestCase {
 
 	public function testDelete() {
 		$textSize = strlen("dummy file data\n");
-		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$rootCachedData = $this->cache->get('');
 		$oldEtag = $rootCachedData['etag'];
 		$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
@@ -206,7 +206,7 @@ class UpdaterLegacyTest extends \Test\TestCase {
 
 	public function testRename() {
 		$textSize = strlen("dummy file data\n");
-		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$rootCachedData = $this->cache->get('');
 		$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
 
diff --git a/tests/lib/Files/Cache/WatcherTest.php b/tests/lib/Files/Cache/WatcherTest.php
index 3834b5591f..d4aa9ac875 100644
--- a/tests/lib/Files/Cache/WatcherTest.php
+++ b/tests/lib/Files/Cache/WatcherTest.php
@@ -179,7 +179,7 @@ class WatcherTest extends \Test\TestCase {
 	private function getTestStorage($scan = true) {
 		$storage = new \OC\Files\Storage\Temporary(array());
 		$textData = "dummy file data\n";
-		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$storage->mkdir('folder');
 		$storage->file_put_contents('foo.txt', $textData);
 		$storage->file_put_contents('foo.png', $imgData);
diff --git a/tests/lib/Files/ObjectStore/NoopScannerTest.php b/tests/lib/Files/ObjectStore/NoopScannerTest.php
index 16bd325a8d..6d593225e9 100644
--- a/tests/lib/Files/ObjectStore/NoopScannerTest.php
+++ b/tests/lib/Files/ObjectStore/NoopScannerTest.php
@@ -38,7 +38,7 @@ class NoopScannerTest extends \Test\TestCase {
 
 	private function fillTestFolders() {
 		$textData = "dummy file data\n";
-		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$this->storage->mkdir('folder');
 		$this->storage->file_put_contents('foo.txt', $textData);
 		$this->storage->file_put_contents('foo.png', $imgData);
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index 9b435f2b93..97e3d42684 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -142,7 +142,7 @@ class ViewTest extends \Test\TestCase {
 		Filesystem::mount($storage2, array(), $root . '/substorage');
 		Filesystem::mount($storage3, array(), $root . '/folder/anotherstorage');
 		$textSize = strlen("dummy file data\n");
-		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$storageSize = $textSize * 2 + $imageSize;
 
 		$storageInfo = $storage3->getCache()->get('');
@@ -658,7 +658,7 @@ class ViewTest extends \Test\TestCase {
 		 */
 		$storage = new $class(array());
 		$textData = "dummy file data\n";
-		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
+		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo/logo.png');
 		$storage->mkdir('folder');
 		$storage->file_put_contents('foo.txt', $textData);
 		$storage->file_put_contents('foo.png', $imgData);

From c7e81e17c86a6e6beff433238a6923f5d931c22f Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Tue, 28 Aug 2018 18:21:17 +0200
Subject: [PATCH 3/6] Updates inverted logo handling to work like the app icons

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
 apps/theming/css/theming.scss              | 26 +++++++-
 apps/theming/lib/ImageManager.php          |  3 -
 apps/theming/lib/ThemingDefaults.php       | 21 +------
 apps/theming/tests/ThemingDefaultsTest.php | 67 +-------------------
 core/img/logo/logo.svg                     | 72 +---------------------
 5 files changed, 27 insertions(+), 162 deletions(-)

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index b1b8896d0c..35341159f1 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -7,6 +7,17 @@
 	@return (0.2126 * $-local-red  + 0.7152 * $-local-green + 0.0722 * $-local-blue) / 255;
 }
 
+$has-custom-logo: variable_exists('theming-logo-mime') and $theming-logo-mime != '';
+$invert: luma($color-primary) > 0.6;
+
+@if ($has-custom-logo == false) {
+	@if ($invert) {
+		$image-logo: url('../../../../svg/core/logo/logo/000000?v=1');
+	} @else {
+		$image-logo: url('../../../../svg/core/logo/logo/ffffff?v=1');
+	}
+}
+
 .nc-theming-main-background {
 	background-color: $color-primary;
 }
@@ -19,7 +30,7 @@
 	color: $color-primary-text;
 }
 
-@if (luma($color-primary) > 0.6) {
+@if ($invert) {
 	#appmenu:not(.inverted) svg {
 		filter: invert(1);
 	}
@@ -104,7 +115,8 @@
 }
 
 /* override styles for login screen in guest.css */
-@if variable_exists('theming-logo-mime') and $theming-logo-mime != '' {
+@if ($has-custom-logo) {
+	// custom logo
 	#theming-preview-logo,
 	#header .logo {
 		background-size: contain;
@@ -113,6 +125,14 @@
 	#body-login #header .logo {
 		margin-bottom: 22px;
 	}
+} @else {
+	// default logo
+	@if ($invert) {
+		#theming-preview-logo,
+		#header .logo {
+			opacity: .6;
+		}
+	}
 }
 
 @if variable_exists('theming-background-mime') and $theming-background-mime != ''  {
@@ -157,7 +177,7 @@ input.primary,
 	color: $color-primary-text;
 }
 
-@if (luma($color-primary) > 0.6) {
+@if ($invert) {
 	#body-login #submit-wrapper .icon-confirm-white {
 		background-image: url('../../../core/img/actions/confirm.svg');
 	}
diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php
index 46598673f1..75c978f2ad 100644
--- a/apps/theming/lib/ImageManager.php
+++ b/apps/theming/lib/ImageManager.php
@@ -80,9 +80,6 @@ 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':
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 7a26b46516..0573f7b84d 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -33,7 +33,6 @@
 
 namespace OCA\Theming;
 
-
 use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
 use OCP\Files\NotFoundException;
@@ -275,7 +274,7 @@ class ThemingDefaults extends \OC_Defaults {
 			'theming-favicon-mime' => "'" . $this->config->getAppValue('theming', 'faviconMime') . "'"
 		];
 
-		$variables['image-logo'] = "url('". $this->getLogoUrl() ."')";
+		$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
 		$variables['image-logoheader'] = "'".$this->imageManager->getImageUrl('logoheader')."'";
 		$variables['image-favicon'] = "'".$this->imageManager->getImageUrl('favicon')."'";
 		$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
@@ -300,24 +299,6 @@ class ThemingDefaults extends \OC_Defaults {
 		return $variables;
 	}
 
-	/**
-	 * Returns the logo url.
-	 * If there is a custom logo, it just returns it.
-	 * For the default logo it returns the white or blue one depending on the color luminance.
-	 *
-	 * @return string
-	 */
-	private function getLogoUrl() {
-		$logoMime = $this->config->getAppValue('theming', 'logoMime');
-		$primaryColor = $this->getColorPrimary();
-		$luminance = $this->util->calculateLuminance($primaryColor);
-		if ($logoMime === '' & $luminance > 0.8) {
-			return $this->imageManager->getImageUrl('logo-blue', true);
-		} else {
-			return $this->imageManager->getImageUrl('logo', true);
-		}
-	}
-
 	/**
 	 * Check if the image should be replaced by the theming app
 	 * and return the new image location then
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index 3da39fbbf2..68435dd148 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -632,66 +632,6 @@ class ThemingDefaultsTest extends TestCase {
 		$this->assertEquals(['foo'=>'bar'], $this->template->getScssVariables());
 	}
 
-	/**
-	 * Provides test data for the get logo scss variable test.
-	 *
-	 * @return array
-	 */
-	public function provideTestGetImageLogoScssVariableTestData(): array {
-		return [
-			// default logo
-			['', '#000000', 0.0, 'logo'],
-			['', '#cccccc', 0.8, 'logo'],
-			['', '#dddddd', 0.81, 'logo-blue'],
-			['', '#ffffff', 1.0, 'logo-blue'],
-
-			// custom logo
-			['image/png', '#000000', 0.0, 'logo'],
-			['image/png', '#cccccc', 0.8, 'logo'],
-			['image/png', '#dddddd', 0.81, 'logo'],
-			['image/png', '#ffffff', 1.0, 'logo'],
-		];
-	}
-
-	/**
-	 * Tests chat the logo url scss variable has the expected value
-	 * depending on color and custom logo presence.
-	 *
-	 * @dataProvider provideTestGetImageLogoScssVariableTestData
-	 * @param string $themingLogoMime The custom logo mime type
-	 * @param string $primaryColor The primary theme color
-	 * @param float $luminance The calculated luminance
-	 * @param string $expected The expected requested logo
-	 * @return void
-	 */
-	public function testGetImageLogoScssVariable(
-		string $themingLogoMime,
-		string $primaryColor,
-		float $luminance,
-		string $expected
-	) {
-		$this->config->expects($this->at(5))
-			->method('getAppValue')
-			->with('theming', 'logoMime')
-			->willReturn($themingLogoMime);
-		$this->config->expects($this->at(6))
-			->method('getAppValue')
-			->with('theming', 'color', $this->defaults->getColorPrimary())
-			->willReturn($primaryColor);
-
-		$this->util
-			->method('calculateLuminance')
-			->with($primaryColor)
-			->willReturn($luminance);
-
-		$this->imageManager->expects($this->at(0))
-			->method('getImageUrl')
-			->with($expected)
-			->willReturn('custom-logo?v=0');
-
-		$this->template->getScssVariables();
-	}
-
 	public function testGetScssVariables() {
 		$this->config->expects($this->at(0))->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('0');
 		$this->config->expects($this->at(1))->method('getAppValue')->with('theming', 'logoMime', false)->willReturn('jpeg');
@@ -699,13 +639,10 @@ class ThemingDefaultsTest extends TestCase {
 		$this->config->expects($this->at(3))->method('getAppValue')->with('theming', 'logoheaderMime', false)->willReturn('jpeg');
 		$this->config->expects($this->at(4))->method('getAppValue')->with('theming', 'faviconMime', false)->willReturn('jpeg');
 
-		$this->config->expects($this->at(5))->method('getAppValue')->with('theming', 'logoMime', false)->willReturn('jpeg');
+		$this->config->expects($this->at(5))->method('getAppValue')->with('theming', 'color', null)->willReturn($this->defaults->getColorPrimary());
 		$this->config->expects($this->at(6))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
-
-		$this->config->expects($this->at(7))->method('getAppValue')->with('theming', 'color', null)->willReturn($this->defaults->getColorPrimary());
+		$this->config->expects($this->at(7))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
 		$this->config->expects($this->at(8))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
-		$this->config->expects($this->at(9))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
-		$this->config->expects($this->at(10))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
 
 		$this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false);
 		$this->util->expects($this->any())->method('elementColor')->with($this->defaults->getColorPrimary())->willReturn('#aaaaaa');
diff --git a/core/img/logo/logo.svg b/core/img/logo/logo.svg
index dda265dfa1..dbc3e7f3f8 100644
--- a/core/img/logo/logo.svg
+++ b/core/img/logo/logo.svg
@@ -1,71 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   height="128"
-   width="256"
-   viewBox="0 0 256 128"
-   id="svg10"
-   sodipodi:docname="logo.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs14" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1053"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="1.4296875"
-     inkscape:cx="128"
-     inkscape:cy="91.978142"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg10" />
-  <g
-     stroke="#fff"
-     stroke-width="22"
-     fill="none"
-     id="g8">
-    <circle
-       cy="64"
-       cx="40"
-       r="26"
-       id="circle2" />
-    <circle
-       cy="64"
-       cx="216"
-       r="26"
-       id="circle4" />
-    <circle
-       cy="64"
-       cx="128"
-       r="46"
-       id="circle6" />
-  </g>
-</svg>
+<svg width="256" height="128" version="1.1" viewBox="0 0 256 128" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="22"><circle cx="40" cy="64" r="26"/><circle cx="216" cy="64" r="26"/><circle cx="128" cy="64" r="46"/></g></svg>

From a45ec3d32430f40be93fa5f09832917b82c83f15 Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Thu, 30 Aug 2018 20:00:13 +0200
Subject: [PATCH 4/6] Refactors the scss svg functions

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
 apps/theming/css/theming.scss               |   4 +-
 core/Controller/SvgController.php           |   4 +-
 core/css/functions.scss                     |  52 ++++++--
 core/img/logo/logo.svg                      |   2 +-
 tests/Core/Controller/SvgControllerTest.php | 139 ++++++++++++++++++++
 tests/data/svg/mixed-red.svg                |   1 +
 tests/data/svg/mixed-source.svg             |   1 +
 tests/data/svg/rect-black.svg               |   1 +
 tests/data/svg/rect-red.svg                 |   1 +
 9 files changed, 185 insertions(+), 20 deletions(-)
 create mode 100644 tests/Core/Controller/SvgControllerTest.php
 create mode 100644 tests/data/svg/mixed-red.svg
 create mode 100644 tests/data/svg/mixed-source.svg
 create mode 100644 tests/data/svg/rect-black.svg
 create mode 100644 tests/data/svg/rect-red.svg

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 35341159f1..e2cd8fb11e 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -12,9 +12,9 @@ $invert: luma($color-primary) > 0.6;
 
 @if ($has-custom-logo == false) {
 	@if ($invert) {
-		$image-logo: url('../../../../svg/core/logo/logo/000000?v=1');
+		$image-logo: url(icon-color-path('logo', 'logo', #000000, 1, true));
 	} @else {
-		$image-logo: url('../../../../svg/core/logo/logo/ffffff?v=1');
+		$image-logo: url(icon-color-path('logo', 'logo', #ffffff, 1, true));
 	}
 }
 
diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php
index f0fc1dac4d..c6bf7b94da 100644
--- a/core/Controller/SvgController.php
+++ b/core/Controller/SvgController.php
@@ -29,7 +29,6 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataDisplayResponse;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\Files\NotFoundException;
 use OCP\App\IAppManager;
 use OCP\IRequest;
 
@@ -99,7 +98,6 @@ class SvgController extends Controller {
 		return $this->getSvg($path, $color, $fileName);
 	}
 
-
 	/**
 	 * Generate svg from filename with the requested color
 	 *
@@ -119,7 +117,7 @@ class SvgController extends Controller {
 		}
 
 		// add fill (fill is not present on black elements)
-		$fillRe = '/<((circle|rect|path)((!fill)[a-z0-9 =".\-#():;])+)\/>/mi';
+		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;])+)\/>/mi';
 		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
 
 		// replace any fill or stroke colors
diff --git a/core/css/functions.scss b/core/css/functions.scss
index 0815ba29ab..5007c3bbe7 100644
--- a/core/css/functions.scss
+++ b/core/css/functions.scss
@@ -19,31 +19,55 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
- 
+
+/**
+ * Removes the "#" from a color.
+ *
+ * @param string $color The color
+ * @return string The color without #
+ */
+@function remove-hash-from-color($color) {
+	$index: str-index(inspect($color), '#');
+	@if $index {
+		$color: str-slice(inspect($color), 2);
+	}
+	@return $color;
+}
+
+/**
+ * Calculates the URL to the svg under the SVG API.
+ *
+ * @param string $icon the icon filename
+ * @param string $dir the icon folder within /core/img if $core or app name
+ * @param string $color the desired color in hexadecimal
+ * @param int [$version] the version of the file
+ * @param bool [$core] search icon in core
+ * @return string The URL to the svg.
+ */
+@function icon-color-path($icon, $dir, $color, $version: 1, $core: false) {
+	$color: remove-hash-from-color($color);
+	@if $core {
+		@return '#{$webroot}/svg/core/#{$dir}/#{$icon}/#{$color}?v=#{$version}';
+	} @else {
+		@return '#{$webroot}/svg/#{$dir}/#{$icon}/#{$color}?v=#{$version}';
+	}
+}
+
 /**
  * SVG COLOR API
- * 
+ *
  * @param string $icon the icon filename
  * @param string $dir the icon folder within /core/img if $core or app name
  * @param string $color the desired color in hexadecimal
  * @param int $version the version of the file
  * @param bool [$core] search icon in core
  *
- * @returns string the url to the svg api endpoint
+ * @returns A background image with the url to the set to the requested icon.
  */
 @mixin icon-color($icon, $dir, $color, $version: 1, $core: false) {
-	// remove # from color
-	// inspect cast int to string
-	$index: str-index(inspect($color), '#');
-	@if $index {
-		$color: str-slice(inspect($color), 2);
-	}
+	$color: remove-hash-from-color($color);
 	$varName: "--icon-#{$icon}-#{$color}";
-	@if $core {
-		#{$varName}: url('#{$webroot}/svg/core/#{$dir}/#{$icon}/#{$color}?v=#{$version}');
-	} @else {
-		#{$varName}: url('#{$webroot}/svg/#{$dir}/#{$icon}/#{$color}?v=#{$version}');
-	}
+	#{$varName}: url(icon-color-path($icon, $dir, $color, $version, $core));
 	background-image: var(#{$varName});
 }
 
diff --git a/core/img/logo/logo.svg b/core/img/logo/logo.svg
index dbc3e7f3f8..076f295e4d 100644
--- a/core/img/logo/logo.svg
+++ b/core/img/logo/logo.svg
@@ -1 +1 @@
-<svg width="256" height="128" version="1.1" viewBox="0 0 256 128" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="22"><circle cx="40" cy="64" r="26"/><circle cx="216" cy="64" r="26"/><circle cx="128" cy="64" r="46"/></g></svg>
+<svg width="256" height="128" version="1.1" viewBox="0 0 256 128" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke-width="22"><circle cx="40" cy="64" r="26" stroke="#fff" fill="none"/><circle cx="216" cy="64" r="26" stroke="#fff" fill="none"/><circle cx="128" cy="64" r="46" stroke="#fff" fill="none"/></g></svg>
diff --git a/tests/Core/Controller/SvgControllerTest.php b/tests/Core/Controller/SvgControllerTest.php
new file mode 100644
index 0000000000..7a31d02b90
--- /dev/null
+++ b/tests/Core/Controller/SvgControllerTest.php
@@ -0,0 +1,139 @@
+<?php
+declare (strict_types = 1);
+/**
+ * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu>
+ *
+ * @author Michael Weimann <mail@michael-weimann.eu>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Tests\Core\Controller;
+
+use OC\AppFramework\Http;
+use OC\Core\Controller\SvgController;
+use OCP\App\IAppManager;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IRequest;
+use Test\TestCase;
+
+/**
+ * This class provides test cases for the svg controller
+ */
+class SvgControllerTest extends TestCase {
+
+	const TEST_IMAGES_SOURCE_PATH = __DIR__ . '/../../data/svg';
+	const TEST_IMAGES_PATH = __DIR__ . '/../../../core/img/testImages';
+	const TEST_IMAGE_MIXED = 'mixed-source.svg';
+	const TEST_IMAGE_RECT = 'rect-black.svg';
+	const TEST_IMAGES = [
+		self::TEST_IMAGE_MIXED,
+		self::TEST_IMAGE_RECT,
+	];
+
+	/**
+	 * @var SvgController
+	 */
+	private $svgController;
+
+	/**
+	 * Copy test svgs into the core img "test" directory.
+	 *
+	 * @beforeClass
+	 * @return void
+	 */
+	public static function copyTestImagesIntoPlace() {
+		mkdir(self::TEST_IMAGES_PATH);
+		foreach (self::TEST_IMAGES as $testImage) {
+			copy(
+				self::TEST_IMAGES_SOURCE_PATH .'/' . $testImage,
+				self::TEST_IMAGES_PATH . '/' . $testImage
+			);
+		}
+	}
+
+	/**
+	 * Removes the test svgs from the core img "test" directory.
+	 *
+	 * @afterClass
+	 * @return void
+	 */
+	public static function removeTestImages() {
+		foreach (self::TEST_IMAGES as $testImage) {
+			unlink(self::TEST_IMAGES_PATH . '/' . $testImage);
+		}
+		rmdir(self::TEST_IMAGES_PATH);
+	}
+
+	/**
+	 * Setups a SVG controller instance for tests.
+	 *
+	 * @before
+	 * @return void
+	 */
+	public function setupSvgController() {
+		$request = $this->getMockBuilder(IRequest::class)->getMock();
+		$timeFactory = $this->getMockBuilder(ITimeFactory::class)->getMock();
+		$appManager = $this->getMockBuilder(IAppManager::class)->getMock();
+		$this->svgController = new SvgController('core', $request, $timeFactory, $appManager);
+	}
+
+	/**
+	 * Checks that requesting an unknown image results in a 404.
+	 *
+	 * @test
+	 * @return void
+	 */
+	public function testGetSvgFromCoreNotFound() {
+		$response = $this->svgController->getSvgFromCore('huhuu', '2342', '#ff0000');
+		self::assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+	/**
+	 * Provides svg coloring test data.
+	 *
+	 * @return array
+	 */
+	public function provideGetSvgFromCoreTestData(): array {
+		return [
+			'mixed' => ['mixed-source', 'f00', file_get_contents(self::TEST_IMAGES_SOURCE_PATH . '/mixed-red.svg')],
+			'black rect' => ['rect-black', 'f00', file_get_contents(self::TEST_IMAGES_SOURCE_PATH . '/rect-red.svg')],
+		];
+	}
+
+	/**
+	 * Tests that retrieving a colored SVG works.
+	 *
+	 * @test
+	 * @dataProvider provideGetSvgFromCoreTestData
+	 * @param string $name The requested svg name
+	 * @param string $color The requested color
+	 * @param string $expected The expected svg
+	 * @return void
+	 */
+	public function testGetSvgFromCore(string $name, string $color, string $expected) {
+		$response = $this->svgController->getSvgFromCore('testImages', $name, $color);
+
+		self::assertEquals(Http::STATUS_OK, $response->getStatus());
+
+		$headers = $response->getHeaders();
+		self::assertArrayHasKey('Content-Type', $headers);
+		self::assertEquals($headers['Content-Type'], 'image/svg+xml');
+
+		self::assertEquals($expected, $response->getData());
+	}
+}
diff --git a/tests/data/svg/mixed-red.svg b/tests/data/svg/mixed-red.svg
new file mode 100644
index 0000000000..5e3727abd4
--- /dev/null
+++ b/tests/data/svg/mixed-red.svg
@@ -0,0 +1 @@
+<svg width="50mm" height="50mm" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0,-247)"><rect x="3.3609" y="250.93" width="16.253" height="15.497" fill="#f00"/><ellipse cx="37.089" cy="257.97" rx="8.5517" ry="7.9375" fill="#f00"/><circle cx="12.19" cy="281.31" r="10" fill="#f00"/><rect x="29.293" y="272.81" width="16.253" height="15.497" fill="#f00"/></g></svg>
diff --git a/tests/data/svg/mixed-source.svg b/tests/data/svg/mixed-source.svg
new file mode 100644
index 0000000000..e4a94136c5
--- /dev/null
+++ b/tests/data/svg/mixed-source.svg
@@ -0,0 +1 @@
+<svg width="50mm" height="50mm" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0,-247)"><rect x="3.3609" y="250.93" width="16.253" height="15.497"/><ellipse cx="37.089" cy="257.97" rx="8.5517" ry="7.9375" fill="#123456"/><circle cx="12.19" cy="281.31" r="10"/><rect x="29.293" y="272.81" width="16.253" height="15.497" fill="#6474a5"/></g></svg>
diff --git a/tests/data/svg/rect-black.svg b/tests/data/svg/rect-black.svg
new file mode 100644
index 0000000000..85ab8442c3
--- /dev/null
+++ b/tests/data/svg/rect-black.svg
@@ -0,0 +1 @@
+<svg width="50mm" height="50mm" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0,-247)"><rect x="10" y="257" width="30" height="30"/></g></svg>
diff --git a/tests/data/svg/rect-red.svg b/tests/data/svg/rect-red.svg
new file mode 100644
index 0000000000..8f0fae7f61
--- /dev/null
+++ b/tests/data/svg/rect-red.svg
@@ -0,0 +1 @@
+<svg width="50mm" height="50mm" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0,-247)"><rect x="10" y="257" width="30" height="30" fill="#f00"/></g></svg>

From 065e0c0e491d819658b5e7128fff967244db6681 Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Wed, 3 Oct 2018 19:26:47 +0200
Subject: [PATCH 5/6] Fixes the logo test

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
 apps/theming/tests/UtilTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php
index 61d1dc4830..6348f8423e 100644
--- a/apps/theming/tests/UtilTest.php
+++ b/apps/theming/tests/UtilTest.php
@@ -92,7 +92,7 @@ class UtilTest extends TestCase {
 		$invert = $this->util->invertTextColor('aaabbbcccddd123');
 		$this->assertEquals(false, $invert);
 	}
-	
+
 	public function testInvertTextColorEmpty() {
 		$invert = $this->util->invertTextColor('');
 		$this->assertEquals(false, $invert);
@@ -174,7 +174,7 @@ class UtilTest extends TestCase {
 
 	public function dataGetAppImage() {
 		return [
-			['core', 'logo.svg', \OC::$SERVERROOT . '/core/img/logo.svg'],
+			['core', 'logo/logo.svg', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
 			['files', 'external', \OC::$SERVERROOT . '/apps/files/img/external.svg'],
 			['files', 'external.svg', \OC::$SERVERROOT . '/apps/files/img/external.svg'],
 			['noapplikethis', 'foobar.svg', false],

From 044ab0cbecf46d537e892dfa4efd862182798291 Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Thu, 4 Oct 2018 20:43:27 +0200
Subject: [PATCH 6/6] Adapts the theming util to the new core logo image path

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
---
 apps/theming/lib/Util.php       | 4 ++--
 apps/theming/tests/UtilTest.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index b17382334d..38b876f361 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -161,7 +161,7 @@ class Util {
 				}
 			} catch (NotFoundException $e) {}
 		}
-		return \OC::$SERVERROOT . '/core/img/logo.svg';
+		return \OC::$SERVERROOT . '/core/img/logo/logo.svg';
 	}
 
 	/**
@@ -223,7 +223,7 @@ class Util {
 
 	/**
 	 * Check if a custom theme is set in the server configuration
-	 * 
+	 *
 	 * @return bool
 	 */
 	public function isAlreadyThemed() {
diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php
index 6348f8423e..d0263e1122 100644
--- a/apps/theming/tests/UtilTest.php
+++ b/apps/theming/tests/UtilTest.php
@@ -139,7 +139,7 @@ class UtilTest extends TestCase {
 	public function dataGetAppIcon() {
 		return [
 			['user_ldap', \OC_App::getAppPath('user_ldap') . '/img/app.svg'],
-			['noapplikethis', \OC::$SERVERROOT . '/core/img/logo.svg'],
+			['noapplikethis', \OC::$SERVERROOT . '/core/img/logo/logo.svg'],
 			['comments', \OC_App::getAppPath('comments') . '/img/comments.svg'],
 		];
 	}