mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

[stable9] fix theme logo position
This commit is contained in:
William Bargent 2016-07-27 09:14:56 +01:00 committed by GitHub
parent fa361ba968 608dbc64d9
commit 900267333e
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/theming/js/settings-admin.js
View File

@ -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";
}
}
}

3
apps/theming/lib/controller/themingcontroller.php
View File

@ -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;
}'
);
}

6
apps/theming/tests/lib/controller/ThemingControllerTest.php
View File

@ -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');

3
core/css/header.css
View File

@ -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;
}