X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=dist%2Ftemplates%2Flayout.html;h=4d14f14043e785ba28a7fe92a41a75c594aaf3ec;hb=98990889825a552dc7edf2be73231dd868135d37;hp=a5fe75f4b5a01c033bba33c6000966a4ddadde09;hpb=b73cd19c1e17a01541df9d46815d28d1a46eb55d;p=website

diff --git a/dist/templates/layout.html b/dist/templates/layout.html
index a5fe75f4..4d14f140 100644
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -19,10 +19,10 @@
       th:with="crumbs=${_crumbs.get(uri)}"
       >
     <nav class="column is-8-desktop is-offset-2-desktop">
-      <div class="navbar" role="navigation" aria-label="main navigation">
+      <div class="navbar is-size-2-tablet has-text-weight-bold" role="navigation" aria-label="main navigation">
         <div class="navbar-brand">
           <a class="navbar-item" href="../index.html" th:href="@{/}" title="Home">
-            <img src="/img/logo.svg" alt="juplo">
+            <img src="/img/logo.svg" alt="juplo" class="logo">
           </a>
       
           <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar">
@@ -33,8 +33,8 @@
         </div>
       
         <div id="navbar" class="navbar-menu">
-          <div class="navbar-start">
-            <a class="navbar-item" href="../blog/" th:href="@{${entry.value}}">Blog</a>
+          <div class="navbar-start" th:each="entry : ${_sections}">
+            <a class="navbar-item" href="../blog/" th:href="@{${entry.value}}" th:text="${_titles.get(entry.value)}">Blog</a>
             <!--/*-->
             <a class="navbar-item" href="../projects.html">Projects</a>
             <a class="navbar-item" href="../about.html">About</a>
@@ -58,14 +58,15 @@
               <li class="is-active"><a class="b" th:text="${title}">Fix SWF</a></li>
               <!--*/-->
             </ul>
+            <a href="#nav" title="Show navigation menu">Jump to navigation</a>
           </div>
         </div>
       </div>
     </section>
-    <section class="section">
+    <section class="section" id="top">
       <div class="container">
         <div class="columns">
-          <div class="column is-8-desktop is-offset-2-desktop">
+          <div class="column is-8-desktop is-offset-2-desktop content" th:include="${maincontent}">
             <h1 class="title" th:include="${title}">Title</h1>
             <div class="content" th:fragment="maincontent">
               <p>
@@ -156,30 +157,30 @@
                 <li>
                   <p>
                     <strong>Move</strong> to this directory:
-                    <br>
+                    <br />
                     <pre><code>cd bulma-start</code></pre>
                   </p>
                 </li>
                 <li>
                   <p>
                     <strong>Install</strong> all dependencies:
-                    <br>
+                    <br />
                     <pre><code>npm install</code></pre>
                   </p>
                 </li>
                 <li>
                   <p>
                     <strong>Start</strong> the CSS and JS watchers:
-                    <br>
+                    <br />
                     <pre><code>npm start</code></pre>
                   </p>
                 </li>
                 <li>
                   <p>
                     <strong>Edit</strong> <code>_sass/main.scss</code> by adding the following rule at the <strong>end</strong> of the file:
-                    <br>
+                    <br />
                     <pre><span style="color: #22863a;">html</span> {
-    <span styl"color: #005cc5;"><span style="color: #005cc5;">background-color</span></span>: <span style="color: #24292e">$green</span>;
+    <span style="color: #005cc5;"><span style="color: #005cc5;">background-color</span></span>: <span style="color: #24292e">$green</span>;
   }</pre>
                   </p>
                 </li>
@@ -265,6 +266,101 @@
         </div>
       </div>
     </section>
