From 09ed8921b522df30759ddc774cab3bc03fed3b3e Mon Sep 17 00:00:00 2001 From: byanko55 Date: Mon, 5 Feb 2024 03:32:04 +0900 Subject: [PATCH 1/7] minor --- _includes/sidebar.html | 7 ------- _pages/visitor counter.md | 4 +--- docs/Visitor Counter.md | 4 +--- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index c8824752a..f4fbff763 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,10 +1,3 @@ -{%- assign page_tree = page.path | remove_first: "_pages/" | split: "/" -%} -{%- assign page_level = page_tree.size -%} -{% if page_tree.last == "index.md" %} - {%- assign page_type = "category" -%} -{% else %} - {%- assign page_type = "post" -%} -{% endif %}

diff --git a/_pages/visitor counter.md b/_pages/visitor counter.md index 28a4d4807..b60bc3c2d 100644 --- a/_pages/visitor counter.md +++ b/_pages/visitor counter.md @@ -22,9 +22,7 @@ Create new account in [here](https://www.goatcounter.com/signup) You will access your blog statistics at `https://[my-code].goatcounter.com`. -## Add your code to site configuration - -In `_config.yml`, +## Add your code to `_config.yml` ``` goatcounter_code: [my-code] diff --git a/docs/Visitor Counter.md b/docs/Visitor Counter.md index f06d9b87f..155989e10 100644 --- a/docs/Visitor Counter.md +++ b/docs/Visitor Counter.md @@ -12,9 +12,7 @@ Create new account in [here](https://www.goatcounter.com/signup) You will access your blog statistics at `https://[my-code].goatcounter.com`. -### Add your code to site configuration - -In `_config.yml`, +### Add your code to `_config.yml` ``` goatcounter_code: [my-code] From 24eb29ddbb5583b8f3dcb1bc7a78e7bd0e531a96 Mon Sep 17 00:00:00 2001 From: byanko55 Date: Mon, 5 Feb 2024 03:32:26 +0900 Subject: [PATCH 2/7] fix: post tag box shape is incomplete --- _includes/post.html | 4 ++-- _sass/post.scss | 53 ++++++++++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/_includes/post.html b/_includes/post.html index 2f3c2ee91..c20c113ae 100644 --- a/_includes/post.html +++ b/_includes/post.html @@ -41,9 +41,9 @@

-
+
{%- for page_tag in page.tags -%} - + {{ page_tag }} {%- endfor -%} diff --git a/_sass/post.scss b/_sass/post.scss index e7e2974e3..caf2458f1 100644 --- a/_sass/post.scss +++ b/_sass/post.scss @@ -110,13 +110,16 @@ svg { margin-right: 4px; } } -.tags { margin: 1rem; } - -.tag-box { +.tag-box { + margin: 1rem; display: inline-block; +} + +.tag { + float: left; position: relative; - margin: 0.75rem; - padding: 0 0.75rem; + margin-left: 24px; + padding:0 10px 0 12px; line-height: 1.5rem; color: #fff !important; font-size: 1rem; @@ -189,8 +192,8 @@ main { * { margin: auto; } h1, h2, h3 { - margin-bottom: -1.5rem; - padding-top: 2rem; + margin-top: 3rem; + margin-bottom: 1rem; } h1, .sh1 { font-size: 1.75rem; } @@ -229,11 +232,19 @@ main { } } - p, ul, hr, table { margin-top: 2rem; } + p, ul, table, div { margin-bottom: 3rem; } + + p + div, + p + pre, + p + blockquote, + div + div, + div + blockquote { + margin-top: -2rem; + } ul { padding-left: 2rem; } - li > ul { margin-top: 0; } + li > ul { margin: 0; } code { margin: 0 2px; @@ -377,7 +388,7 @@ main { hr { border: 0; height: 2px; - margin-bottom: -1.5rem; + margin: 1rem 0; background: burlywood; } @@ -550,16 +561,19 @@ main { svg { margin-right: 8px; } } - .tags { margin: 1rem 3rem; } - .tag-box { - margin: 1rem; - padding: 0 1rem; + margin: 3rem; + margin-top: 1rem; + } + + .tag { + margin-left: 32px; + padding:0 14px 0 16px; line-height: 2rem; font-size: 1.125rem; &:before { - left: -1rem; + left: -16px; border-width: 16px 16px 16px 0; } @@ -574,25 +588,20 @@ main { padding-top: 0; font-size: 1.125rem; - h1, h2, h3, hr { margin-bottom: -2.25rem; } - h1, .sh1 { font-size: 2.25rem; - padding-top: 5rem; + margin-top: 5rem; } h2, .sh2 { font-size: 1.75rem; - padding-top: 4rem; + margin-top: 4rem; } h3, .sh3 { font-size: 1.375rem; - padding-top: 3rem; } - p, ul, hr, table { margin-top: 3rem; } - table { tbody td, thead th { padding: 1rem; } } From c7edd29b0364ca822026c2a8c2cc83311213833a Mon Sep 17 00:00:00 2001 From: byanko55 Date: Mon, 5 Feb 2024 03:32:42 +0900 Subject: [PATCH 3/7] fix: nav contents are overlapped when expander is open --- _sass/navigation.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_sass/navigation.scss b/_sass/navigation.scss index 621461e1c..b768ca6bb 100644 --- a/_sass/navigation.scss +++ b/_sass/navigation.scss @@ -20,7 +20,7 @@ padding-left: 1.125rem; background: #eee; - transition: max-height .5s, opacity .2s; + transition: max-height .5s ease-in-out, opacity .3s; opacity: 0; max-height: 0; @@ -32,7 +32,7 @@ > .nav-list { opacity: 1; - max-height: 256px; + max-height: 768px; } } } From 06c36b42d307d6b23837407c0f19cf9ee19341e2 Mon Sep 17 00:00:00 2001 From: byanko55 Date: Mon, 5 Feb 2024 03:48:51 +0900 Subject: [PATCH 4/7] fix: build error due to unsupported liquid syntax in Jekyll < 4.0 --- Gemfile | 4 +++- _includes/navigation.html | 25 +++++++++++++++---------- jekyll-theme-satellite.gemspec | 6 ++++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index a8a5bc89f..9e357cc34 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 4.3.2" +gem "jekyll", ">= 3.9", "< 5.0" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. @@ -19,6 +19,8 @@ end gem "jekyll-sitemap", "~> 1.3" gem "jekyll-seo-tag", "~> 2.6" +gem "kramdown-parser-gfm", "~> 1.1.0" +gem "webrick", "~> 1.7.0" # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # and associated library. diff --git a/_includes/navigation.html b/_includes/navigation.html index 685aa6556..0b0b2fb33 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -1,17 +1,20 @@