Moves the logo files to logo

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

9 files changed, 10 insertions, 17 deletions

diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 09b6fe54384..fed97177eef 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 1fad9c39c3b..f0fc1dac4d4 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 fc926688c44..52386e904c7 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 e1b7352b3f6..00000000000
--- a/core/img/logo-blue.png
+++ /dev/null
diff --git a/core/img/logo.svg b/core/img/logo.svg
deleted file mode 100644
index 1d52d93b0f2..00000000000
--- 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
index 6397f61cd68..6397f61cd68 100644
--- a/core/img/logo-icon-175px.png
+++ b/core/img/logo/logo-icon-175px.png
diff --git a/core/img/logo-mail.png b/core/img/logo/logo-mail.png
index 80304ae7ec7..80304ae7ec7 100644
--- a/core/img/logo-mail.png
+++ b/core/img/logo/logo-mail.png
diff --git a/core/img/logo.png b/core/img/logo/logo.png
index df32e1c7eab..df32e1c7eab 100644
--- a/core/img/logo.png
+++ b/core/img/logo/logo.png
diff --git a/core/img/logo-blue.svg b/core/img/logo/logo.svg
index 66b17330d12..dda265dfa16 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>