jekyll-theme-plain 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a282758ecb1a6fdf8413bfe6e0b184f4adc8da970c2438a345071ca4e5615b5c
-  data.tar.gz: 98ef0f314fec760ab33a1a18e334a8d9969fac4a10e4726a7b2f1319553d0b56
+  metadata.gz: a56292e0d5c32fb483f906c463994447395af0f2b07ec099251463eece6e9394
+  data.tar.gz: a620d3d5269341278a53fff411a985c8be04c12827c4a9c34c8871c61f73c53e
 SHA512:
-  metadata.gz: be617b5d3e715c5fc00f762360254e3485c9505b6a9a8a59d2de8c8e6b61d91351d6c6619fe20656f190fb13886bddb04f612b52d8b70c0e029f231593b8dfb2
-  data.tar.gz: c23d0029b71256abb6639c300e7a6288a47e631f4aed6ce13a6d448cc9b68d6efd680cce34ee2d05bbea7918c0516fafeb968ce672264fd769521c17734a4f72
+  metadata.gz: b4e63f9a50514023de9f227222d625d7b10b92ed7f3b7fd213adf334af8769d3d6a5932267edae51029b6f4d48c28da238bfeaf426c7b7b4063265662bb739e3
+  data.tar.gz: 2e1afa65d2c77dc1c79aacbc713699afe145378c862f60a98dc0b7d37144aa23c9dafa43906c9bca2694b81a78ab18162ad9210bb8d8a32a118a074e44887f00

data/_includes/head.html

@@ -1,38 +1,3 @@
-{%- comment -%}
-  # Whether the page is a post.
-{%- endcomment -%}
-{%- if page.layout == 'post' -%}
-  {%- assign is_post = true -%}
-{%- endif -%}
-
-{%- assign charset = page.charset -%}
-{%- if charset == nil -%}{%- assign charset = site.charset -%}
-{%- if charset == nil -%}{%- assign charset = 'utf-8' -%}{%- endif -%}{%- endif -%}
-
-{%- assign color_scheme = page.color_scheme -%}
-{%- if color_scheme == nil -%}{%- assign color_scheme = site.color_scheme -%}
-{%- if color_scheme == nil -%}{%- assign color_scheme = 'light dark' -%}{%- endif -%}{%- endif -%}
-
-{%- assign viewport = page.viewport -%}
-{%- if viewport == nil -%}{%- assign viewport = site.viewport -%}
-{%- if viewport == nil -%}{%- assign viewport = 'width=device-width, initial-scale=1' -%}{%- endif -%}{%- endif -%}
-
-{%- assign canonical = page.canonical -%}
-{%- if canonical == nil -%}{%- assign canonical = site.canonical -%}
-{%- if canonical == nil -%}{%- assign canonical = page.url | absolute_url -%}{%- endif -%}{%- endif -%}
-
-{%- assign license = page.license -%}
-{%- if license == nil -%}{%- assign license = site.license -%}{%- endif -%}
-
-{%- assign stylesheets = page.stylesheets -%}
-{%- if stylesheets == nil -%}
-  {%- if is_post -%}
-    {%- assign stylesheets = 'post.css' | split: ',' -%}
-  {%- else -%}
-    {%- assign stylesheets = site.stylesheets -%}
-  {%- endif -%}
-{%- endif -%}
-
     {%- if charset %}
     <meta charset="{{- charset -}}">
     {%- endif -%}
@@ -43,32 +8,23 @@
 
     {%- if viewport %}
     <meta name="viewport" content="{{- viewport -}}">
-    {%- endif %}
-    <title>
-      {%- if is_post -%}
-        {{-
-            canonical
-            | remove_first: 'https://www.'
-            | remove_first: 'http://www.'
-            | remove_first: 'https://'
-            | remove_first: 'http://'
-            | replace: '+', '%2B'
-            | url_decode
-        -}}
-      {%- else -%}
-        {{- page.title | default: site.title -}}
-      {%- endif -%}
-    </title>
+    {%- endif -%}
 
