From 0ec5a72fa2c233f8717f07cb938571f1d2cb7c17 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Tue, 27 Jun 2017 17:56:49 +0200
Subject: [PATCH] =?utf8?q?Abst=C3=A4nde=20zwischen=20aktiven/nicht-aktiven?=
 =?utf8?q?=20Men=C3=BCeintr=C3=A4gen=20korrigiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

TODO:
Passt das zu den Änderungen, auf die Rebased wurde?
---
 dist/less/screen/menu.less           | 4 ++++
 dist/thymeleaf/templates/layout.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dist/less/screen/menu.less b/dist/less/screen/menu.less
index d35c541c..79c3ce28 100644
--- a/dist/less/screen/menu.less
+++ b/dist/less/screen/menu.less
@@ -53,6 +53,10 @@
 {
   margin-top: 2em; /** 32px */
 }
+#submenu ul.active
+{
+  margin-top: 1.5em; /** 24px */
+}
 #submenu li.s
 {
   margin: 0 0 .5em 0; /** 0 0 10px 0 */
diff --git a/dist/thymeleaf/templates/layout.html b/dist/thymeleaf/templates/layout.html
index 17be9e59..94c688b3 100644
--- a/dist/thymeleaf/templates/layout.html
+++ b/dist/thymeleaf/templates/layout.html
@@ -152,7 +152,7 @@
                     >fix-swf</a>
                 <ul th:if="${selected and childs != null}"
                     class="s active"
-                    th:class="'s' + (${selected} ? ' active' : '') + (${entry.key == uri or (len &gt; 1 and entry.key == crumbs.get(len-2).uri and page['childs'] == null)} ? ' selected' : '')"
+                    th:class="'s' + (${selected &amp;&amp; pos == crumbs.size()-1} ? ' active' : '') + (${entry.key == uri or (len &gt; 1 and entry.key == crumbs.get(len-2).uri and page['childs'] == null)} ? ' selected' : '')"
                     >
                   <li th:replace="templates/layout :: submenu(submenu=${childs}, parent=${entry.key}, pos=${pos + 1})"
                       class="s"
-- 
2.20.1