更新：增加收藏栏目

guanqr · Sep 16, 2023 · ca0a51c · ca0a51c
1 parent a081fc3
commit ca0a51c
Show file tree

Hide file tree

Showing 12 changed files with 179 additions and 13 deletions.
diff --git a/assets/scss/custom/_blogroll.scss b/assets/scss/custom/_blogroll.scss
@@ -38,6 +38,7 @@
         width: 4em !important;
         height: 4em !important;
         margin: 0 1em 0 0 !important;
+        pointer-events: none;
         z-index: 0;
     }
 }

diff --git a/assets/scss/custom/_collection.scss b/assets/scss/custom/_collection.scss
@@ -0,0 +1,56 @@
+// 友链样式
+.collection-link::after {
+    content: " ";
+    display: block;
+    clear: both;
+}
+
+.collection-link {
+    display: grid;
+    grid-gap: 0 1.5em;
+    grid-template-columns: 1fr 1fr 1fr;
+}
+
+.collection {
+    padding: 1em 0;
+    border-bottom: 1px dashed var(--color-contrast-low);
+    transition: all .5s;
+    text-decoration: none !important;
+    text-align: center;
+    overflow: hidden;
+    .overview {
+        text-decoration: none;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        margin: 0.5em;
+    }
+    .name {
+        font-weight: bold;
+    }
+    .excerpt {
+        font-size: 0.875em;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+    .cover {
+        width: 12em !important;
+        height: 16em !important;
+        margin: 1em auto 0 !important;
+        pointer-events: none;
+        z-index: 0;
+    }
+}
+
+@media (max-width: $maxWidth) {
+    .collection-link {
+        grid-template-columns: 1fr 1fr;
+    }
+}
+
+@media (max-width: 400px) {
+    .collection-link {
+        grid-template-columns: 1fr;
+    }
+}
diff --git a/assets/scss/custom/_custom.scss b/assets/scss/custom/_custom.scss
@@ -16,8 +16,8 @@
 // 友链
 @import "blogroll";
 
-// 卡牌
-@import "cards";
+// 收藏展示
+@import "collection";
 
 // 一行多图
 @import "gallery";

diff --git a/config.toml b/config.toml
@@ -228,39 +228,39 @@ uglyURLs = false
     #    pre = "internal"
     #    post = "globe-asia"
     #    identifier = "series"
-    #[[menu.main]]
-    #    url = "/cards/"
-    #    name = "藏卡"
-    #    weight = 6
-    #    pre = "internal"
-    #    post = "feather-alt" 
-    #    identifier = "cards"
     [[menu.main]]
         pageref = "/archives/"
         name = "归档"
         weight = 3
         pre = "internal"
         post = "archive"
         identifier = "archives"
+    [[menu.main]]
+        url = "/exhibition/"
+        name = "收藏"
+        weight = 4
+        pre = "internal"
+        post = "feather-alt" 
+        identifier = "cards"
     [[menu.main]]
         pageref = "/blogroll/"
         name = "友链"
-        weight = 4
+        weight = 5
         pre = "internal"
         post = "pagelines"
         identifier = "friends"
     [[menu.main]]
         pageref = "/about/"
         name = "关于"
-        weight = 5
+        weight = 6
         pre = "internal"
         post = "user-circle"
         identifier = "about"
     [[menu.main]]
-        weight = 6
+        weight = 7
         identifier = "theme-switcher"
     [[menu.main]]
-        weight = 7
+        weight = 8
         identifier = "lang-switcher"
     #[[menu.main]]
     #    weight = 11

diff --git a/content/zh/exhibition/_index.md b/content/zh/exhibition/_index.md
@@ -0,0 +1,7 @@
++++
+title = "收藏小屋"
+description = "这里展示了一些我近些年收藏的各种各样的小玩意儿，如果你也感兴趣的话，欢迎交流哦~"
+date = "2023-09-15T23:24:47+08:00"
+dropCap = false
+comments = false
++++
diff --git a/data/collection.toml b/data/collection.toml
@@ -0,0 +1,59 @@
+[[collection]]
+  name = "托尼·斯塔克"
+  url = "/collections/figures/one-sixth-scale-figure-tony-stark/"
+  cover = "/images/cover/one-sixth-scale-figure-tony-stark-cover.jpg"
+  source = "《钢铁侠 2》"
+  head = "ThreeStep Studio"
+  outfit = "Toribox"
+  shoe = "KantiZhu"
+  accessory = "Solid Factory"
+  organizer = "KantiZhu"
+  weight = 1
+
+[[collection]]
+  name = "张牧之"
+  url = "/collections/figures/one-sixth-scale-figure-zhang-muzhi/"
+  cover = "/images/cover/one-sixth-scale-figure-zhang-muzhi-cover.jpg"
+  source = "《让子弹飞》"
+  head = "712 Studio"
+  outfit = "Y.M.A Studio"
+  shoe = "HotToys"
+  accessory = "712 Studio"
+  organizer = "712 Studio"
+  weight = 2
+
+[[collection]]
+  name = "尼根"
+  url = "/collections/figures/one-sixth-scale-figure-negan/"
+  cover = "/images/cover/one-sixth-scale-figure-negan-cover.jpg"
+  source = "《行尸走肉》"
+  head = "Balloon Man"
+  outfit = "Toribox"
+  shoe = "Mr.E"
+  accessory = "—"
+  organizer = "Hosam"
+  weight = 3
+
+[[collection]]
+  name = "布鲁斯·韦恩"
+  url = "/collections/figures/one-sixth-scale-figure-bruce-wayne-bvs/"
+  cover = "/images/cover/one-sixth-scale-figure-bruce-wayne-cover.jpg"
+  source = "《蝙蝠侠大战超人》"
+  head = "六等星"
+  outfit = "Zihao Studio"
+  shoe = "Zihao Studio"
+  accessory = "—"
+  organizer = "Zihao Studio"
+  weight = 4
+
+[[collection]]
+  name = "屠夫比尔"
+  url = "/collections/figures/one-sixth-scale-figure-bill-the-butcher/"
+  cover = "/images/cover/one-sixth-scale-figure-bill-the-butcher-cover.jpg"
+  source = "《纽约黑帮》"
+  head = "Jay.sculptor"
+  outfit = "Toribox"
+  shoe = "NightT47"
+  accessory = "Robbie"
+  organizer = "Siruis & Yunaitou"
+  weight = 5
diff --git a/layouts/exhibition/exhibition.html b/layouts/exhibition/exhibition.html
@@ -0,0 +1,43 @@
+{{ define "main" }}
+    <main class="main single" id="main">
+        <div class="main-inner">
+
+            {{ $attrs := partial "utils/data-attributes.html" . }}
+
+            <article class="content post h-entry" {{- with $attrs.align }} data-align="{{ . }}"{{ end }}>
+
+                <h1 class="post-title p-name">{{ (partial "utils/title.html" (dict "$" $ "title" $.Title)).htmlTitle }}</h1>
+
+                {{ if .Site.Params.displayPostDescription }}
+                    {{ with .Params.description }}
+                        {{- $raw := . -}}
+                        <div class="post-description p-summary">{{ partial "utils/markdownify.html" (dict "$" $ "raw" $raw "isContent" false) }}</div>
+                    {{ end }}
+                {{ end }}
+
+                <div class="post-body e-content">
+                    <div class="collection-link">
+
+                        {{ range .Site.Data.collection }}
+                            {{ range sort . "weight" }}
+                                <a class="collection" href="{{ .url }}">
+                                    <img class="cover" src="{{ .cover }}"/>
+                                    <div class="overview">
+                                        <div class="name">{{ .name }}</div>
+                                        <div class="excerpt">{{ .source }}</div>
+                                    </div>  
+                                </a>
+                            {{ end }}
+                        {{ end }}
+
+                    </div>
+                    {{ partial "utils/content.html" . }}
+                </div>
+
+            </article>
+
+            {{ partial "components/comments.html" . }}
+
+        </div>
+    </main>
+{{ end }} 
diff --git a/static/images/cover/one-sixth-scale-figure-bill-the-butcher-cover.jpg b/static/images/cover/one-sixth-scale-figure-bill-the-butcher-cover.jpg
diff --git a/static/images/cover/one-sixth-scale-figure-bruce-wayne-cover.jpg b/static/images/cover/one-sixth-scale-figure-bruce-wayne-cover.jpg
diff --git a/static/images/cover/one-sixth-scale-figure-negan-cover.jpg b/static/images/cover/one-sixth-scale-figure-negan-cover.jpg
diff --git a/static/images/cover/one-sixth-scale-figure-tony-stark-cover.jpg b/static/images/cover/one-sixth-scale-figure-tony-stark-cover.jpg
diff --git a/static/images/cover/one-sixth-scale-figure-zhang-muzhi-cover.jpg b/static/images/cover/one-sixth-scale-figure-zhang-muzhi-cover.jpg