opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Moved navbar.html.twig back into default.html.twig

Browse source
This commit is contained in:
Oliver Davies 2015-05-28 17:53:43 +01:00
parent adf8c6727b
commit f5a09ec8b7
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/_layouts/default.html.twig
View file

@ -23,7 +23,29 @@
{% block styles %}{% endblock %}
</head>
<body{% if page.body_class %} class="{{ page.body_class }}"{% endif %}>
{% include 'navbar' %}
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right" role="navigation">
<li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
{% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
<li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>
{% endfor %}
</ul>
</div>{# .nav-collapse #}
</div>
</nav>
<div class="container">
<div class="row">

21
source/_partials/navbar.html.twig
View file

@ -1,21 +0,0 @@
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right" role="navigation">
<li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
{% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
<li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>
{% endfor %}
</ul>
</div>{# .nav-collapse #}
</div>
</nav>