raito/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Update bootstrap to 2.0.3

Browse source 
This makes the navbar collapse properly on small screens.
This commit is contained in:
Eelco Dolstra 2013-03-19 00:15:12 +01:00
parent 93f4a26058
commit c1aefc4c41
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/root/Makefile.am
View file

@ -7,7 +7,7 @@ STATIC = \
FLOT = flot-0.6.zip FLOT = flot-0.6.zip
TABLESORTER = jquery.tablesorter.zip TABLESORTER = jquery.tablesorter.zip
JQUERY = jquery-ui-1.8.5.custom.zip JQUERY = jquery-ui-1.8.5.custom.zip
BOOTSTRAP = bootstrap.zip BOOTSTRAP = bootstrap-2.0.3.zip
ZIPS = $(FLOT) $(TABLESORTER) $(JQUERY) $(BOOTSTRAP) ZIPS = $(FLOT) $(TABLESORTER) $(JQUERY) $(BOOTSTRAP)

BIN
src/root/bootstrap-2.0.3.zip Normal file
View file

Binary file not shown.

BIN
src/root/bootstrap.zip
View file

Binary file not shown.

19
src/root/layout.tt
View file

@ -16,20 +16,19 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<link href="/static/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" />
<script type="text/javascript" src="/static/bootstrap/js/bootstrap.min.js"></script> <script type="text/javascript" src="/static/bootstrap/js/bootstrap.min.js"></script>
<link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<!-- hydra.css must be included before bootstrap-responsive to
make the @media rule work. -->
<link rel="stylesheet" href="/static/css/hydra.css" type="text/css" />
<link href="/static/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" />
<script type="text/javascript" src="/static/js/bootbox.min.js"></script> <script type="text/javascript" src="/static/js/bootbox.min.js"></script>
<link rel="stylesheet" href="/static/css/hydra.css" type="text/css" />
<link rel="stylesheet" href="/static/css/tree.css" type="text/css" /> <link rel="stylesheet" href="/static/css/tree.css" type="text/css" />
<link rel="stylesheet" href="/static/css/logfile.css" type="text/css" /> <link rel="stylesheet" href="/static/css/logfile.css" type="text/css" />
<!--
<script type="text/javascript" src="/static/js/tablesorter/jquery.tablesorter.js"></script>
-->
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
@ -94,11 +93,11 @@
<div class="navbar navbar-fixed-top navbar-inverse"> <div class="navbar navbar-fixed-top navbar-inverse">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".navbar-responsive-collapse"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </button>
<a class="brand" href="[% c.uri_for(c.controller('Root').action_for('index')) %]"> <a class="brand" href="[% c.uri_for(c.controller('Root').action_for('index')) %]">
[% IF logo == "" %] [% IF logo == "" %]
Hydra Hydra
@ -106,7 +105,7 @@
<img src="[% logo %]" alt="Hydra Logo" class="logo" /> <img src="[% logo %]" alt="Hydra Logo" class="logo" />
[% END %] [% END %]
</a> </a>
<div class="nav-collapse collapse navbar-responsive-collapse"> <div class="nav-collapse collapse">
[% PROCESS topbar.tt %] [% PROCESS topbar.tt %]
</div> </div>
</div> </div>

2
src/root/static/css/hydra.css
View file

@ -1,6 +1,8 @@
@media (min-width: 768px) {
body { body {
padding-top: 40px; padding-top: 40px;
} }
}
.logo { .logo {
margin-top: -10px; margin-top: -10px;