hugo.soucy.cc

commit 1d157c3087bdad7336d816fea1e1e532e08c554c
parent a440af93ae056d533163a8d48f17265b41b12567
Author: Hugo Soucy <hugo@soucy.cc>
Date:   Sat, 18 Nov 2017 10:13:54 -0500

Fix the navigation.

Diffstat:
M
templates/partials/nav.mustache
 | 
32
++++++++++++++++++++++++--------
D
templates/partials/nav_close.mustache
 | 
14
--------------
D
templates/partials/nav_index.mustache
 | 
38
--------------------------------------
D
templates/partials/nav_trap.mustache
 | 
3
---

4 files changed, 24 insertions(+), 63 deletions(-)
diff --git a/templates/partials/nav.mustache b/templates/partials/nav.mustache
@@ -25,19 +25,35 @@
           </a>
         </li>
         <li class="nav__item">
-            <a class="nav__link" href="{{{ SITE.BASEURL }}}/a-propos.html">
-                À propos
-            </a>
+          <a class="nav__link" href="{{{ SITE.BASEURL }}}/a-propos.html">
+            À propos
+          </a>
         </li>
         <li class="nav__item">
-            <a class="nav__link" href="{{{ SITE.BASEURL }}}/feed.atom.xml">
-                Flux Atom
-            </a>
+          <a class="nav__link" href="{{{ SITE.BASEURL }}}/feed.atom.xml">
+            Flux Atom
+          </a>
         </li>
       </ul>
     </div>
 
-    {{> nav.close.mustache }}
-    {{> nav.trap.mustache }}
+    <script id="navCloseTpl" type="text/tpl">
+      <a class="nav__close" href="#" role="button">
+      <span class="nav__close__text">
+      Fermer <span class="visuallyhidden">le menu</span>
+      </span>
+
+      <span class="nav__x">
+      <svg class="nav__x__ico" fill="currentColor" height="50" viewBox="0 0 24 24" width="50" xmlns="http://www.w3.org/2000/svg">
+      <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
+      <path d="M0 0h24v24H0z" fill="none"/>
+      </svg>
+      </span>
+      </a>
+    </script>
+
+    <script id="navTrapTpl" type="text/tpl">
+      <button class="nav__trap visuallyhidden">Focus Trap</button>
+    </script>
   </div>
 </nav>
diff --git a/templates/partials/nav_close.mustache b/templates/partials/nav_close.mustache
@@ -1,14 +0,0 @@
-<script id="navCloseTpl" type="text/tpl">
-  <a class="nav__close" href="#" role="button">
-    <span class="nav__close__text">
-      Fermer <span class="visuallyhidden">le menu</span>
-    </span>
-
-    <span class="nav__x">
-      <svg class="nav__x__ico" fill="currentColor" height="50" viewBox="0 0 24 24" width="50" xmlns="http://www.w3.org/2000/svg">
-        <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
-        <path d="M0 0h24v24H0z" fill="none"/>
-      </svg>
-    </span>
-  </a>
-</script>
diff --git a/templates/partials/nav_index.mustache b/templates/partials/nav_index.mustache
@@ -1,38 +0,0 @@
-<nav class="nav">
-  <div class="nav__panel" id="menu"  tabindex="0">
-    <div class="nav__panel__content layout">
-      <h2 class="visuallyhidden">Menu principal</h2>
-      
-      <ul class="nav__list" role="menubar">                
-        <li class="nav__item">
-          <a class="nav__link" href="{{{ SITE.BASEURL }}}/note">
-            Notes
-          </a>
-        </li>
-        <li class="nav__item">
-          <a class="nav__link" href="{{{ SITE.BASEURL }}}/txt">
-            Textes
-          </a>
-        </li>
-        <li class="nav__item">
-          <a class="nav__link" href="{{{ SITE.BASEURL }}}/file/curriculum-vitae.html">
-            Curriculum vitae
-          </a>
-        </li>
-        <li class="nav__item">
-            <a class="nav__link" href="{{{ SITE.BASEURL }}}/a-propos.html">
-                À propos
-            </a>
-        </li>
-        <li class="nav__item">
-            <a class="nav__link" href="{{{ SITE.BASEURL }}}/feed.atom.xml">
-                Flux Atom
-            </a>
-        </li>
-      </ul>
-    </div>        
-
-    {{> nav.close.mustache }}
-    {{> nav.trap.mustache }}
-  </div>
-</nav>
diff --git a/templates/partials/nav_trap.mustache b/templates/partials/nav_trap.mustache
@@ -1,3 +0,0 @@
-<script id="navTrapTpl" type="text/tpl">
-  <button class="nav__trap visuallyhidden">Focus Trap</button>
-</script>