ben/status-board
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed display error with nav bar

Browse Source 
Signed-off-by: Nathan Booth <nath.booth@gmail.com>
This commit is contained in:
Nathan Booth
2011-12-19 15:21:21 +00:00
parent d782249388
commit 01aedf02aa
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/styles/normal.css
View File

@@ -2,13 +2,13 @@
* StatusBoard normal stylesheet * StatusBoard normal stylesheet
* *
*/ */
@import url('http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css');
@CHARSET "UTF-8"; @CHARSET "UTF-8";
body { body {
margin: 0em; margin: 0em;
margin-top: 60px; margin-top: 60px;
padding-top: 40px;
padding: 0em; padding: 0em;
font-family: verdana, helvetica, sans-serif; font-family: verdana, helvetica, sans-serif;
} }

4
source/webui/templates/index.tpl
View File

@@ -16,13 +16,11 @@
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
<script type="text/javascript" src="{$base_uri}scripts/main.js"></script> <script type="text/javascript" src="{$base_uri}scripts/main.js"></script>
<link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css">
<link rel="stylesheet/less" href="{$base_uri}less/bootstrap.less" media="all" /> <link rel="stylesheet/less" href="{$base_uri}less/bootstrap.less" media="all" />
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/less-1.1.5.min.js"></script> <script type="text/javascript" src="{$base_uri}scripts/3rdparty/less-1.1.5.min.js"></script>
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-alerts.js"></script> <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-alerts.js"></script>
</head> </head>
<body>I can <body>
<div class="topbar"> <div class="topbar">
<div class="topbar-inner"> <div class="topbar-inner">