From 40afeee2aa91b0d2dd87817dfbd2f20f98eeef86 Mon Sep 17 00:00:00 2001
From: Aiden X <caichao.xu@gmail.com>
Date: Mon, 14 Sep 2020 21:04:29 +0800
Subject: page: add menu func

---
 assets/scss/_single.scss       | 22 +++++++++++++++++-----
 assets/scss/_taxonomy.scss     |  6 ++++++
 assets/scss/less.scss          |  1 +
 layouts/_default/single.html   | 40 ++++++++++++++++++++++++----------------
 layouts/_default/taxonomy.html | 24 ++++++++++++++++++++++++
 layouts/_default/terms.html    |  1 +
 layouts/index.html             | 30 ++++++++++++++----------------
 layouts/partials/header.html   | 26 ++++++++++++++------------
 8 files changed, 101 insertions(+), 49 deletions(-)
 create mode 100644 assets/scss/_taxonomy.scss
 create mode 100644 layouts/_default/taxonomy.html
 create mode 100644 layouts/_default/terms.html

diff --git a/assets/scss/_single.scss b/assets/scss/_single.scss
index b577f13..1989361 100644
--- a/assets/scss/_single.scss
+++ b/assets/scss/_single.scss
@@ -3,10 +3,15 @@
   line-height: 2;
   color: #4C4E4D;
   font-size: 16px;
+  display: flex;
+
+  .single-body {
+    max-width: 100%;
+  }
 
   .single-title {
     line-height: 1.2;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     font-size: 30px;
     font-weight: 500;
     font-family: 'Monda', -apple-system, BlinkMacSystemFont, PingFang SC, Hiragino Sans GB, Microsoft YaHei, "\5FAE\8F6F\96C5\9ED1", helvetica neue, helvetica, ubuntu, roboto, noto, segoe ui, Arial, sans-serif;
@@ -23,10 +28,13 @@
     border-radius: 2px;
     padding: 20px;
     overflow: auto;
-    line-height: 1.4;
-    
+    line-height: 1.6;
+    background: #111115 !important;
+
     code {
       font-size: 14px;
+      white-space: inherit;
+      word-break: inherit;
     }
   }
 
