jekyll-theme-acg 1.0.6 → 1.0.11

data/_includes/posts.html

@@ -1,53 +1,54 @@
-{% capture workspace %}
-  {% assign posts1 = "" | split: "" %}
-  {% assign posts2 = "" | split: "" %}
-
-  {% for post in include.posts %}
-    {% if post.pin %}
-      {% assign posts1 = posts1 | push: post %}
-    {% else %}
-      {% assign posts2 = posts2 | push: post %}
-    {% endif %}
-  {% endfor %}
-
-  {% assign posts = posts1 | concat: posts2 %}
-
-  {% if page.layout == "home" %}
-    {% assign offset = paginator.page | minus: 1 | times: paginator.per_page %}
-    {% assign count = paginator.posts | size | minus: 1 %}
-    {% assign minIndex = offset %}
-    {% assign maxIndex = offset | plus: count %}
+{% assign posts1 = "" | split: "" %}
+{% assign posts2 = "" | split: "" %}
+{% for post in include.posts %}
+  {% if post.pin %}
+    {% assign posts1 = posts1 | push: post %}
   {% else %}
-    {% assign minIndex = 0 %}
-    {% assign maxIndex = posts.size | minus: 1 %}
+    {% assign posts2 = posts2 | push: post %}
   {% endif %}
-
-{% endcapture %}
-
-{% for index in (minIndex..maxIndex) %}
-  {% capture workspace %}
-    {% assign post = posts[index] %}
-    {% assign pin = post.pin | default: false %}
-    {% assign href = post.id | relative_url %}
-    {% assign title = post.title | default: "NO TITLE" | escape %}
-    {% assign description = post.description | default: post.excerpt | default: site.description | strip_html %}
-    {% assign date = post.date %}
-    {% assign tags = post.tags | default: nil %}
-    {% assign categories = post.categories | default: nil %}
-  {% endcapture %}
-
+{% endfor %}
+{% assign posts = posts1 | concat: posts2 %}
+
+{% if page.type == "home" %}
+  {% assign offset = paginator.page | minus: 1 | times: paginator.per_page %}
+  {% assign count = paginator.posts | size | minus: 1 %}
+  {% assign minIndex = offset %}
+  {% assign maxIndex = offset | plus: count %}
+{% else %}
+  {% assign minIndex = 0 %}
+  {% assign maxIndex = posts.size | minus: 1 %}
+{% endif %}
+
+{% for index in (minIndex..maxIndex) %}{% assign post = posts[index] %}
 <div class="relative p-3 pb-1 rounded-lg flex flex-col justify-between bg-{{ color }}-50 bg-opacity-75 text-black">
-  {% if post.pin %}{% include item-pin.html %}{% endif %}
-  <a class="block text-3xl font-serif font-medium" href="{{ href }}">{{ title }}</a>
-  <span class="block p-1 text-sm font-extralight">{{ description }}</span>
-
+  <!-- post.pin -->
+  {% if post.pin %}
+    {% capture class %}{{ "absolute -left-2 -top-2 text-color-600" | replace: "color", color }}{% endcapture %}
+    {% include svg-pin.html class=class %}
+  {% endif %}
+  <!-- post.title -->
+  <a class="block text-3xl font-serif font-medium" href="{{ post.id | relative_url }}">
+    {{ post.title | default: "NO_TITLE" | escape }}
+  </a>
+  <!-- post.description -->
+  <span class="block p-1 text-sm font-extralight">
+    {{ post.description | default: post.excerpt | strip_html }}
+  </span>
   <div class="flex flex-wrap select-none">
-    <div class="flex-grow">{% include item-date.html date=date %}</div>
+    <div class="flex-grow">
+      <!-- post.date -->
+      {% include chip.html type="date" text=post.date width=4 %}
+    </div>
     <div class="flex flex-wrap">
-      {% for category in categories %}{% include item-category.html name=category %}{% endfor %}
-      {% for tag in tags %}{% include item-tag.html name=tag %}{% endfor %}
+      <!-- post.categories -->
+      {% for category in post.categories %}
+        {% include chip.html type="category" text=category width=4 %}
+      {% endfor %}
+      <!-- post.tags -->
+      {% for tag in post.tags %}
+        {% include chip.html type="tag" text=tag width=4 %}
+      {% endfor %}
     </div>
   </div>
 </div>
-
 {% endfor %}

data/_includes/svg-category.html

