Merge branch 'testing' into 'master'

Testing

Updated Logos and dimensions 

See merge request !1
This commit is contained in:
Yukimi Kazari 2016-09-12 19:04:26 -04:00
commit a37ad9a625
6 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@
<div id="header">
<div id="title">
<h2 id="site-title">
<?= $this->linkTo($this->imageTag('/images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '484x75', 'id' => 'logo']), $this->rootPath()) ?>
<?= $this->linkTo($this->imageTag('/images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '521x75', 'id' => 'logo']), $this->rootPath()) ?>
</h2>
</div>
<?= $this->partial('layouts/menu') ?>

View File

@ -45,7 +45,7 @@
<body>
<?= $this->partial('layouts/news') ?>
<div id="header">
<div id="title"><h2 id="site-title"><?= $this->linkTo($this->imageTag('images/logo_small.png', array('alt' => CONFIG()->app_name, 'size' => '484x75', 'id' => 'logo')), CONFIG()->url_base) ?><span><?= $this->tag_header($this->h($this->params()->tags)) ?></span></h2></div>
<div id="title"><h2 id="site-title"><?= $this->linkTo($this->imageTag('images/logo_small.png', array('alt' => CONFIG()->app_name, 'size' => '521x75', 'id' => 'logo')), CONFIG()->url_base) ?><span><?= $this->tag_header($this->h($this->params()->tags)) ?></span></h2></div>
<?= $this->partial('layouts/menu') ?>
</div>
<?= $this->partial('layouts/login') ?>

View File

@ -2,7 +2,7 @@
<div id="header">
<div id="title">
<h2 id="site-title">
<?= $this->linkTo($this->imageTag('/images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '484x75', 'id' => 'logo']), $this->rootPath()) ?>
<?= $this->linkTo($this->imageTag('/images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '521x75', 'id' => 'logo']), $this->rootPath()) ?>
</h2>
</div>
<?= $this->partial('layouts/menu') ?>

View File

@ -1,5 +1,5 @@
<div id="static-more">
<div id="title"><h2><?= $this->linkTo($this->imageTag('images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '484x75', 'id' => 'logo']), 'root') ?></h2></div>
<div id="title"><h2><?= $this->linkTo($this->imageTag('images/logo_small.png', ['alt' => CONFIG()->app_name, 'size' => '521x75', 'id' => 'logo']), 'root') ?></h2></div>
<div>
<ul>
<li><h4><?= $this->t('static_t1') ?></h4></li>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 KiB

After

Width:  |  Height:  |  Size: 324 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB