From a8a2384183ffa9912b8873daf222f4a57cba8a52 Mon Sep 17 00:00:00 2001
From: TLRZ Seyfferth <christian.seyfferth@tlrz.thueringen.de>
Date: Tue, 5 May 2020 18:21:52 +0200
Subject: [PATCH] [TASK] cleanup layout

---
 .../chrosey_materialize/templates/index.twig   |  4 ----
 .../templates/layout/base.twig                 | 18 ++----------------
 .../templates/layout/navigationBar.twig        | 14 +++++++++-----
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Packages/chrosey_materialize/templates/index.twig b/Packages/chrosey_materialize/templates/index.twig
index a02c6c1..8a207a8 100644
--- a/Packages/chrosey_materialize/templates/index.twig
+++ b/Packages/chrosey_materialize/templates/index.twig
@@ -1,5 +1 @@
 {% extends "templates/layout/base.twig" %}
-
-{% block aside %}
-
-{% endblock %}
diff --git a/Packages/chrosey_materialize/templates/layout/base.twig b/Packages/chrosey_materialize/templates/layout/base.twig
index c09caf7..c0d4913 100644
--- a/Packages/chrosey_materialize/templates/layout/base.twig
+++ b/Packages/chrosey_materialize/templates/layout/base.twig
@@ -42,26 +42,12 @@
     {% include "templates/layout/navigationBar.twig" %}
     <main class="container">
         <div class="row">
-            <div class="col-sm-12 col-md-6 col-lg-6">
+            <div class="col s12">
                 {% block content %}
-                <section>
-                    {{ content }}
-                </section>
+                {{ content }}
                 {% endblock %}
 
             </div>
-            <aside class="col-sm-12 col-md-2 col-lg-2">
-                <div class="row">
-                    <div class="col-sm-12">
-                        {% block aside %}
-                        <section>
-                            {{ aside }}
-                        </section>
-                        {% endblock %}
-
-                    </div>
-                </div>
-            </aside>
         </div>
     </main>
     {% include "templates/layout/footer.twig" %}
diff --git a/Packages/chrosey_materialize/templates/layout/navigationBar.twig b/Packages/chrosey_materialize/templates/layout/navigationBar.twig
index 8d6f62d..eddc507 100644
--- a/Packages/chrosey_materialize/templates/layout/navigationBar.twig
+++ b/Packages/chrosey_materialize/templates/layout/navigationBar.twig
@@ -1,17 +1,18 @@
-{% block navigation %}
 <nav class="white"
      role="navigation">
    <div class="nav-wrapper container">
       <a id="logo-container"
          href="{{ "index"|link }}"
          class="brand-logo">
-         <img src="{{ assets_url }}/logo.svg "
+         <img class="center"
+              src="{{ assets_url }}/logo.svg "
               alt=""
-              height="50"
-              width="50" />
+              height="48"
+              width="48" />
       </a>
       <a data-target="slide-out"
          class="sidenav-trigger"><i class="material-icons">menu</i></a>
+      {% block navigation %}
       <ul class="right hide-on-med-and-down">
          {% for page in pages("index") if not page.hidden %}
 
@@ -40,11 +41,14 @@
          </li>
          {% endfor %}
       </ul>
+
+      {% endblock %}
    </div>
 </nav>
 
 <ul id="slide-out"
     class="sidenav sidenav-fixed collapsible">
+   {% block sideNavigation %}
    {% for page in pages("index") if not page.hidden %}
    {% if pages(page.id) | length < 1 %}
    <li>
@@ -70,5 +74,5 @@
 
    </li>
    {% endfor %}
+   {% endblock %}
 </ul>
-{% endblock %}