maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #128 from BNoiZe/master

Browse Source 
Some CSS fixes and header improvements
This commit is contained in:
Michael Kaufmann
2013-10-18 06:46:16 -07:00
parent 03ba127fab 5231ae2383
commit 6a47752665
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/Sparkle/assets/css/main.css vendored
View File

@@ -29,6 +29,7 @@ body {
header img { header img {
padding:10px 0 10px 10px; padding:10px 0 10px 10px;
height: 30px;
} }
h1 { h1 {
@@ -76,8 +77,7 @@ td a {
} }
.topheader_navigation { .topheader_navigation {
float: right; float: right;
margin: 36px 50px 0 0; margin: 15px 50px 0 0;
text-transform: uppercase;
} }
/* TOPHEADER NAV */ /* TOPHEADER NAV */
@@ -93,7 +93,7 @@ ul.topheadernav li {
ul.topheadernav li a { ul.topheadernav li a {
display: block; display: block;
text-decoration: none; text-decoration: none;
color: #666; color: #0f3e4e;
} }
ul.topheadernav li a:hover { ul.topheadernav li a:hover {
color: #111; color: #111;
@@ -320,7 +320,7 @@ aside.right {
.overviewsearch { .overviewsearch {
position:absolute; position:absolute;
top:155px; top:125px;
right:36px; right:36px;
font-size:80%; font-size:80%;
} }
@@ -471,7 +471,7 @@ a:hover {
.main { .main {
margin-left:240px; margin-left:240px;
margin-right:10px; margin-right:10px;
margin-top:105px; margin-top:65px;
margin-bottom:0; margin-bottom:0;
background-color:#fff; background-color:#fff;
padding: 30px 30px 30px 30px; padding: 30px 30px 30px 30px;

3
templates/Sparkle/header.tpl vendored
View File

@@ -44,6 +44,7 @@
<img src="{$header_logo}" alt="Froxlor Server Management Panel" /> <img src="{$header_logo}" alt="Froxlor Server Management Panel" />
<div class="topheader_navigation"> <div class="topheader_navigation">
<ul class="topheadernav"> <ul class="topheadernav">
<li>{$userinfo['loginname']}</li>
<li><a href="{$linker->getLink(array('section' => 'index'))}">{$lng['admin']['overview']}</a></li> <li><a href="{$linker->getLink(array('section' => 'index'))}">{$lng['admin']['overview']}</a></li>
<li><a href="#">{$lng['panel']['options']}&nbsp;&#x25BE;</a> <li><a href="#">{$lng['panel']['options']}&nbsp;&#x25BE;</a>
<ul> <ul>
@@ -57,7 +58,7 @@
</if> </if>
</ul> </ul>
</li> </li>
<li><a href="{$linker->getLink(array('section' => 'index', 'action' => 'logout'))}">{$lng['login']['logout']} {$userinfo['loginname']}</a></li> <li><a href="{$linker->getLink(array('section' => 'index', 'action' => 'logout'))}" style="color: #cc0000;">{$lng['login']['logout']}</a></li>
</ul> </ul>
</div> </div>
</header> </header>