@@ -0,0 +1,10 @@
+<svg
+  class="
+  {{ include.class }}
+  w-{{ include.width | default: include.height | default: 6 }}
+  h-{{ include.height | default: include.width | default: 6 }}
+  "
+  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
+>
+  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z">
+</svg>

data/_includes/svg-date.html

@@ -0,0 +1,10 @@
+<svg
+  class="
+  {{ include.class }}
+  w-{{ include.width | default: include.height | default: 6 }}
+  h-{{ include.height | default: include.width | default: 6 }}
+  "
+  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
+>
+  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z">
+</svg>

data/_includes/svg-next.html

@@ -0,0 +1,10 @@
+<svg
+  class="
+  {{ include.class }}
+  w-{{ include.width | default: include.height | default: 6 }}
+  h-{{ include.height | default: include.width | default: 6 }}
+  "
+  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
+>
+  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 9l3 3m0 0l-3 3m3-3H8m13 0a9 9 0 11-18 0 9 9 0 0118 0z">
+</svg>

data/_includes/svg-pin.html

@@ -0,0 +1,10 @@
+<svg
+  class="
+  {{ include.class }}
+  w-{{ include.width | default: include.height | default: 6 }}
+  h-{{ include.height | default: include.width | default: 6 }}
+  "
+  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
+>
+  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13">
+</svg>

data/_includes/svg-prev.html

@@ -0,0 +1,10 @@
+<svg
+  class="
+  {{ include.class }}
+  w-{{ include.width | default: include.height | default: 6 }}
+  h-{{ include.height | default: include.width | default: 6 }}
+  "
+  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
+>
+  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 15l-3-3m0 0l3-3m-3 3h8M3 12a9 9 0 1118 0 9 9 0 01-18 0z">
+</svg>

data/_includes/svg-tag.html

@@ -0,0 +1,10 @@
+<svg
+  class="
+  {{ include.class }}
+  w-{{ include.width | default: include.height | default: 6 }}
+  h-{{ include.height | default: include.width | default: 6 }}
+  "
+  xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
+>
+  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 7h.01M7 3h5c.512 0 1.024.195 1.414.586l7 7a2 2 0 010 2.828l-7 7a2 2 0 01-2.828 0l-7-7A1.994 1.994 0 013 12V7a4 4 0 014-4z">
+</svg>

data/_includes/toc.html

@@ -50,8 +50,4 @@
     {% capture output %}{{ output }}</li>{% if include.ordered %}</ol>{% else %}</ul>{% endif %}{% endcapture %}
   {% endfor %}
 
-{% endcapture %}
-
-{%- comment -%}{%- endcomment -%}
-{{ output }}
-{%- comment -%}{%- endcomment -%}
+{% endcapture %}{{ output }}

data/_layouts/compress.html

@@ -0,0 +1,10 @@
+---
+# Jekyll layout that compresses HTML
+# v3.1.0
+# http://jch.penibelst.de/
+# © 2014–2015 Anatol Broder
+# MIT License
+---
+
+{% capture _LINE_FEED %}
+{% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment or site.compress_html.ignore.envs == "all" %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ content | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}

data/_layouts/page.html

@@ -1,13 +1,125 @@
 ---
-layout: default
+layout: compress
 ---
+{% capture lang %}{{ page.lang | default: site.lang | default: "en-US" }}{% endcapture %}
 
-{% assign color = page.color | default: site.color %}
+{% comment %} color {% endcomment %}
+{% capture color %}{{ page.color | default: site.color | downcase }}{% endcapture %}
+{% assign colors = "red, blue, pink, green, yellow, purple, gray, default" | split: ", " %}
+{% for item in colors %}
+  {% if item == color %}{% break %}{% endif %}
+  {% if item == "default" %}{% assign color = "red" %}{% endif %}
+{% endfor %}
 
