Merge pull request #24 from amzrk2/dev

v2 pre-release

1 files changed, 52 insertions, 50 deletions

diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 51e53d3..7ead0e2 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,51 +1,53 @@
-<!-- in-post toc -->
-{{ if in .Site.Params.mainSections .Type }}
-<div class="widget-toc">
-    <h5>{{ i18n "sidebarToc" }}</h5>
-    {{.TableOfContents}}
-</div>
-{{ end }}
-<!-- pages -->
-<div class="widget-pages">
-    <h5>{{ i18n "sidebarPages" }}</h5>
-    <ul>
-        {{ $currentPage := . }}
-        {{ range .Site.Menus.nav }}
-        <li>
-            <a href="{{ .URL }}">{{ .Name }}</a>
-        </li>
-        {{ end }}
-        <li>
-            <a href="/index.xml" target="_blank">RSS</a>
-        </li>
-    </ul>
-</div>
-<!-- tags -->
-<div class="widget-tags">
-    <h5>{{ i18n "sidebarTags" }}</h5>
-    <div>
-        {{ range .Site.Taxonomies.tags }}
-        <span>
-            <a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a>
-        </span>
-        {{ end }}
+<aside class="col-12 col-md-3 float-left sidebar">
+    <!-- in-post toc -->
+    {{ if and (in .Site.Params.mainSections .Type) (and (.Site.Params.showToc) (ne .Params.noToc true)) }}
+    <div class="sidebar-item sidebar-toc">
+        <h3>{{ i18n "sidebarToc" }}</h3>
+        {{ .TableOfContents }}
     </div>
-</div>
-<!-- links -->
-<div class="widget-links">
-    <h5>{{ i18n "sidebarLinks" }}</h5>
-    <ul>
-        {{ range .Site.Menus.link }}
-        <li>
-            <a href="{{ .URL }}" target="_blank"><span>{{ .Name }}</span></a>
-        </li>
-        {{ end }}
-    </ul>
-</div>
-<!-- bgm.tv image chart -->
-{{ with .Site.Params.bgmImageChart }}
-<div class="widget-bgm">
-    <h5>{{ i18n "sidebarBangumiChart" }}</h5>
-    <img class="lazyload" src="{{ $.Site.Params.lazyPlaceholder }}" data-src="https://bgm.tv/chart/img/{{ . }}" alt="Bangumi Image Chart" />
-</div>
-{{ end }}
\ No newline at end of file
+    {{ end }}
+    <!-- pages -->
+    <div class="sidebar-item sidebar-pages">
+        <h3>{{ i18n "sidebarPages" }}</h3>
+        <ul>
+            {{ range .Site.Menus.nav }}
+            <li>
+                <a href="{{ .URL }}">{{ .Name }}</a>
+            </li>
+            {{ end }}
+            <li>
+                <a href="{{ "/index.xml" | relURL }}" target="_blank">RSS</a>
+            </li>
+        </ul>
+    </div>
+    <!-- tags -->
+    <div class="sidebar-item sidebar-tags">
+        <h3>{{ i18n "sidebarTags" }}</h3>
+        <div>
+            {{ range .Site.Taxonomies.tags }}
+            <span>
+                <a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a>
+            </span>
+            {{ end }}
+        </div>
+    </div>
+    <!-- links -->
+    <div class="sidebar-item sidebar-links">
+        <h3>{{ i18n "sidebarLinks" }}</h3>
+        <ul>
+            {{ range .Site.Menus.link }}
+            <li>
+                <a href="{{ .URL }}" target="_blank"><span>{{ .Name }}</span></a>
+            </li>
+            {{ end }}
+        </ul>
+    </div>
+    {{ with .Site.Params.bgmImageChart }}
+    <!-- bgm.tv image chart -->
+    <div class="sidebar-item sidebar-bgm">
+        <h3>{{ i18n "sidebarBangumiChart" }}</h3>
+        <img class="lazyload" src="{{ $.Site.Params.lazyPlaceholder | relURL }}" data-src="https://bgm.tv/chart/img/{{ . }}"
+             alt="Bangumi 图像榜单" />
+    </div>
+    {{ end }}
+</aside>
\ No newline at end of file