diff options
author | William Bargent <personal@williambargent.co.uk> | 2016-07-27 11:14:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-27 11:14:56 +0300 |
commit | 900267333e39b09c1ad4c350461ab590f80814e2 (patch) | |
tree | 903337dbc2ea1dcce109f0c91e8a5eb2df37dcd1 | |
parent | fa361ba968e7780315ee5e4d538da675b1cc5cc3 (diff) | |
parent | 608dbc64d93ae06beb6c8a05e50196645fa206d1 (diff) |
Merge pull request #570 from nextcloud/stable9-fix-theme-logo-position
[stable9] fix theme logo position
-rw-r--r-- | apps/theming/js/settings-admin.js | 10 | ||||
-rw-r--r-- | apps/theming/lib/controller/themingcontroller.php | 3 | ||||
-rw-r--r-- | apps/theming/tests/lib/controller/ThemingControllerTest.php | 6 | ||||
-rw-r--r-- | core/css/header.css | 3 |
4 files changed, 13 insertions, 9 deletions
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index bd4b4b34ed1..fa94a3d707c 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -41,12 +41,12 @@ function preview(setting, value) { console.log(setting); var logos = document.getElementsByClassName('logo-icon'); var timestamp = new Date().getTime(); - if(value !== '') { - logos[0].style.background = "url('" + OC.generateUrl('/apps/theming/logo') + "?v" + timestamp + "')"; - logos[0].style.backgroundSize = "62px 34px"; + if (value !== '') { + logos[0].style.backgroundImage = "url('" + OC.generateUrl('/apps/theming/logo') + "?v" + timestamp + "')"; + logos[0].style.backgroundSize = "contain"; } else { - logos[0].style.background = "url('" + OC.getRootPath() + '/core/img/logo-icon.svg?v' + timestamp +"')"; - logos[0].style.backgroundSize = "62px 34px"; + logos[0].style.backgroundImage = "url('" + OC.getRootPath() + '/core/img/logo-icon.svg?v' + timestamp +"')"; + logos[0].style.backgroundSize = "contain"; } } } diff --git a/apps/theming/lib/controller/themingcontroller.php b/apps/theming/lib/controller/themingcontroller.php index aa35e84a676..0dec95cc677 100644 --- a/apps/theming/lib/controller/themingcontroller.php +++ b/apps/theming/lib/controller/themingcontroller.php @@ -221,10 +221,11 @@ class ThemingController extends Controller { if($logo !== '') { $responseCss .= sprintf('#header .logo { background-image: url(\'./logo?v='.$cacheBusterValue.'\'); + background-size: contain; } #header .logo-icon { background-image: url(\'./logo?v='.$cacheBusterValue.'\'); - background-size: 62px 34px; + background-size: contain; }' ); } diff --git a/apps/theming/tests/lib/controller/ThemingControllerTest.php b/apps/theming/tests/lib/controller/ThemingControllerTest.php index 9682e90239f..9ce93ec900a 100644 --- a/apps/theming/tests/lib/controller/ThemingControllerTest.php +++ b/apps/theming/tests/lib/controller/ThemingControllerTest.php @@ -355,10 +355,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()); @@ -417,10 +418,11 @@ class ThemingControllerTest extends TestCase { $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #abc}#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'); diff --git a/core/css/header.css b/core/css/header.css index f3f5276c2a4..c31dd9065c6 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -71,7 +71,7 @@ background-image: url('../img/logo-icon.svg?v=1'); background-repeat: no-repeat; background-size: 175px; - background-position: center 30px; + background-position: center; width: 252px; height: 120px; margin: 0 auto; @@ -82,6 +82,7 @@ display: inline-block; background-image: url('../img/logo-icon.svg?v=1'); background-repeat: no-repeat; + background-position: center center; width: 62px; height: 34px; } |