Skip to content

Commit 2176d7a

Browse files
committed
Merge pull request #32 from hashhar/navigation
[WIP] Isuue #20
2 parents 5b5bd1c + d4219f9 commit 2176d7a

2 files changed

Lines changed: 47 additions & 1 deletion

File tree

_includes/head.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,15 @@
1111
<link href="/favicon.ico" rel="shortcut icon">
1212
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/stylesheet.css">
1313
<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/downloadbutton.css">
14+
<!-- Bootstrap CDN -->
15+
<!--Latest compiled and minified CSS -->
16+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
17+
<!-- JQuery -->
18+
<script src="http://code.jquery.com/jquery-latest.min.js" type="text/javascript"></script>
19+
20+
<!-- Optional theme -->
21+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">
22+
23+
<!-- Latest compiled and minified JavaScript -->
24+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
1425
</head>

_layouts/default.html

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,39 @@
33
<body>
44
{% include google_analytics.html %}
55
<!-- HEADER -->
6+
<!-- NAVBAR -->
7+
<nav class="navbar navbar-default navbar-fixed-top">
8+
<div class="container-fluid">
9+
<!-- Brand and toggle get grouped for better mobile display -->
10+
<div class="navbar-header">
11+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
12+
<span class="sr-only">Toggle navigation</span>
13+
<span class="icon-bar"></span>
14+
<span class="icon-bar"></span>
15+
<span class="icon-bar"></span>
16+
</button>
17+
<img class="navbar-brand header-img" href="http://openlivewriter.org" src="favicon.ico">
18+
<style>
19+
.navbar-brand {
20+
padding: 0;
21+
}
22+
23+
.header-img {
24+
margin: 0;
25+
}
26+
</style>
27+
</div>
28+
29+
<!-- Collect the nav links, forms, and other content for toggling -->
30+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
31+
<ul class="nav navbar-nav">
32+
<li><a href="http://openlivewriter.org">Home</a></li>
33+
<li><a href="http://openlivewriter.org/news/">News</a></li>
34+
<li><a href="http://openlivewriter.org/WriterRedirect/WriterBlog">Blog</a></li>
35+
</ul>
36+
</div><!-- /.navbar-collapse -->
37+
</div><!-- /.container-fluid -->
38+
</nav>
639
<div id="header_wrap" class="outer">
740
<header class="inner">
841
<a id="forkme_banner" href="https://github.com/OpenLiveWriter">View on GitHub</a>
@@ -24,6 +57,8 @@ <h2 id="project_tagline">{{ page.subtitle }}</h2>
2457
<div id="footer_wrap" class="outer">
2558
<footer id="footer" class="inner">{% include footer.html %}</footer>
2659
</div>
27-
60+
<style>
61+
body { padding-top: 50px; }
62+
</style>
2863
</body>
2964
</html>

0 commit comments

Comments
 (0)