-    {%- if canonical %}
-    <link rel="canonical" href="{{- canonical -}}">
+    {%- if title %}
+    <title>{{- title -}}</title>
     {%- endif -%}
 
-    {%- if license %}
-    <link rel="license" href="{{- license -}}">
+    {%- if canonical_url %}
+    <link rel="canonical" href="{{- canonical_url -}}">
     {%- endif -%}
 
-    {%- if stylesheets %}
+    {%- if license_url %}
+    <link rel="license" href="{{- license_url -}}">
+    {%- endif -%}
+
+    {%- if stylesheets.size > 0 %}
     <style>
-      {%- for stylesheet in stylesheets %}{% include {{ stylesheet }} %}{% endfor %}    </style>
-    {%- endif %}
+      {%- for stylesheet in stylesheets -%}
+        {%- include {{ stylesheet }} -%}
+      {%- endfor %}    </style>
+    {%- endif -%}

data/{_layouts → _includes}/page-list.html

@@ -1,11 +1,8 @@
----
-layout: base
----
-
-    <ul>
+    {%- if site.pages.size > 0 %}    <ul>
       {%- for page in site.pages %}
       <li>
         <a href="{{- page.url -}}">{{- page.slug -}}</a>
       </li>
       {%- endfor %}
     </ul>
+    {%- endif %}

data/{_layouts → _includes}/post-list.html

@@ -1,11 +1,8 @@
----
-layout: base
----
-
-    <ul>
+    {%- if site.posts.size > 0 %}    <ul>
       {%- for post in site.posts %}
       <li>
         <a href="{{- post.url | remove_first: page.url -}}">{{- post.slug -}}</a>
       </li>
       {%- endfor %}
     </ul>
+    {%- endif %}

data/{_layouts/static-page-list.html → _includes/static-file-list.html}

@@ -1,9 +1,5 @@
----
-layout: base
----
-
-    <ul>
-      {%- assign files = site.static_files | where: "extname", ".html" -%}
+    {%- assign files = site.static_files | where: "extname", ".html" -%}
+    {%- if files.size > 0 %}    <ul>
       {%- for file in files -%}
         {%- assign path = file.path | remove_first: page.url | remove_first: "/index.html" %}
       <li>
@@ -11,3 +7,4 @@ layout: base
       </li>
       {%- endfor %}
     </ul>
+    {%- endif %}

data/_includes/variables.html

