diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..a4f52a5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.2.0 \ No newline at end of file diff --git a/Gemfile b/Gemfile index c1bb7a3..0d8d1bf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,17 +1,9 @@ +ruby "3.2.0" source "https://rubygems.org" -gem "jekyll", "~> 3.9.0" - -# Needed for macOS ARM -gem "nokogiri", "~> 1.15.6" - -# Needed to unbreak jekyll-assets -gem "sprockets", "~> 3.7" - -gem "kramdown-parser-gfm", "~> 1.1.0" +gem "jekyll", "~> 4.3" group :jekyll_plugins do - gem "jekyll-assets" gem "jekyll-feed" gem "jekyll-paginate" gem "jekyll-seo-tag" diff --git a/Gemfile.lock b/Gemfile.lock index 25b7013..98e60d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,105 +1,89 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.6) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + base64 (0.3.0) + bigdecimal (4.1.1) colorator (1.1.0) - concurrent-ruby (1.1.9) + concurrent-ruby (1.3.6) + csv (3.3.5) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - execjs (2.8.1) - extras (0.3.0) - forwardable-extended (~> 2.5) - fastimage (2.2.5) - ffi (1.15.4) + ffi (1.17.4-x86_64-darwin) + ffi (1.17.4-x86_64-linux-gnu) forwardable-extended (2.6.0) - http_parser.rb (0.8.0) - i18n (0.9.5) + google-protobuf (4.34.1-x86_64-darwin) + bigdecimal + rake (~> 13.3) + google-protobuf (4.34.1-x86_64-linux-gnu) + bigdecimal + rake (~> 13.3) + http_parser.rb (0.8.1) + i18n (1.14.8) concurrent-ruby (~> 1.0) - jekyll (3.9.1) + jekyll (4.4.1) addressable (~> 2.4) + base64 (~> 0.2) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (>= 1.17, < 3) + json (~> 2.6) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.3, >= 0.3.6) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - jekyll-assets (3.0.12) - activesupport (~> 5.0) - execjs (~> 2.7) - extras (~> 0.2) - fastimage (~> 2.0, >= 1.8) - jekyll (>= 3.5, < 4.0) - jekyll-sanity (~> 1.2) - liquid-tag-parser (~> 1.0) - nokogiri (~> 1.8) - pathutil (~> 0.16) - sprockets (>= 3.3, < 4.1.beta) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-feed (0.15.1) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-sanity (1.6.0) - jekyll (>= 3.1, < 5.0) - pathutil (~> 0.16) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) + jekyll-sass-converter (3.1.0) + sass-embedded (~> 1.75) jekyll-seo-tag (2.7.1) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.1) - rexml + json (2.19.3) + kramdown (2.5.2) + rexml (>= 3.4.4) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - liquid-tag-parser (1.9.0) - extras (~> 0.3) - liquid (>= 3.0, < 5.0) - listen (3.7.0) + liquid (4.0.4) + listen (3.10.0) + logger rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) - minitest (5.14.4) - nokogiri (1.15.6-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.15.6-x86_64-linux) - racc (~> 1.4) + logger (1.7.0) + mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.7.3) - rack (2.2.22) - rb-fsevent (0.11.0) - rb-inotify (0.10.1) + public_suffix (7.0.5) + rake (13.3.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.4.2) - rouge (3.26.1) + rexml (3.4.4) + rouge (4.7.0) safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - thread_safe (0.3.6) - tzinfo (1.2.10) - thread_safe (~> 0.1) + sass-embedded (1.99.0-x86_64-darwin) + google-protobuf (~> 4.31) + sass-embedded (1.99.0-x86_64-linux-gnu) + google-protobuf (~> 4.31) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.6.0) + webrick (1.9.2) PLATFORMS x86_64-darwin-20 @@ -107,15 +91,14 @@ PLATFORMS x86_64-linux DEPENDENCIES - jekyll (~> 3.9.0) - jekyll-assets + jekyll (~> 4.3) jekyll-feed jekyll-paginate jekyll-seo-tag jekyll-sitemap - kramdown-parser-gfm (~> 1.1.0) - nokogiri (~> 1.15.6) - sprockets (~> 3.7) + +RUBY VERSION + ruby 3.2.0p0 BUNDLED WITH - 2.2.22 + 2.4.1 diff --git a/_config.yml b/_config.yml index fd3ba96..60e7356 100644 --- a/_config.yml +++ b/_config.yml @@ -33,7 +33,6 @@ assets: plugins: - - jekyll-assets - jekyll-feed - jekyll-paginate - jekyll-seo-tag diff --git a/_includes/head.html b/_includes/head.html index 5a036eb..366e895 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -3,8 +3,8 @@ {{ page.title }} · {{ site.title }} - {% asset style.css %} - + + {% seo title=false %} {% feed_meta %} diff --git a/css/_dark.scss b/_sass/_dark.scss similarity index 100% rename from css/_dark.scss rename to _sass/_dark.scss diff --git a/css/_highlight.scss b/_sass/_highlight.scss similarity index 100% rename from css/_highlight.scss rename to _sass/_highlight.scss diff --git a/css/_home.scss b/_sass/_home.scss similarity index 100% rename from css/_home.scss rename to _sass/_home.scss diff --git a/css/_main.scss b/_sass/_main.scss similarity index 100% rename from css/_main.scss rename to _sass/_main.scss diff --git a/css/_variables.scss b/_sass/_variables.scss similarity index 100% rename from css/_variables.scss rename to _sass/_variables.scss diff --git a/assets/css/style.scss b/assets/css/style.scss new file mode 100644 index 0000000..aff29ca --- /dev/null +++ b/assets/css/style.scss @@ -0,0 +1,10 @@ +--- +--- + +@import "variables"; +@import "../node_modules/bootstrap/scss/bootstrap"; +@import "dark"; +@import "main"; +@import "highlight"; +@import "home"; + diff --git a/img/favicon.svg b/assets/img/favicon.svg similarity index 100% rename from img/favicon.svg rename to assets/img/favicon.svg diff --git a/img/github-banner-dark.svg b/assets/img/github-banner-dark.svg similarity index 100% rename from img/github-banner-dark.svg rename to assets/img/github-banner-dark.svg diff --git a/img/github-banner.svg b/assets/img/github-banner.svg similarity index 100% rename from img/github-banner.svg rename to assets/img/github-banner.svg diff --git a/img/logo.png b/assets/img/logo.png similarity index 100% rename from img/logo.png rename to assets/img/logo.png diff --git a/css/style.scss b/css/style.scss deleted file mode 100644 index 9a66fde..0000000 --- a/css/style.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import "_variables"; -@import "../node_modules/bootstrap/scss/bootstrap"; -@import "_dark"; -@import "_main"; -@import "_highlight"; -@import "_home";