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

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

[stable10] fix theme logo position
This commit is contained in:
Björn Schießle 2016-07-27 10:21:45 +02:00 committed by GitHub
parent 010a8b49f3 db755d7236
commit cb10ca5c23
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,11 +75,11 @@ function preview(setting, value) {
var logos = document.getElementsByClassName('logo-icon'); var logos = document.getElementsByClassName('logo-icon');
var timestamp = new Date().getTime(); var timestamp = new Date().getTime();
if (value !== '') { if (value !== '') {
logos[0].style.background = "url('" + OC.generateUrl('/apps/theming/logo') + "?v" + timestamp + "')"; logos[0].style.backgroundImage = "url('" + OC.generateUrl('/apps/theming/logo') + "?v" + timestamp + "')";
logos[0].style.backgroundSize = "62px 34px"; logos[0].style.backgroundSize = "contain";
} else { } else {
logos[0].style.background = "url('" + OC.getRootPath() + '/core/img/logo-icon.svg?v' + timestamp +"')"; logos[0].style.backgroundImage = "url('" + OC.getRootPath() + '/core/img/logo-icon.svg?v' + timestamp +"')";
logos[0].style.backgroundSize = "62px 34px"; logos[0].style.backgroundSize = "contain";
} }
} }
} }

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

@ -224,10 +224,11 @@ class ThemingController extends Controller {
if($logo !== '') { if($logo !== '') {
$responseCss .= sprintf('#header .logo { $responseCss .= sprintf('#header .logo {
background-image: url(\'./logo?v='.$cacheBusterValue.'\'); background-image: url(\'./logo?v='.$cacheBusterValue.'\');
background-size: contain;
} }
#header .logo-icon { #header .logo-icon {
background-image: url(\'./logo?v='.$cacheBusterValue.'\'); background-image: url(\'./logo?v='.$cacheBusterValue.'\');
background-size: 62px 34px; background-size: contain;
}' }'
); );
} }

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

@ -383,10 +383,11 @@ class ThemingControllerTest extends TestCase {
$expected = new Http\DataDownloadResponse('#header .logo { $expected = new Http\DataDownloadResponse('#header .logo {
background-image: url(\'./logo?v=0\'); background-image: url(\'./logo?v=0\');
background-size: contain;
} }
#header .logo-icon { #header .logo-icon {
background-image: url(\'./logo?v=0\'); background-image: url(\'./logo?v=0\');
background-size: 62px 34px; background-size: contain;
}', 'style', 'text/css'); }', 'style', 'text/css');
$expected->cacheFor(3600); $expected->cacheFor(3600);
@$this->assertEquals($expected, $this->themingController->getStylesheet()); @$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 {background-color: #000}#header .logo { $expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #000}#header .logo {
background-image: url(\'./logo?v=0\'); background-image: url(\'./logo?v=0\');
background-size: contain;
} }
#header .logo-icon { #header .logo-icon {
background-image: url(\'./logo?v=0\'); background-image: url(\'./logo?v=0\');
background-size: 62px 34px; background-size: contain;
}#body-login { }#body-login {
background-image: url(\'./loginbackground?v=0\'); background-image: url(\'./loginbackground?v=0\');
}', 'style', 'text/css'); }', 'style', 'text/css');
@ -479,10 +481,11 @@ class ThemingControllerTest extends TestCase {
$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 {background-color: #fff}#header .logo {
background-image: url(\'./logo?v=0\'); background-image: url(\'./logo?v=0\');
background-size: contain;
} }
#header .logo-icon { #header .logo-icon {
background-image: url(\'./logo?v=0\'); background-image: url(\'./logo?v=0\');
background-size: 62px 34px; background-size: contain;
}#body-login { }#body-login {
background-image: url(\'./loginbackground?v=0\'); 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'); }#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');

3
core/css/header.css
View File

@ -71,7 +71,7 @@
background-image: url('../img/logo-icon.svg'); background-image: url('../img/logo-icon.svg');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 175px; background-size: 175px;
background-position: center 30px; background-position: center;
width: 252px; width: 252px;
height: 120px; height: 120px;
margin: 0 auto; margin: 0 auto;
@ -82,6 +82,7 @@
display: inline-block; display: inline-block;
background-image: url('../img/logo-icon.svg'); background-image: url('../img/logo-icon.svg');
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center;
width: 62px; width: 62px;
height: 34px; height: 34px;
} }