From f703319e715e7e5b7b80d0de80bc27a4cf615c95 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 27 May 2022 18:07:35 +0200 Subject: [PATCH] switch themify for fa --- assets/js/script.js | 4 +-- assets/script.js | 4 +-- assets/scss/_common.scss | 4 +-- assets/scss/_variables.scss | 2 +- config.toml | 16 +++++----- content/german/author/cantortechnik-ag.md | 6 ++-- content/german/author/denys-konovalov.md | 2 +- content/german/schuelerrat/_index.md | 2 +- data/de/homepage.yml | 2 +- layouts/_default/ganztagsangebote.html | 4 +-- layouts/_default/list.html | 6 ++-- layouts/_default/post.html | 6 ++-- layouts/_default/wettbewerbe.html | 6 ++-- layouts/ganztagsangebote/single.html | 8 ++--- layouts/index.html | 2 +- layouts/partials/info.html | 2 +- layouts/partials/page-header.html | 2 +- layouts/termine/list.html | 2 +- layouts/wettbewerbe/single.html | 2 +- ...s_f300667da4f5b5f84e1a9e0702b2fdde.content | 6 ++-- static/admin/config.yml | 30 ++++++++----------- static/admin/index.html | 14 ++++----- 22 files changed, 62 insertions(+), 70 deletions(-) diff --git a/assets/js/script.js b/assets/js/script.js index af5de40..84e76e5 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -38,8 +38,8 @@ infinite: true, arrows: true, fade: true, - prevArrow: '', - nextArrow: '', + prevArrow: '', + nextArrow: '', dots: true }); $('.hero-slider').slickAnimation(); diff --git a/assets/script.js b/assets/script.js index af5de40..84e76e5 100644 --- a/assets/script.js +++ b/assets/script.js @@ -38,8 +38,8 @@ infinite: true, arrows: true, fade: true, - prevArrow: '', - nextArrow: '', + prevArrow: '', + nextArrow: '', dots: true }); $('.hero-slider').slickAnimation(); diff --git a/assets/scss/_common.scss b/assets/scss/_common.scss index 8cd43be..6769412 100644 --- a/assets/scss/_common.scss +++ b/assets/scss/_common.scss @@ -345,8 +345,8 @@ textarea.form-control{ &::before { position: absolute; - content: "\e65d"; - font-family: "themify"; + content: "\f138"; + font-family: "FontAwesome"; font-size: 14px; left: 0; top: 1px; diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss index 1d08fd6..69c9ade 100644 --- a/assets/scss/_variables.scss +++ b/assets/scss/_variables.scss @@ -14,4 +14,4 @@ $gray: #f8f8f8; // Font Variables $primary-font: 'Fira Sans', sans-serif; $secondary-font: 'Fira Sans', sans-serif; -$icon-font: 'themify'; +$icon-font: 'FontAwesome'; diff --git a/config.toml b/config.toml index 9762c2e..3f2b014 100755 --- a/config.toml +++ b/config.toml @@ -30,7 +30,7 @@ link = "plugins/animate/animate.css" [[params.plugins.css]] link = "plugins/venobox/venobox.css" [[params.plugins.css]] -link = "plugins/themify-icons/themify-icons.css" +link = "plugins/fontawesome/css/all.css" [[params.plugins.css]] link = "plugins/fira/fira.css" @@ -208,28 +208,28 @@ loader = "media/load.svg" ############################# social site ######################## [[params.social]] title = "YouTube" -icon = "ti-youtube" # themify icon : https://themify.me/themify-icons +icon = "fa-brands fa-youtube" link = "https://www.youtube.com/channel/UCHafBDI5qfK03RiIEyki9VA" [[params.social]] title = "twitter" -icon = "ti-twitter-alt" # themify icon : https://themify.me/themify-icons +icon = "fa-brands fa-twitter" link = "https://twitter.com/cantor_news" [[params.social]] title = "instagram" -icon = "ti-instagram" # themify icon : https://themify.me/themify-icons +icon = "fa-brands fa-instagram" link = "https://instagram.com/cantor.news" [[params.social]] title = "Facebook" -icon = "ti-facebook" # themify icon : https://themify.me/themify-icons +icon = "fa-brands fa-facebook" link = "https://facebook.com/gcg.cantor.news" [[params.social]] -title = "github" -icon = "ti-github" # themify icon : https://themify.me/themify-icons -link = "https://github.com/eesev9ie" +title = "GitLab" +icon = "fa-brands fa-gitlab" +link = "https://gitlab.cantorgymnasium.de/gcg/" ################################### German language ##################################### [Languages.de] diff --git a/content/german/author/cantortechnik-ag.md b/content/german/author/cantortechnik-ag.md index 788f8ef..173ea22 100644 --- a/content/german/author/cantortechnik-ag.md +++ b/content/german/author/cantortechnik-ag.md @@ -6,11 +6,11 @@ email: cantortechnik@protonmail.com image: /media/people/meincantor-round.png social: - title: YouTube - icon: ti-youtube + icon: fa-brands fa-youtube link: https://www.youtube.com/channel/UCFCJdxg2D9RXH0qjZ8MMw1g - title: GitHub - icon: ti-github - link: https://github.com/eesev9ie + icon: fa-brands fa-gitlab + link: https://gitlab.cantorgymnasium.de/cantortechnik/ --- Wir sind eine AG am Georg-Cantor-Gymnasium, welche sich mit allen Themen rund um die digitale Welt am Georg-Cantor-Gymnasium beschäftigt. Des Weiteren betreiben wir die Schulwebsite des GCG. diff --git a/content/german/author/denys-konovalov.md b/content/german/author/denys-konovalov.md index 70116b9..289aea3 100644 --- a/content/german/author/denys-konovalov.md +++ b/content/german/author/denys-konovalov.md @@ -6,7 +6,7 @@ email: denys.konovalov@pm.me image: media/people/dkonovalov.png social: - title: E-Mail - icon: ti-email + icon: fa-solid fa-at link: mailto:denys.konovalov@pm.me --- Ich bin ein Schüler der 8. Klasse am Georg-Cantor-Gymnasium in Halle(Saale). diff --git a/content/german/schuelerrat/_index.md b/content/german/schuelerrat/_index.md index d153599..49fdf82 100644 --- a/content/german/schuelerrat/_index.md +++ b/content/german/schuelerrat/_index.md @@ -75,7 +75,7 @@ Angebot wählen können. Wir haben für alle Schülerinnen und Schüler ein offenes Ohr und sind jederzeit ansprechbar. -Außerdem sind wir per Mail erreichbar. +Außerdem sind wir per Mail erreichbar. ## Öffentlichkeitsarbeit diff --git a/data/de/homepage.yml b/data/de/homepage.yml index 48b951f..955376c 100644 --- a/data/de/homepage.yml +++ b/data/de/homepage.yml @@ -119,7 +119,7 @@ success_banner: image: media/home/cds.png icon: "" - name: Und viel mehr ... - icon: ti-medal + icon: fa-solid fa-medal content: Durch umfassende Begabtenförderungsangebote sind unsere Schüler bei vielen Wettbewerben erfolgreich. Diese umfassen erweiterte Stoffgebiete, Spezialistenlager und begabtenfördernde Ganztagsangebote. diff --git a/layouts/_default/ganztagsangebote.html b/layouts/_default/ganztagsangebote.html index 2099930..a210451 100644 --- a/layouts/_default/ganztagsangebote.html +++ b/layouts/_default/ganztagsangebote.html @@ -2,9 +2,9 @@ {{ .Title }}

{{ .Title }}

diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 6116284..6182621 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -17,10 +17,10 @@ @@ -42,4 +42,4 @@ -{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/_default/post.html b/layouts/_default/post.html index 8f94533..f7c9b2d 100644 --- a/layouts/_default/post.html +++ b/layouts/_default/post.html @@ -4,13 +4,13 @@

{{ .Title }}

{{ .Summary | truncate 100 }}

{{ i18n "read_more" }}
- \ No newline at end of file + diff --git a/layouts/_default/wettbewerbe.html b/layouts/_default/wettbewerbe.html index bc42c43..0b1ee2f 100644 --- a/layouts/_default/wettbewerbe.html +++ b/layouts/_default/wettbewerbe.html @@ -2,10 +2,8 @@ {{ .Title }}

{{ .Title }}

{{ i18n "read_more"}} diff --git a/layouts/ganztagsangebote/single.html b/layouts/ganztagsangebote/single.html index bdf470e..a2c7ea5 100644 --- a/layouts/ganztagsangebote/single.html +++ b/layouts/ganztagsangebote/single.html @@ -19,7 +19,7 @@ diff --git a/layouts/wettbewerbe/single.html b/layouts/wettbewerbe/single.html index 8064d8b..e1d1ccf 100644 --- a/layouts/wettbewerbe/single.html +++ b/layouts/wettbewerbe/single.html @@ -19,7 +19,7 @@