+    <nav id="nav"
+        th:include="~{::#navigation}?:_"
+        th:with="section=${crumbs != null ? crumbs[0] : null}"
+        >
+      <hr class="n"/>
+      <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>
+      <h1 class="nav">Navigation</h1>
+      <h2 class="nav menu">Section-Menu</h2>
+      <ul id="menu" class="cf">
+        <li class="m blog" th:each="entry : ${_sections}" th:class="'m ' + ${entry.key}">
+          <a href="../blog/" th:href="@{${entry.value}}" class="m" th:class="${entry.value == section} ? 'm selected' : 'm'" th:text="${_titles.get(entry.value)}">Blog</a>
+        </li>
+        <!--/*-->
+        <li class="m projects"><a href="../projects.html" class="m selected">Projects</a></li>
+        <li class="m about"><a href="../about.html" class="m">About</a></li>
+        <!--*/-->
+      </ul>
+      <h2 class="nav submenu">
+        <span class="s">Submenu for section</span>
+        <a class="s selected" href="../projects.html" th:href="@{${section}}" th:text="${_titles.get(section)}">Projects</a>
+      </h2>
+      <ul th:include="${submenu}?:_"
+          th:with="
+            len=${crumbs.size()},
+            submenu=${_childs.get(section)},
+            parent=${crumbs[0]},
+            pos=1"
+          id="submenu"
+          class="s"
+          th:class="'s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')"
+          >
+        <li th:fragment="submenu(submenu, parent, pos)"
+            th:each="entry : ${submenu}"
+            th:with="
+                child=${pos == len},
+                selected=${!child and crumbs.get(pos) == entry},
+                sibling=${pos + 1 == len and (_childs.get(uri) == null or uri == parent)},
+                childs=${entry == parent ? null : _childs.get(entry)}
+                "
+            class="s sub"
+            th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or child} ? '' : ' off')"
+            >
+          <a  href="../potemkin/fix-swf/overview.html"
+              th:if="${entry != parent}"
+              th:href="@{${entry}}"
+              class="s selected"
+              th:class="${selected} ? 's selected' : 's'"
+              th:text="${_titles.get(entry)}"
+              >fix-swf</a>
+          <ul th:if="${selected and childs != null}"
+              class="s active"
+              th:class="'s' + (${selected &amp;&amp; pos == crumbs.size()-1} ? ' active' : '') + (${entry == uri or (len &gt; 1 and entry == crumbs.get(len-2) and _childs.get(uri) == null)} ? ' selected' : '')"
+              >
+            <li th:replace="this :: submenu(submenu=${childs}, parent=${entry}, pos=${pos + 1})"
+                class="s"
+                >
+              <strong class="s">Overview</strong>
+            </li>
+            <!--/*-->
+            <li class="s"><a href="../potemkin/fix-swf/getting-started.html" class="s">Getting Started</a></li>
+            <li class="s"><a href="#" class="s">FAQ</a></li>
+            <li class="s"><a href="#" class="s">Documentation</a></li>
+            <!--*/-->
+          </ul>
+        </li>
+        <!--/*-->
+        <li class="s sub off"><a href="#" class="s">hibernate4-maven-plugin</a></li>
+        <li class="s off"><a href="#" class="s">jquery.openx</a></li>
+        <li class="s sub off"><a href="../potemkin/html-experimente.html" th:href="@{/potemkin/html-experimente.html}" class="s">HTML-Experimente</a></li>
+        <li class="s sub off"><a href="#" class="s">accelerator</a></li>
+        <li class="s off"><a href="../potemkin/typo.html" th:href="@{/potemkin/typo.html}" class="s">Typography</a></li>
+        <!--*/-->
+      </ul>
+      <hr class="n"/>
+    </nav>
+    <aside class="m" th:insert="${marginalcontent}?:~{}">
+    <!--/* the following  is only visible during natural templating -->
+      <h1>Other nasty but marginal stuff</h1>
+      <p>
+        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
+        eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
+        ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
+        aliquip ex ea commodo consequat. Duis aute irure dolor in
+        reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+        pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+        culpa qui officia deserunt mollit anim id est laborum.
+      </p>
+    </aside>
+    <aside class="m">
+      <h1>More nasty stuff</h1>
+      <p>
+        This one is really short!
+      </p>
+    <!--*/-->
+    </aside>
     <footer class="footer">
       <div class="container">
         <div class="columns">
@@ -282,106 +378,6 @@
         </div>
       </div>
     </footer>