-<div class="w-acg min-h-screen mt-16">
-  <div class="w-full py-16 text-{{ color }}-50 flex flex-col justify-center items-center content-center">
-    <div class="text-center text-4xl font-serif">{{ page.title }}</div>
-    <div class="text-center text-base font-sans">{{ page.description }}</div>
+{% comment %} background {% endcomment %}
+{% capture background %}{{ page.background | default: site.acg.background | default: "https://cdn.jsdelivr.net/gh/coderzhaoziwei/jekyll-theme-acg/assets/images/pixiv86925095.png" | relative_url }}{% endcapture %}
+
+{% assign title = page.title %}
+{% assign description = page.description %}
+{% assign content = content | strip %}
+
+{% if page.type == "home" %}
+  {% capture title %}{{ site.title }}{% endcapture %}
+  {% capture description %}{{ site.description }}{% endcapture %}
+{% elsif page.permalink == "/categories.html" %}
+  {% capture title %}{{ site.acg.categories.label }}{% endcapture %}
+  {% capture description %}{{ site.acg.categories.description }}{% endcapture %}
+{% elsif page.permalink == "/tags.html" %}
+  {% capture title %}{{ site.acg.tags.label }}{% endcapture %}
+  {% capture description %}{{ site.acg.tags.description }}{% endcapture %}
+{% elsif page.permalink == "/about.html" %}
+  {% capture title %}{{ site.acg.about.label }}{% endcapture %}
+  {% capture description %}{{ site.acg.about.description }}{% endcapture %}
+{% elsif page.permalink == "/friends.html" %}
+  {% capture title %}{{ site.acg.friends.label }}{% endcapture %}
+  {% capture description %}{{ site.acg.friends.description }}{% endcapture %}
+{% elsif page.permalink == "/404.html" %}
+  {% capture title %}{{ site.acg.error.label }}{% endcapture %}
+  {% capture description %}{{ site.acg.error.description }}{% endcapture %}
+{% endif %}
+
+{% assign list = "" | split: "" %}
+{% if page.permalink == "/categories.html" %}
+  {% for item in site.categories %}{% assign list = list | push: item[0] %}{% endfor %}
+{% elsif page.permalink == "/tags.html" %}
+  {% for item in site.tags %}{% assign list = list | push: item[0] %}{% endfor %}
+{% endif %}
+{% assign list = list | sort %}
+
+<!DOCTYPE html>
+<html lang="{{ lang }}" class="min-h-screen bg-image bg-cover bg-center bg-fixed">
+{% include head.html %}
+<body class="flex flex-col items-center bg-black bg-opacity-50">
+{% include header.html %}
+<div class="w-acg min-h-screen py-16">
+  <div class="w-full flex flex-col justify-center items-center content-center text-{{ color }}-50
+    {% if page.type == "home" %}h-screen select-none pb-16{% else %}py-32{% endif %}"
+  >
+    <!-- title -->
+    <div class="text-center text-4xl font-serif py-8">
+      {% if page.type == "category" %}
+        {% include chip.html type="category" text=title width=8 larger=true %}
+      {% elsif page.type == "tag" %}
+        {% include chip.html type="tag" text=title width=8 larger=true %}
+      {% else %}
+        {{ title }}
+      {% endif %}
+    </div>
+    <!-- description -->
+    <div class="text-center text-base font-sans py-8">{{ description }}</div>
+
+    <!-- categories.html & tags.html -->
+    <div class="flex flex-wrap justify-center items-center content-center select-none">
+    {% if page.permalink == "/categories.html" %}
+      {% for category in list %}{% assign count = site.categories[category].size %}
+        <div class="m-1 px-2 bg-{{ color }}-50 bg-opacity-75 rounded">
+          {% include chip.html type="category" text=category count=count width=4 %}
+        </div>
+      {% endfor %}
+    {% elsif page.permalink == "/tags.html" %}
+      {% for tag in list %}{% assign count = site.tags[tag].size %}
+        <div class="m-1 px-2 bg-{{ color }}-50 bg-opacity-75 rounded">
+          {% include chip.html type="tag" text=tag count=count width=4 %}
+        </div>
+      {% endfor %}
+    {% endif %}
+    </div>
   </div>
-  <article class="w-full my-4 mx-auto p-4 rounded-lg text-black bg-{{ color }}-50 bg-opacity-75 markdown-body">{{ content }}</article>
+
+  <!-- article -->
+  {% if page.type == "post" %}
+    <div class="flex flex-wrap">
+      <div class="flex-grow">
+        {% include chip.html type="date" text=page.date width=4 %}
+      </div>
+      <div class="flex flex-wrap">
+        {% for category in page.categories %}
+          {% include chip.html type="category" text=category width=4 %}
+        {% endfor %}
+        {% for tag in page.tags %}
+          {% include chip.html type="tag" text=tag width=4 %}
+        {% endfor %}
+      </div>
+    </div>
+    <article class="w-full my-4 mx-auto p-4 rounded-lg text-black bg-{{ color }}-50 bg-opacity-75 markdown-body">
+      <h1>{{ title }}</h1>
+      {% include toc.html html=content %}
+      {{ content }}
+    </article>
+    {% include flip.html %}
+  {% elsif content != empty %}
+    <article class="w-full my-4 mx-auto p-4 rounded-lg text-black bg-{{ color }}-50 bg-opacity-75 markdown-body">
+      {{ content }}
+    </article>
+  {% endif %}
+  <!-- posts -->
+  {% if page.type == "home" %}
+    <div class="w-full p-4 flex flex-col space-y-4">{% include posts.html posts=site.posts %}</div>
+    <div class="w-full p-4">{% include paginator.html %}</div>
+  {% elsif page.posts %}
+    <div class="w-full p-4 flex flex-col space-y-4">{% include posts.html posts=page.posts %}</div>
+  {% endif %}
 </div>
