From e7fb4f86bd661f6eb8dc58c52703abe3fa80b386 Mon Sep 17 00:00:00 2001
From: thisLight <l1589002388@gmail.com>
Date: Mon, 30 Aug 2021 13:41:40 +0800
Subject: [PATCH] cmd: support data file as theme config

---
 source/_data/theme.yaml                | 13 +++++++++++++
 themes/cmd/layout/includes/layout.swig | 14 +++++++-------
 themes/cmd/layout/index.swig           | 10 +++++++---
 themes/cmd/source/css/index.styl       |  2 ++
 4 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 source/_data/theme.yaml
 create mode 100644 themes/cmd/source/css/index.styl

diff --git a/source/_data/theme.yaml b/source/_data/theme.yaml
new file mode 100644
index 0000000..25e00ff
--- /dev/null
+++ b/source/_data/theme.yaml
@@ -0,0 +1,13 @@
+copyright_addtional: ""
+
+copyright_year_string: "2020-2021"
+
+theme_self_claim: true
+
+about_this_blog: 这里是Rubicon's Rubicon。我在无界之点的偏安之地。
+
+my_mastodon: "https://mastodon.social/@thislight"
+
+footer_links:
+  GitHub: "https://github.com/thislight"
+  GitLab: "https://gitlab.com/thislight"
\ No newline at end of file
diff --git a/themes/cmd/layout/includes/layout.swig b/themes/cmd/layout/includes/layout.swig
index 85b2ffc..c5f145b 100644
--- a/themes/cmd/layout/includes/layout.swig
+++ b/themes/cmd/layout/includes/layout.swig
@@ -69,21 +69,21 @@
 <footer class="page-footer light-blue darken-4">
   <div class="container">
     <div class="row">
-      {% if theme.about_this_blog %}
+      {% if site.data.theme.about_this_blog %}
         <div class="col s12 m4">
           <h5 class="white-text">About {{config.title}}</h5>
-          <p>{{theme.about_this_blog}}</p>
+          <p>{{site.data.theme.about_this_blog}}</p>
         </div>
       {% endif %}
-      {% if theme.footer_links %}
+      {% if site.data.theme.footer_links %}
         <div class="col s6 m4">
           <h5 class="white-text"> Links </h5>
           <ul>
-            {% for name in Object.keys(theme.footer_links) %}
-            <li><a class="grey-text text-lighten-3" href="{{theme.footer_links[name]}}">{{name}}</a></li>
+            {% for name in Object.keys(site.data.theme.footer_links) %}
+            <li><a class="grey-text text-lighten-3" href="{{site.data.theme.footer_links[name]}}">{{name}}</a></li>
             {% endfor %}
             {% if theme.my_mastodon %}
-            <li><a class="grey-text text-lighten-3" rel="me" href="{{theme.my_mastodon}}">My Mastodon</a></li>
+            <li><a class="grey-text text-lighten-3" rel="me" href="{{site.data.theme.my_mastodon}}">My Mastodon</a></li>
             {% endif %}
           </ul>
         </div>
@@ -97,7 +97,7 @@
   </div>
   <div class="footer-copyright">
     <div class="container truncate">
-      © Copyright {{ theme.copyright_year_string }} {{ config.author }}. {{ theme.copyright_addtional }}
+      © Copyright {{ site.data.theme.copyright_year_string }} {{ config.author }}. {{ site.data.theme.copyright_addtional }}
     </div>
   </div>
 </footer>
diff --git a/themes/cmd/layout/index.swig b/themes/cmd/layout/index.swig
index d7f472f..6c4e7f3 100644
--- a/themes/cmd/layout/index.swig
+++ b/themes/cmd/layout/index.swig
@@ -67,8 +67,8 @@
 {% endmacro %}
 
 {% macro TagPanel(tags) %}
-  <div class="card-panel" style="padding-top: 12px;">
-    <h5>All Tags</h5>
+  <div class="card-panel" style="padding-top: 12px; padding-bottom: 12px;">
+    <span class="chip transparent">Tags</span>
     {% for tag in tags %}
       <a href="{{ url_for(tag.path)}}"><div class="chip">
         {{tag.name}}
@@ -83,7 +83,7 @@
 <div class="row">
   <div class="col m8 l9">
     {% if page.current == 1 %}
-      {{ MeCard(config.author, config.email, theme.me_description) }}
+      {{ MeCard(config.author, config.email, config.description) }}
     {% endif %}
     {% if page.posts.length > 0 %}
       {{ PostList(page.posts.toArray()) }}
@@ -99,3 +99,7 @@
   </div>
 </div>
 {% endblock %}
+
+{% block add_head %}
+<link rel="stylesheet" href="/css/index.css">
+{% endblock %}
diff --git a/themes/cmd/source/css/index.styl b/themes/cmd/source/css/index.styl
new file mode 100644
index 0000000..f9850b2
--- /dev/null
+++ b/themes/cmd/source/css/index.styl
@@ -0,0 +1,2 @@
+.post-item img 
+    max-height: 300px