@@ -0,0 +1,82 @@
+{%- comment -%}
+    # Whether the page is a post.
+{%- endcomment -%}
+{%- if page.layout == "post" -%}
+  {%- assign is_post = true -%}
+{%- endif -%}
+
+{%- assign default_lang          = "en" -%}
+{%- assign default_charset       = "utf-8" -%}
+{%- assign default_color_scheme  = "light dark" -%}
+{%- assign default_viewport      = "width=device-width, initial-scale=1" -%}
+{%- assign default_title         = "" -%}
+{%- assign default_canonical_url = page.url | absolute_url -%}
+{%- assign default_license_url   = false -%}
+{%- assign default_stylesheets   = "" | split: ", " -%}
+
+{%- comment -%}
+    # Lang.
+{%- endcomment -%}
+{%- assign lang = page.lang -%}
+{%- if lang == nil -%}{%- assign lang = site.lang -%}
+{%- if lang == nil -%}{%- assign lang = default_lang -%}{%- endif -%}{%- endif -%}
+
+{%- comment -%}
+    # Charset.
+{%- endcomment -%}
+{%- assign charset = page.charset -%}
+{%- if charset == nil -%}{%- assign charset = site.charset -%}
+{%- if charset == nil -%}{%- assign charset = default_charset -%}{%- endif -%}{%- endif -%}
+
+{%- comment -%}
+    # Color scheme.
+{%- endcomment -%}
+{%- assign color_scheme = page.color_scheme -%}
+{%- if color_scheme == nil -%}{%- assign color_scheme = site.color_scheme -%}
+{%- if color_scheme == nil -%}{%- assign color_scheme = default_color_scheme -%}{%- endif -%}{%- endif -%}
+
+{%- comment -%}
+    # Viewport.
+{%- endcomment -%}
+{%- assign viewport = page.viewport -%}
+{%- if viewport == nil -%}{%- assign viewport = site.viewport -%}
+{%- if viewport == nil -%}{%- assign viewport = default_viewport -%}{%- endif -%}{%- endif -%}
+
+{%- comment -%}
+    # Canonical url.
+{%- endcomment -%}
+{%- assign canonical_url = page.canonical_url -%}
+{%- if canonical_url == nil -%}{%- assign canonical_url = site.canonical_url -%}
+{%- if canonical_url == nil -%}{%- assign canonical_url = default_canonical_url -%}{%- endif -%}{%- endif -%}
+
+{%- comment -%}
+    # Title.
+{%- endcomment -%}
+{%- if is_post -%}
+  {%-
+      assign title =
+        canonical_url
+        | remove_first: "https://www."
+        | remove_first: "http://www."
+        | remove_first: "https://"
+        | remove_first: "http://"
+  -%}
+{%- else -%}
+  {%- assign title = page.title -%}
+  {%- if title == nil -%}{%- assign title = site.title -%}
+  {%- if title == nil -%}{%- assign title = default_title -%}{%- endif -%}{%- endif -%}
+{%- endif -%}
+
+{%- comment -%}
+    # License url.
+{%- endcomment -%}
+{%- assign license_url = page.license_url -%}
+{%- if license_url == nil -%}{%- assign license_url = site.license_url -%}
+{%- if license_url == nil -%}{%- assign license_url = default_license_url -%}{%- endif -%}{%- endif -%}
+
+{%- comment -%}
+    # Stylesheets.
+{%- endcomment -%}
+{%- assign stylesheets = page.stylesheets -%}
+{%- if stylesheets == nil -%}{%- assign stylesheets = site.stylesheets -%}
+{%- if stylesheets == nil -%}{%- assign stylesheets = default_stylesheets -%}{%- endif -%}{%- endif -%}

data/_layouts/base.html

@@ -1,10 +1,9 @@
-{%- assign lang = page.lang -%}
-{%- if lang == nil -%}{%- assign lang = site.lang -%}
-{%- if lang == nil -%}{%- assign lang = 'en' -%}{%- endif -%}{%- endif -%}
+{%- include variables.html -%}
 
 <!DOCTYPE html>
 <html {%- if lang %} lang="{{- lang -}}"{%- endif -%}>
-  <head>{% include head.html %}  </head>
+  <head>{%- include head.html %}
+  </head>
   <body>
 {{ content }}  </body>
 </html>

data/_layouts/post.html

@@ -2,4 +2,4 @@
 layout: base
 ---
 
-    <pre>{{ content | xml_escape | replace: "&apos;", "&#39;" }}</pre>
+    <pre>{{- content | xml_escape | replace: "&apos;", "&#39;" -}}</pre>

metadata

@@ -1,73 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-plain
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yuuki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jekyll
+  name: github-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '228'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '228'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
+        version: '1.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '1.7'
 description:
 email:
-- yuuki@yuukikonno.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- _includes/base.css
 - _includes/head.html
+- _includes/page-list.html
+- _includes/post-list.html
 - _includes/post.css
+- _includes/static-file-list.html
+- _includes/variables.html
 - _layouts/base.html
-- _layouts/page-list.html
-- _layouts/post-list.html
 - _layouts/post.html
-- _layouts/static-page-list.html
 homepage: https://github.com/jekyll-theme-plain/jekyll-theme-plain
 licenses:
 - CC0-1.0