@@ -70,8 +78,13 @@
 }
 
 .single-date {
-  margin-right: 10px;
   color: #a0a0a0;
+  margin-bottom: 10px;
+}
+
+.single-tag {
+  font-size: 14px;
+  margin-right: 10px;
 }
 
 .single-toc {
@@ -82,7 +95,6 @@
   color: #909090;
   position: fixed;
   top: 50%;
-  right: 0;
   transform: translate(0, -50%);
 
   @include mobile {
diff --git a/assets/scss/_taxonomy.scss b/assets/scss/_taxonomy.scss
new file mode 100644
index 0000000..7871ca3
--- /dev/null
+++ b/assets/scss/_taxonomy.scss
@@ -0,0 +1,6 @@
+.taxonomy-name {
+  font-size: 20px;
+  margin-bottom: 50px;
+  color: #909090;
+  font-family: 'Monda', -apple-system, sans-serif;
+}
\ No newline at end of file
diff --git a/assets/scss/less.scss b/assets/scss/less.scss
index bc44603..ccf35ce 100644
--- a/assets/scss/less.scss
+++ b/assets/scss/less.scss
@@ -13,6 +13,7 @@ $container-max-widths: (md: 800px,);
 @import "heaader";
 @import "single";
 @import "footer";
+@import "taxonomy";
 
 @include container($breakpoints: $breakpoints);
 @include row();
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 2b5b1f1..0ef0cce 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,25 +1,33 @@
 {{ define "main" }}
     <div class="container">
-        <div class="main">
-            <div class="single">
-                <div class="single-title">
-                    {{.Title}}
-                </div>
+        <div class="row">
+            <div class="main single">
+                <div class="single-body column">
+                    <div class="single-title">
+                        {{.Title}}
+                    </div>
                     <div class="single-date">
                         {{ .Date.Format "2006-01-02" }}
                     </div>
-<!--                     {{ if .Params.tags }} -->
-<!--                         <div class="single-tags"> -->
-<!--                             {{ range $k, $v := .Params.tags }} -->
-<!--                                 <a class="single-tag" href="{{ "tags/" | absLangURL }}{{ . }}"> -->
-<!--                                     #{{ . }} -->
-<!--                                 </a> -->
-<!--                             {{ end }} -->
-<!--                         </div> -->
-<!--                     {{ end }} -->
-                <div class="single-content">
-                    {{.Content}}
+                    <div class="single-tags">
+                        {{ range (.GetTerms "tags") }}
+                            <a class="single-tag" href="{{ .Permalink }}">#{{ .LinkTitle }}</a>
+                        {{ end }}
+                    </div>
+                    <div class="single-content">
+                        {{.Content}}
+                    </div>
                 </div>
+
+            </div>
+            <script src="https://utteranc.es/client.js"
+                    repo="4ever9/blog-comments"
+                    issue-term="pathname"
+                    theme="github-light"
+                    crossorigin="anonymous"
+                    async>
+            </script>
+            <div class="single-toc-wrap">
                 <div class="single-toc"></div>
             </div>
         </div>
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
new file mode 100644
index 0000000..1d20ddd
--- /dev/null
+++ b/layouts/_default/taxonomy.html
@@ -0,0 +1,24 @@
+{{ define "main" }}
+    <div class="container">
+        <div class="main">
+            <div class="taxonomy-name">
+                #{{.Name}}(共{{ len .Data.Pages }}篇)
+            </div>
+            {{ range (.RegularPages.GroupByDate "2006") }}
+                <div class="posts">
+                    <div class="year">{{ .Key }}</div>
+                    {{ range .Pages }}
+                        <div class="post">
+                            <a class="post-title" href="{{.Permalink}}">
+                                {{.Title}}
+                            </a>
+                            <span class="post-date">
+                                {{ .Date.Format "Jan 02" }}
+                            </span>
+                        </div>
+                    {{ end }}
+                </div>
+            {{ end }}
+        </div>
+    </div>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
new file mode 100644
index 0000000..b9cde12
--- /dev/null
+++ b/layouts/_default/terms.html
@@ -0,0 +1 @@
+term
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index 4e880fc..7e94c2d 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,23 +1,21 @@
 {{ define "main" }}
     <div class="container">
-        <div class="row">
-            <div class="column main">
-                {{ range (.Site.RegularPages.GroupByDate "2006") }}
-                    <div class="posts">
-                        <div class="year">{{ .Key }}</div>
-                        {{ range .Pages }}
-                            <div class="post">
-                                <a class="post-title" href="{{.Permalink}}">
-                                    {{.Title}}
-                                </a>
-                                <span class="post-date">
+        <div class="main">
+            {{ range (.Site.RegularPages.GroupByDate "2006") }}
+                <div class="posts">
+                    <div class="year">{{ .Key }}</div>
+                    {{ range .Pages }}
+                        <div class="post">
+                            <a class="post-title" href="{{.Permalink}}">
+                                {{.Title}}
+                            </a>
+                            <span class="post-date">
                                     {{ .Date.Format "Jan 02" }}
                                 </span>
-                            </div>
-                        {{ end }}
-                    </div>
-                {{ end }}
-            </div>
+                        </div>
+                    {{ end }}
+                </div>
+            {{ end }}
         </div>
     </div>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 80dd680..1c1ae59 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,13 +1,15 @@
 <div class="container">
-    <div class="nav">
-        <a class="logo" href="/">
-            <img src="/images/logo.png" alt="">
-        </a>
-<!--         <ul class="nav-menu"> -->
-<!--             <li> -->
-<!--                 <a href="/about">关于</a> -->
-<!--             </li> -->
-<!--         </ul> -->
-        <i class="icon icon-moon" id="btn-dark"></i>
-    </div>
-</div>
\ No newline at end of file
+  <div class="nav">
+    <a class="logo" href="/">
+      <img src="/images/logo.png" alt="" />
+    </a>
+    <ul class="nav-menu">
+      {{range $menu := .Site.Menus.main}}
+      <li>
+        <a href="{{.URL}}">{{.Name}}</a>
+      </li>
+      {{end}}
+    </ul>
+    <i class="icon icon-moon" id="btn-dark"></i>
+  </div>
+</div>
-- 
cgit v1.2.3