Abstände zwischen aktiven/nicht-aktiven Menüeinträgen korrigiert

TODO:
Passt das zu den Änderungen, auf die Rebased wurde?

diff --git a/dist/less/screen/menu.less b/dist/less/screen/menu.less
index d35c541..79c3ce2 100644 (file)
--- 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 17be9e5..94c688b 100644 (file)
--- 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"