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

Only use header css if webfont is enabled, fixes navigation padding

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2014-01-05 18:41:48 +01:00
parent d6d40c8e12
commit 39b1980509
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,6 +478,7 @@ nav {
width:230px; width:230px;
background-color:#f7f8fa; background-color:#f7f8fa;
min-height:500px; min-height:500px;
padding-top: 10px;
} }
nav div:first-child { nav div:first-child {

6
templates/Sparkle/header.tpl vendored
View File

@@ -28,11 +28,11 @@
{$js} {$js}
<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title> <title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>
<if Settings::Get('panel.use_webfonts') == '1'>
<style type="text/css"> <style type="text/css">
body { body { font-family: {$webfont}, 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif; }
font-family: <if Settings::Get('panel.use_webfonts') == '1'>{$webfont},</if> 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
}
</style> </style>
</if>
</head> </head>
<body> <body>

6
templates/Sparkle/index.tpl vendored
View File

@@ -17,11 +17,11 @@
<script type="text/javascript" src="js/jquery.min.js"></script> <script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script> <script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
<title>{$title}Froxlor Server Management Panel</title> <title>{$title}Froxlor Server Management Panel</title>
{if $use_webfonts == 1}
<style type="text/css"> <style type="text/css">
body { body { font-family: {$webfont}, 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif; }
font-family: {if $use_webfonts == 1}{$webfont},{/if} 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
}
</style> </style>
{/if}
</head> </head>
<body> <body>