-    <div id="page" class="cf">
-      <main class="content cf">
-        <div class="marginal">
-          <nav id="nav"
-              th:include="~{::#navigation}?:_"
-              th:with="section=${crumbs != null ? crumbs[0] : null}"
-              >
-            <hr class="n"/>
-            <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>
-            <h1 class="nav">Navigation</h1>
-            <h2 class="nav menu">Section-Menu</h2>
-            <ul id="menu" class="cf">
-              <li class="m blog" th:each="entry : ${_sections}" th:class="'m ' + ${entry.key}">
-                <a href="../blog/" th:href="@{${entry.value}}" class="m" th:class="${entry.value == section} ? 'm selected' : 'm'" th:text="${_titles.get(entry.value)}">Blog</a>
-              </li>
-              <!--/*-->
-              <li class="m projects"><a href="../projects.html" class="m selected">Projects</a></li>
-              <li class="m about"><a href="../about.html" class="m">About</a></li>
-              <!--*/-->
-            </ul>
-            <h2 class="nav submenu">
-              <span class="s">Submenu for section</span>
-              <a class="s selected" href="../projects.html" th:href="@{${section}}" th:text="${_titles.get(section)}">Projects</a>
-            </h2>
-            <ul th:include="${submenu}?:_"
-                th:with="
-                  len=${crumbs.size()},
-                  submenu=${_childs.get(section)},
-                  parent=${crumbs[0]},
-                  pos=1"
-                id="submenu"
-                class="s"
-                th:class="'s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')"
-                >
-              <li th:fragment="submenu(submenu, parent, pos)"
-                  th:each="entry : ${submenu}"
-                  th:with="
-                      child=${pos == len},
-                      selected=${!child and crumbs.get(pos) == entry},
-                      sibling=${pos + 1 == len and (_childs.get(uri) == null or uri == parent)},
-                      childs=${entry == parent ? null : _childs.get(entry)}
-                      "
-                  class="s sub"
-                  th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or child} ? '' : ' off')"
-                  >
-                <a  href="../potemkin/fix-swf/overview.html"
-                    th:if="${entry != parent}"
-                    th:href="@{${entry}}"
-                    class="s selected"
-                    th:class="${selected} ? 's selected' : 's'"
-                    th:text="${_titles.get(entry)}"
-                    >fix-swf</a>
-                <ul th:if="${selected and childs != null}"
-                    class="s active"
-                    th:class="'s' + (${selected &amp;&amp; pos == crumbs.size()-1} ? ' active' : '') + (${entry == uri or (len &gt; 1 and entry == crumbs.get(len-2) and _childs.get(uri) == null)} ? ' selected' : '')"
-                    >
-                  <li th:replace="this :: submenu(submenu=${childs}, parent=${entry}, pos=${pos + 1})"
-                      class="s"
-                      >
-                    <strong class="s">Overview</strong>
-                  </li>
-                  <!--/*-->
-                  <li class="s"><a href="../potemkin/fix-swf/getting-started.html" class="s">Getting Started</a></li>
-                  <li class="s"><a href="#" class="s">FAQ</a></li>
-                  <li class="s"><a href="#" class="s">Documentation</a></li>
-                  <!--*/-->
-                </ul>
-              </li>
-              <!--/*-->
-              <li class="s sub off"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-              <li class="s off"><a href="#" class="s">jquery.openx</a></li>
-              <li class="s sub off"><a href="../potemkin/html-experimente.html" th:href="@{/potemkin/html-experimente.html}" class="s">HTML-Experimente</a></li>
-              <li class="s sub off"><a href="#" class="s">accelerator</a></li>
-              <li class="s off"><a href="../potemkin/typo.html" th:href="@{/potemkin/typo.html}" class="s">Typography</a></li>
-              <!--*/-->
-            </ul>
-            <hr class="n"/>
-          </nav>
-          <aside class="m" th:insert="${marginalcontent}?:~{}">
-          <!--/* the following  is only visible during natural templating -->
-            <h1>Other nasty but marginal stuff</h1>
-            <p>
-              Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-              eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-              ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-              aliquip ex ea commodo consequat. Duis aute irure dolor in
-              reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-              pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-              culpa qui officia deserunt mollit anim id est laborum.
-            </p>
-          </aside>
-          <aside class="m">
-            <h1>More nasty stuff</h1>
-            <p>
-              This one is really short!
-            </p>
-          <!--*/-->
-          </aside>
-        </div>
-      </main>
     </div>
   </body>
 </html>