theme v4

5 files changed, 35 insertions, 99 deletions

diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
deleted file mode 100644
index e69de29..0000000
--- a/templates/partials/base.html.twig
+++ /dev/null
diff --git a/templates/partials/header.html.twig b/templates/partials/header.html.twig
new file mode 100644
index 0000000..4229a92
--- /dev/null
+++ b/templates/partials/header.html.twig
@@ -0,0 +1,11 @@
+		<div class="header">
+            {% if page.header.icon %}
+			<span class=icon>{{page.header.icon}}</span>
+            {% else %}
+            <span class=icon>web</span>
+            {% endif %}
+            {% if page.url != "/" %}
+            <a href="/" style="color:white;">{{site.title|e}}</a>
+            {% endif %}
+            <span class="icon" style="color:transparent;">web</span>
+		</div>
\ No newline at end of file
diff --git a/templates/partials/list.html.twig b/templates/partials/list.html.twig
new file mode 100644
index 0000000..eb2f485
--- /dev/null
+++ b/templates/partials/list.html.twig
@@ -0,0 +1,9 @@
+<ul>
+    {% for current_page in page.children %}
+        <li>
+            <a href="{{ current_page.url|e }}">
+                {{ current_page.title|e }}
+            </a>
+        </li>
+    {% endfor %}
+</ul>
diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig
index 28df6aa..4426c8c 100644
--- a/templates/partials/navigation.html.twig
+++ b/templates/partials/navigation.html.twig
@@ -1,47 +1,16 @@
-{% macro loop(page) %}
-    {% for p in page.children.visible %}
-        {% set current_page = (p.active or p.activeChild) ? 'selected' : '' %}
-        {% if p.children.visible.count > 0 %}
-            <li class="has-children {{ current_page|e }}">
-                <a href="{{ p.url|e }}">
-                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon|e }}"></i>{% endif %}
-                    {{ p.menu|e }}
-                </a>
-                <ul>
-                    {{ _self.loop(p) }}
-                </ul>
-            </li>
-        {% else %}
-            <li class="{{ current_page|e }}">
-                <a href="{{ p.url|e }}">
-                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon|e }}"></i>{% endif %}
-                    {{ p.menu|e }}
-                </a>
-            </li>
-        {% endif %}
-    {% endfor %}
-{% endmacro %}
-
-<ul>
-    {% if config.theme.dropdown.enabled %}
-        {{ _self.loop(pages) }}
-    {% else %}
-        {% for page in pages.children.visible %}
-            {% set current_page = (page.active or page.activeChild) ? 'selected' : '' %}
-            <li class="{{ current_page|e }}">
-                <a href="{{ page.url|e }}">
-                    {% if page.header.icon %}<i class="fa fa-{{ page.header.icon|e }}"></i>{% endif %}
-                    {{ page.menu|e }}
-                </a>
-            </li>
-        {% endfor %}
+<div class=links>
+    {% if page.parent.url != "/" %}
+    <a class="anim3" href="{{ page.parent.url }}">
+        <div class="roundedButton">
+            <span class="icon">arrow_back</span>
+            <span>Back</span>
+        </div>
+    </a>
     {% endif %}
-    {% for mitem in site.menu %}
-        <li>
-            <a href="{{ mitem.url|e }}">
-                {% if mitem.icon %}<i class="fa fa-{{ mitem.icon|e }}"></i>{% endif %}
-                {{ mitem.text|e }}
-            </a>
-        </li>
-    {% endfor %}
-</ul>
+    <a class="anim4" href="/">
+        <div class="roundedButton">
+            <span class="icon">home</span>
+            <span>Home</span>
+        </div>
+    </a>
+</div>
diff --git a/templates/partials/navigation2.html.twig b/templates/partials/navigation2.html.twig
deleted file mode 100644
index 2e865bd..0000000
--- a/templates/partials/navigation2.html.twig
+++ /dev/null
@@ -1,53 +0,0 @@
-{% macro loop(page) %}
-    {% for p in page.children.visible %}
-        {% set current_page = (p.active or p.activeChild) ? 'selected' : '' %}
-        {% if p.children.visible.count > 0 %}
-        
-            <li class="has-children {{ current_page|e }}">
-                <a href="{{ p.url|e }}">
-                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon|e }}"></i>{% endif %}
-                    {{ p.menu|e }}
-                </a>
-                <ul>
-                    {{ _self.loop(p) }}
-                </ul>
-            </li>
-        {% else %}
-        
-            <li class="{{ current_page|e }}">
-                <a href="{{ p.url|e }}">
-                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon|e }}"></i>{% endif %}
-                    {{ p.menu|e }}
-                </a>
-            </li>
-        {% endif %}
-    {% endfor %}
-{% endmacro %}
-
-<ul>
-    {% if config.theme.dropdown.enabled %}
-        {{ _self.loop(pages) }}
-        
-    {% else %}
-    
-        {% for page in pages.children.visible %}
-            {% set current_page = (page.active or page.activeChild) ? 'selected' : '' %}
-                {% if page.menu|e != 'Home' %}
-                    <li class="{{ current_page|e }}">
-                        <a href="{{ page.url|e }}">
-                            {% if page.header.icon %}<i class="fa fa-{{ page.header.icon|e }}"></i>{% endif %}
-                            {{ page.menu|e }}
-                        </a>
-                    </li>
-                {% endif %}
-        {% endfor %}
-    {% endif %}
-    {% for mitem in site.menu %}
-        <li>
-            <a href="{{ mitem.url|e }}">
-                {% if mitem.icon %}<i class="fa fa-{{ mitem.icon|e }}"></i>{% endif %}
-                {{ mitem.text|e }}
-            </a>
-        </li>
-    {% endfor %}
-</ul>