From c7dff8ea0d07e33890b5b9e0e9a48aa87f880e48 Mon Sep 17 00:00:00 2001 From: CherryKitten Date: Mon, 10 Apr 2023 00:13:12 +0200 Subject: [PATCH] bunch of updates --- .gitmodules | 3 - LICENSE | 71 +++++++++++ config.toml | 26 +--- .../{rose-pine => }/rosepine.tmTheme | 0 public/404.html | 37 +++--- public/about/index.html | 37 +++--- .../fediverse-isnt-just-mastodon/index.html | 53 +++----- public/blog/index.html | 53 ++++---- public/blog/rust-1-options-results/index.html | 37 +++--- public/{color/rosepine.css => color.css} | 0 public/color/background_blue.css | 1 - public/color/background_dark.css | 1 - public/color/background_green.css | 1 - public/color/background_orange.css | 1 - public/color/background_pink.css | 1 - public/color/background_red.css | 1 - public/color/background_rosepine.css | 1 - public/color/blue.css | 1 - public/color/green.css | 1 - public/color/orange.css | 1 - public/color/pink.css | 1 - public/color/red.css | 1 - public/contact/index.html | 37 +++--- public/font-hack-subset.css | 4 - public/font-hack.css | 4 - public/fonts/hack-bold-subset.woff | Bin 30212 -> 0 bytes public/fonts/hack-bold-subset.woff2 | Bin 23512 -> 0 bytes public/fonts/hack-bold.woff | Bin 144868 -> 0 bytes public/fonts/hack-bold.woff2 | Bin 108008 -> 0 bytes public/fonts/hack-bolditalic-subset.woff | Bin 33668 -> 0 bytes public/fonts/hack-bolditalic-subset.woff2 | Bin 26460 -> 0 bytes public/fonts/hack-bolditalic.woff | Bin 151048 -> 0 bytes public/fonts/hack-bolditalic.woff2 | Bin 113512 -> 0 bytes public/fonts/hack-italic-subset.woff | Bin 32648 -> 0 bytes public/fonts/hack-italic-subset.woff2 | Bin 25740 -> 0 bytes public/fonts/hack-italic.woff | Bin 148532 -> 0 bytes public/fonts/hack-italic.woff2 | Bin 111360 -> 0 bytes public/fonts/hack-regular-subset.woff | Bin 29640 -> 0 bytes public/fonts/hack-regular-subset.woff2 | Bin 23244 -> 0 bytes public/fonts/hack-regular.woff | Bin 141132 -> 0 bytes public/fonts/hack-regular.woff2 | Bin 106236 -> 0 bytes public/footer.css | 2 +- public/header.css | 2 +- public/home/index.html | 37 +++--- public/impressum/index.html | 37 +++--- public/index.html | 45 +++---- public/logo.css | 2 +- public/main.css | 2 +- public/style.css | 2 +- sass/{color/rosepine.scss => color.scss} | 0 sass/color/background_rosepine.scss | 5 - sass/footer.scss | 12 -- sass/header.scss | 4 +- sass/logo.scss | 1 + sass/main.scss | 6 +- templates/404.html | 16 +++ templates/archive.html | 15 +++ templates/index.html | 117 ++++++++++++++++++ templates/macros/date.html | 3 + templates/macros/head.html | 9 ++ templates/macros/menu.html | 52 ++++++++ templates/macros/post.html | 103 +++++++++++++++ templates/macros/title.html | 17 +++ templates/page.html | 13 ++ templates/shortcodes/figure.html | 8 ++ templates/shortcodes/image.html | 3 + themes/terminimal | 1 - 67 files changed, 631 insertions(+), 257 deletions(-) delete mode 100644 .gitmodules create mode 100644 LICENSE rename highlight_themes/{rose-pine => }/rosepine.tmTheme (100%) rename public/{color/rosepine.css => color.css} (100%) delete mode 100644 public/color/background_blue.css delete mode 100644 public/color/background_dark.css delete mode 100644 public/color/background_green.css delete mode 100644 public/color/background_orange.css delete mode 100644 public/color/background_pink.css delete mode 100644 public/color/background_red.css delete mode 100644 public/color/background_rosepine.css delete mode 100644 public/color/blue.css delete mode 100644 public/color/green.css delete mode 100644 public/color/orange.css delete mode 100644 public/color/pink.css delete mode 100644 public/color/red.css delete mode 100644 public/font-hack-subset.css delete mode 100644 public/font-hack.css delete mode 100644 public/fonts/hack-bold-subset.woff delete mode 100644 public/fonts/hack-bold-subset.woff2 delete mode 100644 public/fonts/hack-bold.woff delete mode 100644 public/fonts/hack-bold.woff2 delete mode 100644 public/fonts/hack-bolditalic-subset.woff delete mode 100644 public/fonts/hack-bolditalic-subset.woff2 delete mode 100644 public/fonts/hack-bolditalic.woff delete mode 100644 public/fonts/hack-bolditalic.woff2 delete mode 100644 public/fonts/hack-italic-subset.woff delete mode 100644 public/fonts/hack-italic-subset.woff2 delete mode 100644 public/fonts/hack-italic.woff delete mode 100644 public/fonts/hack-italic.woff2 delete mode 100644 public/fonts/hack-regular-subset.woff delete mode 100644 public/fonts/hack-regular-subset.woff2 delete mode 100644 public/fonts/hack-regular.woff delete mode 100644 public/fonts/hack-regular.woff2 rename sass/{color/rosepine.scss => color.scss} (100%) delete mode 100644 sass/color/background_rosepine.scss create mode 100644 templates/404.html create mode 100644 templates/archive.html create mode 100644 templates/index.html create mode 100644 templates/macros/date.html create mode 100644 templates/macros/head.html create mode 100644 templates/macros/menu.html create mode 100644 templates/macros/post.html create mode 100644 templates/macros/title.html create mode 100644 templates/page.html create mode 100644 templates/shortcodes/figure.html create mode 100644 templates/shortcodes/image.html delete mode 160000 themes/terminimal diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3a07023..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "themes/terminimal"] - path = themes/terminimal - url = https://github.com/pawroman/zola-theme-terminimal.git diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d2384ce --- /dev/null +++ b/LICENSE @@ -0,0 +1,71 @@ +Copyright (c) 2023 CherryKitten + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +I'm using a modification of the Terminimal zola theme, which is in itself a fork of the similar theme for Hugo. +Both are also licensed under the MIT License: + +MIT License + +Copyright (c) 2019 Paweł Romanowski + +Copyright (c) 2019 panr + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- + +For hugo-theme-terminal: + +The MIT License (MIT) + +Copyright (c) 2019 panr + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/config.toml b/config.toml index 8444334..54a67c0 100644 --- a/config.toml +++ b/config.toml @@ -2,8 +2,6 @@ base_url = "https://cherrykitten.dev" title = "CherryKitten" -theme = "terminimal" - compile_sass = true # Whether to build a search index to be used later on by a JavaScript library @@ -20,36 +18,14 @@ taxonomies = [ # Whether to do syntax highlighting # Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola highlight_code = true -extra_syntaxes_and_themes = ["highlight_themes", "highlight_themes/rose-pine"] +extra_syntaxes_and_themes = ["highlight_themes"] highlight_theme = "rosepine" [extra] -# One of: blue, green, orange, pink, red. -# Defaults to blue. -accent_color = "rosepine" - -# One of: blue, dark, green, orange, pink, red. -# Enabling dark background will also modify primary font color -# to be darker. -# Defaults to accent color (or, if not accent color specified, to blue). -background_color = "rosepine" - # The logo text - defaults to "Terminimal theme" logo_text = "CherryKitten" -copyright_html = """\ - Donate using Liberapay -   -

