Merge pull request #525 from nextcloud/fix-theme-logo-position

Fix theme logo position and shape

diff --cc apps/theming/lib/controller/themingcontroller.php
Simple merge

diff --cc apps/theming/tests/lib/controller/ThemingControllerTest.php
index 1acfdff020c726ff1897ed164dab15e45c9662b8,3a8405909b032623c768326b5656501e007bd3f1..24eb0510f9939d48cb1bd85e7ad578a804791cff
--- 1/apps/theming/tests/lib/controller/ThemingControllerTest.php
--- 2/apps/theming/tests/lib/controller/ThemingControllerTest.php
+++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php
@@@ -443,8 -444,9 +444,9 @@@ class ThemingControllerTest extends Tes
                        ->with('theming', 'backgroundMime', '')
                        ->willReturn('image/png');
  
 -              $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #000}#header .logo {
 +              $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #000}#header .logo {
                                background-image: url(\'./logo?v=0\');
+                               background-size: contain;
                        }
                        #header .logo-icon {
                                background-image: url(\'./logo?v=0\');
@@@ -477,8 -479,9 +479,9 @@@
                        ->with('theming', 'backgroundMime', '')
                        ->willReturn('image/png');
  
 -              $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #fff}#header .logo {
 +              $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: #fff}#header .logo {
                                background-image: url(\'./logo?v=0\');
+                               background-size: contain;
                        }
                        #header .logo-icon {
                                background-image: url(\'./logo?v=0\');