From 7e110f425ad3edcbfef3732801ed7feddb8412b1 Mon Sep 17 00:00:00 2001 From: MG-5 Date: Wed, 27 Mar 2024 04:13:48 +0100 Subject: [PATCH] Merge remote-tracking branch 'sylhare/Type-on-Strap' --- .gitpod.yml | 42 - Gemfile | 1 + _config.yml | 4 +- _data/{biblio.yaml => biblio.yml} | 0 _data/language.yml | 5 +- _data/menu.yml | 5 + _includes/blog/post_footer.liquid | 56 + _includes/default/head.liquid | 29 +- _includes/default/navbar.liquid | 16 +- _includes/default/search_input.liquid | 51 + _includes/social/cusdis.liquid | 2 +- _layouts/archive.liquid | 33 + _layouts/categories.liquid | 2 +- _layouts/default.html | 11 +- _layouts/home.liquid | 5 +- _layouts/page.liquid | 53 +- _layouts/post.liquid | 95 +- _portfolio/hanoi.md | 2 + _sass/base/_global.scss | 2 +- _sass/external/_font-awesome.scss | 24 +- _sass/external/_katex.scss | 1151 +-- _sass/external/font-awesome/_animated.scss | 153 +- .../font-awesome/_bordered-pulled.scss | 28 +- _sass/external/font-awesome/_brands.scss | 23 - _sass/external/font-awesome/_core.scss | 34 +- _sass/external/font-awesome/_fixed-width.scss | 3 +- _sass/external/font-awesome/_functions.scss | 57 + _sass/external/font-awesome/_icons.scss | 1466 +--- _sass/external/font-awesome/_larger.scss | 23 - _sass/external/font-awesome/_list.scss | 8 +- _sass/external/font-awesome/_mixins.scss | 91 +- _sass/external/font-awesome/_regular.scss | 23 - .../font-awesome/_rotated-flipped.scss | 49 +- .../external/font-awesome/_screen-reader.scss | 15 +- _sass/external/font-awesome/_shims.scss | 1304 ++-- _sass/external/font-awesome/_sizing.scss | 16 + _sass/external/font-awesome/_solid.scss | 24 - _sass/external/font-awesome/_stacked.scss | 9 +- _sass/external/font-awesome/_variables.scss | 6444 +++++++++++++---- _sass/external/font-awesome/brands.scss | 30 + _sass/external/font-awesome/fontawesome.scss | 21 + _sass/external/font-awesome/regular.scss | 26 + _sass/external/font-awesome/solid.scss | 26 + _sass/external/font-awesome/v4-shims.scss | 7 +- _sass/external/katex/katex.scss | 1414 ++++ _sass/includes/_navbar.scss | 10 +- _sass/includes/_share_buttons.scss | 2 +- _sass/layouts/_categories.scss | 5 + _sass/layouts/_posts.scss | 2 +- assets/Dockerfile | 2 +- assets/data/search.liquid | 33 +- assets/fonts/font-awesome/fa-brands-400.eot | Bin 136822 -> 0 bytes assets/fonts/font-awesome/fa-brands-400.svg | 3717 ---------- assets/fonts/font-awesome/fa-brands-400.ttf | Bin 136516 -> 207972 bytes assets/fonts/font-awesome/fa-brands-400.woff | Bin 92136 -> 0 bytes assets/fonts/font-awesome/fa-brands-400.woff2 | Bin 78472 -> 117372 bytes assets/fonts/font-awesome/fa-regular-400.eot | Bin 34350 -> 0 bytes assets/fonts/font-awesome/fa-regular-400.svg | 801 -- assets/fonts/font-awesome/fa-regular-400.ttf | Bin 34052 -> 68004 bytes assets/fonts/font-awesome/fa-regular-400.woff | Bin 16776 -> 0 bytes .../fonts/font-awesome/fa-regular-400.woff2 | Bin 13588 -> 25452 bytes assets/fonts/font-awesome/fa-solid-900.eot | Bin 204814 -> 0 bytes assets/fonts/font-awesome/fa-solid-900.svg | 5028 ------------- assets/fonts/font-awesome/fa-solid-900.ttf | Bin 204528 -> 419720 bytes assets/fonts/font-awesome/fa-solid-900.woff | Bin 104280 -> 0 bytes assets/fonts/font-awesome/fa-solid-900.woff2 | Bin 80252 -> 156496 bytes .../fonts/font-awesome/fa-v4compatibility.ttf | Bin 0 -> 10832 bytes .../font-awesome/fa-v4compatibility.woff2 | Bin 0 -> 4792 bytes assets/js/main.min.js | 9 +- assets/js/partials/cookie_consent_init.js | 5 + assets/js/partials/dark-mode.js | 47 +- assets/js/vendor/auto-render.min.js | 1 - assets/js/vendor/katex.auto-render.min.js | 1 + assets/js/vendor/katex.min.js | 2 +- assets/js/vendor/mermaid.min.js | 2929 ++++---- blog/index.html | 2 + pages/03_blog.md | 6 - pages/05_wiki.md | 11 - pages/404.md | 1 + pages/archive.md | 9 + pages/categories.md | 1 + pages/{10_datenschutz.md => datenschutz.md} | 1 + pages/{01_events.md => events.md} | 1 + pages/gallery.md | 3 +- pages/{09_impressum.md => impressum.md} | 1 + pages/{08_kontakt.md => kontakt.md} | 3 +- ...06_mitgliedschaft.md => mitgliedschaft.md} | 3 +- pages/portfolio.md | 1 + pages/{90_search.md => search.md} | 4 +- pages/{07_spenden.md => spenden.md} | 1 + pages/tags.md | 1 + 91 files changed, 9400 insertions(+), 16126 deletions(-) delete mode 100644 .gitpod.yml rename _data/{biblio.yaml => biblio.yml} (100%) create mode 100644 _data/menu.yml create mode 100644 _includes/blog/post_footer.liquid create mode 100644 _includes/default/search_input.liquid create mode 100644 _layouts/archive.liquid delete mode 100644 _sass/external/font-awesome/_brands.scss create mode 100644 _sass/external/font-awesome/_functions.scss delete mode 100644 _sass/external/font-awesome/_larger.scss delete mode 100644 _sass/external/font-awesome/_regular.scss create mode 100644 _sass/external/font-awesome/_sizing.scss delete mode 100644 _sass/external/font-awesome/_solid.scss create mode 100644 _sass/external/font-awesome/brands.scss create mode 100644 _sass/external/font-awesome/fontawesome.scss create mode 100644 _sass/external/font-awesome/regular.scss create mode 100644 _sass/external/font-awesome/solid.scss create mode 100644 _sass/external/katex/katex.scss delete mode 100644 assets/fonts/font-awesome/fa-brands-400.eot delete mode 100644 assets/fonts/font-awesome/fa-brands-400.svg delete mode 100644 assets/fonts/font-awesome/fa-brands-400.woff delete mode 100644 assets/fonts/font-awesome/fa-regular-400.eot delete mode 100644 assets/fonts/font-awesome/fa-regular-400.svg delete mode 100644 assets/fonts/font-awesome/fa-regular-400.woff delete mode 100644 assets/fonts/font-awesome/fa-solid-900.eot delete mode 100644 assets/fonts/font-awesome/fa-solid-900.svg delete mode 100644 assets/fonts/font-awesome/fa-solid-900.woff create mode 100644 assets/fonts/font-awesome/fa-v4compatibility.ttf create mode 100644 assets/fonts/font-awesome/fa-v4compatibility.woff2 delete mode 100644 assets/js/vendor/auto-render.min.js create mode 100644 assets/js/vendor/katex.auto-render.min.js delete mode 100644 pages/03_blog.md delete mode 100644 pages/05_wiki.md create mode 100644 pages/archive.md rename pages/{10_datenschutz.md => datenschutz.md} (99%) rename pages/{01_events.md => events.md} (99%) rename pages/{09_impressum.md => impressum.md} (99%) rename pages/{08_kontakt.md => kontakt.md} (95%) rename pages/{06_mitgliedschaft.md => mitgliedschaft.md} (97%) rename pages/{90_search.md => search.md} (80%) rename pages/{07_spenden.md => spenden.md} (99%) diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index b6a2c1e..0000000 --- a/.gitpod.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Documentation: https://www.gitpod.io/docs/references/gitpod-yml -image: gitpod/workspace-full - -# Task(s) -tasks: - - before: | - gem install bundle - bundle config set --local path 'vendor/bundle' - init: | - bundle update - bundle install - - name: Run type on strap - init: bundle install - command: bundle exec jekyll serve - -# In case the user is trying to make a pull request, he needs GitLens, which by default is not installed. This code will help us install it. -vscode: - extensions: - - eamodio.gitlens - -# Ports configuration, since Gitpod needs to open Type on Strap on a new tab when the server loads up. -ports: - - port: 4000 - onOpen: open-browser - -# For opening workspaces faster than ever, prebuilds are suggested -github: - prebuilds: - # enable for the master/default branch (defaults to true) - master: true - # enable for all branches in this repo (defaults to false) - branches: false - # enable for pull requests coming from this repo (defaults to true) - pullRequests: true - # enable for pull requests coming from forks (defaults to false) - pullRequestsFromForks: true - # add a "Review in Gitpod" button as a comment to pull requests (defaults to true) - addComment: false - # add a "Review in Gitpod" button to pull requests (defaults to false) - addBadge: true - # add a label once the prebuild is ready to pull requests (defaults to false) - addLabel: prebuilt diff --git a/Gemfile b/Gemfile index 43eab55..4ead7cf 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,4 @@ source "https://rubygems.org" gemspec gem 'icalendar' gem 'redcarpet' +gem 'webrick' diff --git a/_config.yml b/_config.yml index df938d0..bb0ec21 100644 --- a/_config.yml +++ b/_config.yml @@ -37,11 +37,11 @@ color_image: /assets/img/lineart.png # A bit transparent for # For layout customization, go to the "_sass > base" folder, and check "_variables.scss" katex: true # Enable if using math markup mermaid: default # Enable mermaid-js for diagrams, use theme: base, forest, dark, default, neutral -google_analytics: # Tracking ID, e.g. "UA-000000-01" +google_analytics: # Measurement ID, e.g. "G-00000" cookie_consent: false # To respect the usage of cookies color_theme: auto # auto, dark or light -# Comments +# Comments options comments: disqus_shortname: # Your discus shortname for comments cusdis_app_id: # Your cusdis data-app-id diff --git a/_data/biblio.yaml b/_data/biblio.yml similarity index 100% rename from _data/biblio.yaml rename to _data/biblio.yml diff --git a/_data/language.yml b/_data/language.yml index caa51e4..773a007 100644 --- a/_data/language.yml +++ b/_data/language.yml @@ -15,7 +15,10 @@ str_no_result_found: "No result found" str_cookie_approve: "Approve" str_cookie_disclaimer: "We would like to use third party cookies and scripts to improve the functionality of this website." str_months: [Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember] +str_dark: 'Dark' +str_light: 'Light' +str_date_format: '%B %-d, %Y' str_more_blog_entries: "Mehr Blogeinträge..." -# Localization settings +# Localization settings cusdis_lang: # zh-cn, es, tr, pt-BR diff --git a/_data/menu.yml b/_data/menu.yml new file mode 100644 index 0000000..f37f121 --- /dev/null +++ b/_data/menu.yml @@ -0,0 +1,5 @@ +# To add links to the navigation bar. +- type-on-strap: + title: "Wiki" + url: https://wiki.netz39.de + position: 5 diff --git a/_includes/blog/post_footer.liquid b/_includes/blog/post_footer.liquid new file mode 100644 index 0000000..3f937e5 --- /dev/null +++ b/_includes/blog/post_footer.liquid @@ -0,0 +1,56 @@ +{% assign color = include.color %} +{% assign img = include.img %} +{% capture _post_footer %} + + + + + {% if site.post_navigation or site.theme_settings.post_navigation %} + {% include blog/post_nav.liquid %} + {% endif %} + + + {% if site.comments.utterances.repo and site.comments.utterances.issue-term %} + {% include social/utterances.liquid %} + {% endif %} + + + {% if site.comments.cusdis_app_id or site.cusdis_app_id %} + {% include social/cusdis.liquid %} + {% endif %} + + + {% if site.comments.disqus_shortname or site.theme_settings.disqus_shortname or site.disqus_shortname %} + {% include social/disqus.liquid %} + {% endif %} +{% endcapture %} +{{ _post_footer | split: " " | join: " " }} diff --git a/_includes/default/head.liquid b/_includes/default/head.liquid index 0340feb..fcc003d 100644 --- a/_includes/default/head.liquid +++ b/_includes/default/head.liquid @@ -3,17 +3,17 @@ - {% if site.color_theme == 'auto' %} - {% else %} - - {% endif %} @@ -35,18 +35,15 @@ {% endif %} - + {% if site.katex or site.theme_settings.katex %} - + {% endif %} - + {% if site.mermaid %} - + {% endif %} diff --git a/_includes/default/navbar.liquid b/_includes/default/navbar.liquid index d170786..71fbdfe 100644 --- a/_includes/default/navbar.liquid +++ b/_includes/default/navbar.liquid @@ -21,18 +21,20 @@