© 2023 - CherryKitten


-   -

Impressum

-   -

RSS

-   -

🐱

-""" - menu_items = [ {name = "Home", url = "$BASE_URL"}, diff --git a/highlight_themes/rose-pine/rosepine.tmTheme b/highlight_themes/rosepine.tmTheme similarity index 100% rename from highlight_themes/rose-pine/rosepine.tmTheme rename to highlight_themes/rosepine.tmTheme diff --git a/public/404.html b/public/404.html index b380c41..27e7512 100644 --- a/public/404.html +++ b/public/404.html @@ -11,11 +11,11 @@ - + - - + @@ -25,11 +25,11 @@
diff --git a/public/about/index.html b/public/about/index.html index 2dc4ea8..ada7c3b 100644 --- a/public/about/index.html +++ b/public/about/index.html @@ -9,11 +9,11 @@ - + - - + @@ -23,11 +23,11 @@
diff --git a/public/blog/fediverse-isnt-just-mastodon/index.html b/public/blog/fediverse-isnt-just-mastodon/index.html index 4b944a4..4faf125 100644 --- a/public/blog/fediverse-isnt-just-mastodon/index.html +++ b/public/blog/fediverse-isnt-just-mastodon/index.html @@ -9,11 +9,11 @@ - + - - + @@ -23,11 +23,11 @@
- -
@@ -156,17 +140,20 @@ Welcome to the Fediverse 💜.

-
Donate using Liberapay -   -

© 2023 - CherryKitten


-   -

Impressum

-   -

RSS

-   -

🐱

-
-
+
+ Donate using Liberapay +   + © + 2023 + - CherryKitten
+   + Impressum +   + RSS +   + 🐱
+
diff --git a/public/blog/index.html b/public/blog/index.html index 57d84bb..46ff91d 100644 --- a/public/blog/index.html +++ b/public/blog/index.html @@ -9,11 +9,11 @@ - + - - + @@ -23,11 +23,11 @@