maybe finish first version

zzsqwq · Apr 20, 2022 · 8f200ae · 8f200ae
1 parent ffe4be9
commit 8f200ae
Show file tree

Hide file tree

Showing 8 changed files with 718 additions and 720 deletions.
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -8,7 +8,8 @@
 
     <main id="page_main">
         {{partial "side-bar" .}}
-        {{block "content" .}}{{end}}
+        {{block "content" .}}
+        {{end}}
     </main>
 
     {{partial "mobile-nav" .}}

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -1,6 +1,5 @@
 {{define "content"}}
 <div class="page" itemscope="itemscope" itemtype="http://schema.org/CreativeWork">
-    <h2 class="page-title">{{.Title}}</h2>
-    <article>{{.Content}}</article>
+    {{partial "page" .}}
 </div>
 {{end}}
diff --git a/layouts/index.html b/layouts/index.html
@@ -1,7 +1,9 @@
 {{define "content"}}
 <div class="page" itemscope="itemscope" itemtype="http://schema.org/CreativeWork">
     {{range .Site.Pages }}
-        <a href="{{.Permalink}}">{{.Content}}</a>
+    {{if .Params.homepage }}
+        {{partial "page" .}}
+    {{end}}
     {{end}}
 </div>
 {{end}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
@@ -4,5 +4,12 @@
     <button class="menus_icon">
         <div class="navicon"></div>
     </button>
+    <ul class="menus_items">
+        {{range sort .Site.Params.menu "weight" }}
+            <li class="menus_items">
+                <a class="site-page" href="{{.url | safeURL}}">{{title .name}}</a>
+            </li>
+        {{end}}
+    </ul>
 
 </div>
diff --git a/layouts/partials/mobile-nav.html b/layouts/partials/mobile-nav.html
@@ -4,9 +4,9 @@
             <div class="navicon"></div>
         </button>
         <ul class="nav_items">
-            {{range $key, $value := .Site.Params.menu}}
+            {{range sort .Site.Params.menu "weight" }}
                 <li class="nav_item">
-                    <a class="nav-page" href="{{$value}}">{{$key}}</a>
+                    <a class="nav-page" href="{{.url}}">{{title .name}}</a>
                 </li>
             {{end}}
         </ul>

diff --git a/layouts/partials/page.html b/layouts/partials/page.html
@@ -0,0 +1,4 @@
+<h2 class="page-title">{{.Title}}</h2>
+<article>
+    {{.Content}}
+</article>