From 9af4e764a13fa7d6f796a06dad7251598257c388 Mon Sep 17 00:00:00 2001 From: Emil Miler Date: Sat, 21 Mar 2020 21:17:56 +0100 Subject: [PATCH] =?UTF-8?q?Schov=C3=A1n=C3=AD=20navigace=20pokud=20neexist?= =?UTF-8?q?uj=C3=AD=20str=C3=A1nky?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sass/style.scss | 1 - templates/index.html | 14 +++++++------- templates/page.html | 24 +++++++++++++----------- templates/section.html | 1 + 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/sass/style.scss b/sass/style.scss index d4a3240..132627a 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -55,7 +55,6 @@ body { #nav { float: left; - height: 100%; border-right: 1px dotted #ccc; padding: 1em 0; width: 200px; diff --git a/templates/index.html b/templates/index.html index 5a376ac..49322f7 100644 --- a/templates/index.html +++ b/templates/index.html @@ -12,7 +12,7 @@
- + {% endif %} + {% endblock %}
{% block content%}{% endblock %}
diff --git a/templates/page.html b/templates/page.html index 857416c..d8e55c8 100644 --- a/templates/page.html +++ b/templates/page.html @@ -5,12 +5,6 @@ {{ current_section.title }} {% endblock %} - -{% block content %} -

{{ page.title }}

- {{ page.content | safe }} -{% endblock %} - {% block menu %} {% set global_section = get_section(path="_index.md") %} {% for s in global_section.subsections %} @@ -23,10 +17,18 @@ {% block nav %} {% if current_section.pages %} - + {% endif %} {% endblock %} + +{% block content %} +

{{ page.title }}

+ {{ page.content | safe }} +{% endblock %} + diff --git a/templates/section.html b/templates/section.html index 1f83f01..d04eded 100644 --- a/templates/section.html +++ b/templates/section.html @@ -11,4 +11,5 @@ {% block content %}

{{ section.title }}

{{ section.content | safe }} + {{ __tera_context }} {% endblock content %}