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

Merge branch 'master' into talks

Browse source
This commit is contained in:
Oliver Davies 2015-09-09 22:16:04 +01:00
commit 0edd19efa1
4 changed files with 88 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
source/themes/opdavies/oliverdavies/_layouts/default.html.twig
View file

@ -18,6 +18,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('css/styles.css') }}">
<link rel="stylesheet" href="{{ site.url }}/components/bootswatch/{{ site.bootswatch }}/bootstrap.min.css">
<link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
{% for size in site.apple_touch_icon_sizes %}
@ -29,7 +30,7 @@
{% endfor %}
</head>
<body class="{% block body_classes %}{% endblock %}">
<nav class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-default 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">
@ -42,7 +43,7 @@
</div>
<div id="navbar" class="collapse navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav">
{% for link in site.main_menu %}
<li class="nav__{{ link.title|lower }}{% if page.url ~ '/' == link.href %} active{% endif %}"><a href="{{ link.href }}">{{ link.title }}</a></li>
{% endfor %}