diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-07-26 10:46:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 10:46:13 +0200 |
| commit | cc5ddcf537d03c3f2f4cdc6817e02e098f8e8edb (patch) | |
| tree | 6318ea36cdf99dc3a3d590462349696fb06cd588 /apps/theming/tests | |
| parent | 3b6bba09d47354aa937adac2ba72916622a6d67e (diff) | |
| parent | d58ff6853173680e4156c482f6eb335586c8bb13 (diff) | |
| download | nextcloud-server-cc5ddcf537d03c3f2f4cdc6817e02e098f8e8edb.tar.gz nextcloud-server-cc5ddcf537d03c3f2f4cdc6817e02e098f8e8edb.zip | |
Merge pull request #525 from nextcloud/fix-theme-logo-position
Fix theme logo position and shape
Diffstat (limited to 'apps/theming/tests')
| -rw-r--r-- | apps/theming/tests/lib/controller/ThemingControllerTest.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 1acfdff020c..24eb0510f99 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -383,10 +383,11 @@ class ThemingControllerTest extends TestCase { $expected = new Http\DataDownloadResponse('#header .logo { background-image: url(\'./logo?v=0\'); + background-size: contain; } #header .logo-icon { background-image: url(\'./logo?v=0\'); - background-size: 62px 34px; + background-size: contain; }', 'style', 'text/css'); $expected->cacheFor(3600); @$this->assertEquals($expected, $this->themingController->getStylesheet()); @@ -445,10 +446,11 @@ class ThemingControllerTest extends TestCase { $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\'); - background-size: 62px 34px; + background-size: contain; }#body-login { background-image: url(\'./loginbackground?v=0\'); }', 'style', 'text/css'); @@ -479,10 +481,11 @@ class ThemingControllerTest extends TestCase { $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\'); - background-size: 62px 34px; + background-size: contain; }#body-login { background-image: url(\'./loginbackground?v=0\'); }#header .header-appname, #expandDisplayName { color: #000000; } #header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); } .searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }', 'style', 'text/css'); |