+{% include footer.html %}
+</body>
+</html>

data/_sass/markdown.scss

@@ -2,13 +2,19 @@
 .markdown-body h2 {
   border-bottom-color: var(--theme-600);
 }
+.markdown-body h4,
+.markdown-body h5,
+.markdown-body h6 {
+  color: rgba(0, 0, 0, 0.75);
+}
+
 .markdown-body hr {
   background-color: var(--theme-600);
 }
 
 .markdown-body blockquote {
-  color: var(--theme-500);
-  border-left-color: var(--theme-600);
+  color: var(--theme-800);
+  border-left-color: var(--theme-800);
 }
 
 .markdown-body code:not(.hljs) {

data/_sass/root.scss

@@ -91,9 +91,6 @@
 .bg-blur {
   backdrop-filter: blur(8px);
 }
-.max-w-acg {
-  max-width: MIN(90%, 768px);
-}
 .w-acg {
   width: MIN(90%, 768px);
 }

data/assets/404.md

@@ -0,0 +1,3 @@
+---
+permalink: /404.html
+---

data/assets/about.md

@@ -1,7 +1,4 @@
 ---
-layout: page
-title: About
-description: Info about this theme.
 permalink: /about.html
 ---
 

data/assets/{categories.html → categories.md}

@@ -1,4 +1,3 @@
 ---
-layout: categories
 permalink: /categories.html
 ---

data/assets/friends.md

@@ -0,0 +1,6 @@
+---
+permalink: /friends.html
+---
+{% for friend in site.data.friends %}
+- [{{ friend.name }}]({{ friend.link }}) {% if friend.description %}\| {{ friend.description }}{% endif %}
+{% endfor %}

data/assets/{tags.html → tags.md}

@@ -1,4 +1,3 @@
 ---
-layout: tags
 permalink: /tags.html
 ---

data/index.html

@@ -1,3 +1,3 @@
 ---
-layout: home
+# This is homepage of site.
 ---

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-acg
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.11
 platform: ruby
 authors:
 - Coder Zhao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -165,33 +165,33 @@ files:
 - LICENSE
 - README.md
 - _config.yml
-- _includes/README.md
-- _includes/article.html
+- _includes/chip.html
+- _includes/custom-head.html
+- _includes/flip.html
 - _includes/footer.html
+- _includes/head.html
 - _includes/header.html
-- _includes/item-category.html
-- _includes/item-date.html
-- _includes/item-pin.html
-- _includes/item-tag.html
+- _includes/paginator.html
 - _includes/posts.html
-- _includes/style.html
+- _includes/svg-category.html
+- _includes/svg-date.html
+- _includes/svg-next.html
+- _includes/svg-pin.html
+- _includes/svg-prev.html
+- _includes/svg-tag.html
+- _includes/toc-readme.md
 - _includes/toc.html
-- _layouts/categories.html
-- _layouts/category.html
-- _layouts/default.html
-- _layouts/home.html
+- _layouts/compress.html
 - _layouts/page.html
-- _layouts/post.html
-- _layouts/tag.html
-- _layouts/tags.html
 - _sass/markdown.scss
 - _sass/root.scss
 - _sass/scrollbar.scss
-- assets/404.html
+- assets/404.md
 - assets/about.md
-- assets/categories.html
+- assets/categories.md
 - assets/css/style.scss
-- assets/tags.html
+- assets/friends.md
+- assets/tags.md
 - index.html
 homepage: https://github.com/coderzhaoziwei/jekyll-theme-acg
 licenses:
@@ -216,5 +216,5 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: An awesome theme for Jekyll.
+summary: Jekyll Theme ACG For Jekyll
 test_files: []