diff --git a/base.twig b/base.twig index 1bc5632523d370c6e2d0fb99b07e812b56707c5e..8e393782c09b2bf9b9b3a54287ee0b4b6dd53218 100644 --- a/base.twig +++ b/base.twig @@ -19,6 +19,8 @@ <link rel="stylesheet" href="{{ theme_url }}/css/style.css" type="text/css" /> <link rel="stylesheet" href="{{ theme_url }}/css/droidsans.css" type="text/css" /> <link rel="stylesheet" href="{{ theme_url }}/css/fontello.css" type="text/css" /> + <link rel="shortcut icon" href="{{ theme_url }}/img/favicon.png"> + <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous"> {% block head %} {% endblock %} </head> @@ -57,7 +59,7 @@ <div id="main" role="main"> <div class="container"> - {% block head %} + {% block content %} {{ content }} {% endblock %} </div> @@ -66,7 +68,7 @@ <div id="footer"> <div class="container"> <p> - {{ pages["_meta"].meta.license }} + {{ pages["_meta"].meta.license | markdown }} </p> <div class="social"> {% for social in pages["_meta"].meta.social %} diff --git a/index.twig b/index.twig index 41272993e26983529e7147e0e8c2dbd2b031798e..5db0fd01e13cd9662623901b69a77e64af6c7154 100644 --- a/index.twig +++ b/index.twig @@ -1,4 +1,4 @@ -{% extends base %} +{% extends "base.twig" %} {% block content %} {{ content }} {% endblock %}