diff --git a/assets/js/script.js b/assets/js/script.js index af5de40c..84e76e5c 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 af5de40c..84e76e5c 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 8cd43be7..67694127 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 1d08fd68..69c9ade9 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 9762c2e0..3f2b014a 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 788f8ef8..173ea22d 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 70116b9f..289aea3f 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 d1535994..49fdf82e 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 48b951f7..955376ca 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 20999302..a2104515 100644 --- a/layouts/_default/ganztagsangebote.html +++ b/layouts/_default/ganztagsangebote.html @@ -2,9 +2,9 @@
{{ .Params.Weekly }}
{{ .Params.Weekly }}
{{ .Params.Class }}
{{ .Params.Class }}
{{ .Summary | truncate 100 }}
{{ i18n "read_more" }}{{ .Params.Category }}
{{ .Params.Category }}
{{ .Params.Weekly }}
@@ -28,7 +28,7 @@{{ .Params.Duration }}
@@ -37,7 +37,7 @@{{ .Params.Class }}
@@ -46,7 +46,7 @@{{ .Params.Room }}
diff --git a/layouts/index.html b/layouts/index.html index c4b2411f..19c8376a 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -181,7 +181,7 @@{{ .title }}
{{ .summary | truncate 100 }}
{{ .location | markdownify }}
{{ .location | markdownify }}
{{ .Params.Description | markdownify }}
diff --git a/layouts/termine/list.html b/layouts/termine/list.html index ae0b316c..3ae15590 100644 --- a/layouts/termine/list.html +++ b/layouts/termine/list.html @@ -12,7 +12,7 @@{{ .title }}
{{ .summary | truncate 100 }}
{{ .location | markdownify }}
{{ .location | markdownify }}
{{ .Params.Class }}
diff --git a/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index 20fccc69..27b4e658 100644 --- a/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -339,7 +339,7 @@ a h4:hover { padding-left: 25px; } .custom-breadcrumb li.nasted::before { position: absolute; - font-family: "themify"; + font-family: "FontAwesome"; content: "\e649"; font-size: 20px; top: 50%; @@ -410,8 +410,8 @@ textarea.form-control { list-style-type: none; } .content ul li::before { position: absolute; - content: "\e65d"; - font-family: "themify"; + content: "\f138"; + font-family: "FontAwesome"; font-size: 14px; left: 0; top: 1px; diff --git a/static/admin/config.yml b/static/admin/config.yml index 7c94b35d..a9d6b982 100644 --- a/static/admin/config.yml +++ b/static/admin/config.yml @@ -214,7 +214,7 @@ collections: fields: - {label: "Bezeichnung", name: "title", widget: "string"} - {label: "Symbol", name: "icon", widget: "string"} - - {label: "Link", name: "link", widget: "string", hint: "Liste unter https://themify.me/themify-icons"} + - {label: "Link", name: "link", widget: "string", hint: "Liste unter https://fontawesome.com/search"} - label: "Menü" name: "menu" widget: "object" @@ -401,22 +401,16 @@ collections: name: "icon" widget: "select" options: - - { label: "Flickr", value: "ti-flickr" } - - { label: "Tumblr", value: "ti-tumblr" } - - { label: "YouTube", value: "ti-youtube" } - - { label: "Twitter", value: "ti-twitter-alt" } - - { label: "Pinterest", value: "ti-pinterest" } - - { label: "GitHub", value: "ti-github" } - - { label: "StackOverflow", value: "ti-stack-overflow" } - - { label: "Vimeo", value: "ti-vimeo" } - - { label: "Instagram", value: "ti-instagram" } - - { label: "Facebook", value: "ti-facebook" } - - { label: "SoundCloud", value: "ti-soundcloud" } - - { label: "Reddit", value: "ti-reddit" } - - { label: "Skype", value: "ti-skype" } - - { label: "LinkedIn", value: "ti-linkedin" } - - { label: "E-Mail", value: "ti-email" } - - { label: "Sonstige", value: "ti-sharethis" } + - { label: "YouTube", value: "fa-brands fa-youtube" } + - { label: "Twitter", value: "fa-brands fs-twitter" } + - { label: "Pinterest", value: "fa-brands fa-pinterest" } + - { label: "GitHub", value: "fa-brands fa-github" } + - { label: "GitLab", value: "fa-brands fa-gitlab" } + - { label: "Vimeo", value: "fa-brands fa-vimeo" } + - { label: "Instagram", value: "fa-brands fa-instagram" } + - { label: "Facebook", value: "fa-brands fa-facebook" } + - { label: "E-Mail", value: "fa-solid fa-at" } + - { label: "Sonstige", value: "fa-solid fa-share-nodes" } - {label: "Link", name: "link", widget: "string"} required: false - {label: "Beschreibung", name: "body", widget: "markdown"} @@ -513,7 +507,7 @@ collections: widget: "list" fields: - {label: "Name/Adresse/Telefonnummer", name: "name", widget: "string"} - - {label: "Symbol", name: "icon", widget: "string", hint: "Symbolname von https://themify.me/themify-icons"} + - {label: "Symbol", name: "icon", widget: "string", hint: "Symbolname von https://fontawesome.com/search"} - {label: "Link", name: "link", widget: "string"} - {label: "Type", name: "type", widget: "hidden", default: "cantorpreis"} - {label: "Text", name: "body", widget: "markdown"} diff --git a/static/admin/index.html b/static/admin/index.html index 93b52528..5813a7e6 100644 --- a/static/admin/index.html +++ b/static/admin/index.html @@ -224,7 +224,7 @@ CMS.registerPreviewStyle("https://neu.cantorgymnasium.de/plugins/bootstrap/boots CMS.registerPreviewStyle("https://neu.cantorgymnasium.de/plugins/slick/slick.css"); CMS.registerPreviewStyle("https://neu.cantorgymnasium.de/plugins/animate/animate.css"); CMS.registerPreviewStyle("https://neu.cantorgymnasium.de/plugins/venobox/venobox.css"); -CMS.registerPreviewStyle("https://neu.cantorgymnasium.de/plugins/themify-icons/themify-icons.css"); +CMS.registerPreviewStyle("https://neu.cantorgymnasium.de/plugins/fontawesome/css/all.css"); CMS.registerPreviewStyle("https://neu.cantorgymnasium.de/plugins/fira/fira.css"); CMS.registerPreviewStyle("https://neu.cantorgymnasium.de/scss/style.css"); @@ -245,7 +245,7 @@ var PostPreview = createClass({ h('li', {"className": "list-inline-item h1"}, h('a', {"className": "text-primary font-secondary", href: ""}, "Schulchronik")), h('li', {"className": "list-inline-item ha"}, - h("i", {"className": "ti-angle-right text-white"})), + h("i", {"className": "fa-solid fa-angle-right text-white"})), h('li', {"className": "list-inline-item text-white h1 font-secondary"}, entry.getIn(['data', 'title'])) ) ) @@ -283,7 +283,7 @@ var PostPreviewContent = createClass({ h('li', {"className": "list-inline-item h1"}, h('a', {"className": "text-primary font-secondary", href: ""}, "Schulchronik")), h('li', {"className": "list-inline-item ha"}, - h("i", {"className": "ti-angle-right text-white"})), + h("i", {"className": "fa-solid fa-angle-right text-white"})), h('li', {"className": "list-inline-item text-white h1 font-secondary"}, entry.getIn(['data', 'title'])) ) ) @@ -326,7 +326,7 @@ var EventPreview = createClass({ h('a', {"className": "text-primary font-secondary", href: ""}, "Startseite") ), h('li', {"className": "list-inline-item ha"}, - h("i", {"className": "ti-angle-right text-white"}) + h("i", {"className": "fa-solid fa-angle-right text-white"}) ), h('li', {"className": "list-inline-item text-white h1 font-secondary"}, entry.getIn(['data', 'title']) ) @@ -353,7 +353,7 @@ var EventPreview = createClass({ ), h('div', {"className": "d-md-table-cell text-right pr-0 pr-md-4"}, h('p', {}, - h('i', {"className": "ti-location-pin text-primary mr-2"}), + h('i', {"className": "fa-solid fa-location-dot text-primary mr-2"}), event.getIn(['data', 'location']) ) ) @@ -390,7 +390,7 @@ var PagePreview = createClass({ h('a', {"className": "text-primary font-secondary", href: ""}, "Startseite") ), h('li', {"className": "list-inline-item ha"}, - h("i", {"className": "ti-angle-right text-white"}) + h("i", {"className": "fa-solid fa-angle-right text-white"}) ), h('li', {"className": "list-inline-item text-white h1 font-secondary"}, entry.getIn(['data', 'title']) ) @@ -431,7 +431,7 @@ var PagePreviewImage = createClass({ h('a', {"className": "text-primary font-secondary", href: ""}, "Startseite") ), h('li', {"className": "list-inline-item ha"}, - h("i", {"className": "ti-angle-right text-white"}) + h("i", {"className": "fa-solid fa-angle-right text-white"}) ), h('li', {"className": "list-inline-item text-white h1 font-secondary"}, entry.getIn(['data', 'title']) )