Merge branch 'testing' into 'master'

Shrink Top Bar Size

Modified the small logo (more fixes needed), css, and default.php

See merge request !9
This commit is contained in:
Yukimi Kazari 2016-12-01 11:42:00 -05:00
commit a2635c8c62
3 changed files with 3 additions and 3 deletions

View File

@ -132,13 +132,13 @@ container
</script>
<?= $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' => '195x40', 'id' => 'logo')), CONFIG()->url_base) ?><div style="margin-right: 0.0em;">
<div id="title"><h2 id="site-title"><?= $this->linkTo($this->imageTag('images/logo_small.png', array('alt' => CONFIG()->app_name, 'size' => '146x30', 'id' => 'logo')), CONFIG()->url_base) ?><div style="margin-right: 0.0em;">
<?= $this->formTag('post#index', array('method' => 'get', 'accept-charset' => 'UTF-8'), function(){ ?>
<div style="margin:0;padding:0;display:inline"></div>
<div>
<?php
if ($this->request()->controller() == 'post') : ?>
<?= $this->textFieldTag("tags", $this->h($this->params()->tags), array('size' => '36', 'autocomplete' => 'off', 'placeholder' => 'Search Posts...', 'style' => 'font-size: 20pt; padding: 0 0 1px 4px; margin: 4px 0 0 8px; border-style: dotted; background: #2b0000;')) ?>
<?= $this->textFieldTag("tags", $this->h($this->params()->tags), array('size' => '60', 'autocomplete' => 'off', 'placeholder' => 'Search Posts...', 'style' => 'font-size: 14pt; padding: 0 0 1px 4px; margin: 4px 0 0 8px; border-style: dotted; background: #2b0000;')) ?>
<?= $this->tag_completion_box('$("tags")', ['$("tags").up("form")', '$("tags")', null], true) ?>
<?php endif ?>
</div>

View File

@ -472,7 +472,7 @@ h1#static-index-header{font-size:4em;margin:1em 0 .5em;text-align:center}
h1#static-index-header a{background:transparent url(../images/logo.png) no-repeat scroll center center;display:block;font-size:0;margin:0;padding:75px 300px;text-align:center;text-indent:-3000em}
h2.wiki-title{color:#003dd8;margin-bottom:.25em}
h2#site-title{display:block;overflow:hidden;text-align:left}
div#title{height:40px;margin:.2em 0 0 0}
div#title{height:32px;margin:.2em 0 0 0}
h2#site-title img#logo{float:left}
h2#site-title span{display:block;margin:0;overflow:hidden;padding:.2em 0 0;text-align:left}
div#static-more div#title{float:none;margin-top:-1em}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB