diff --git a/content/german/event/vorstellung-website.md b/content/german/event/vorstellung-website.md index 6052eba..61a97f2 100644 --- a/content/german/event/vorstellung-website.md +++ b/content/german/event/vorstellung-website.md @@ -1,8 +1,8 @@ --- -title: "Vorstellung Website Vorversion" +title: "Beginn Schuljahr 2020/2021" # Schedule page publish date publishDate: "2019-01-01T00:00:00Z" -date: 2020-07-15T15:00:00+01:00 +date: 2020-08-27T07:30:00+01:00 draft: false # page title background image bg_image: "media/backgrounds/page-title.png" @@ -24,17 +24,3 @@ location: "Georg-Cantor-Gymnasium, Halle(Saale)" # type type: "event" --- - -Bei der abschließenden Dienstberatung am 15.07.2020 wird die Vorversion der neuen Schulwebsite den Lehrern vorgestellt. - -### Diskussionen - -Bei der Vorstellung muss über folgende umstrittene Themen diskutiert werden: - - * Liste aller Lehrer - > Informationen(Name, Kontaktdaten, Fächer ...) - - * Kontaktformulare für Lehrer - * Englische Übersetzung der Website - -... diff --git a/content/german/ganztagsangebote/nawigator.md b/content/german/ganztagsangebote/nawigator.md index e6e46c0..d2d6a80 100644 --- a/content/german/ganztagsangebote/nawigator.md +++ b/content/german/ganztagsangebote/nawigator.md @@ -7,7 +7,7 @@ bg_image: "media/bild_titelbild.jpg" # meta description description : "Begabtenförderung in Biologie, Chemie und Physik" # course thumbnail -image: "media/image.png" +image: "media/ganztagsangebote/nawigator.jpg" # taxonomy categories: ["Naturwissenschaften"] # teacher diff --git a/data/de/homepage.yml b/data/de/homepage.yml index 1b50731..98a3b47 100644 --- a/data/de/homepage.yml +++ b/data/de/homepage.yml @@ -1,7 +1,7 @@ ################################# Slider ##################################### slider: enable : true - bg_image : "media/banner/banner-2.png" + bg_image : "media/banner/banner.png" slider_item: # slider item loop - title : "Das Georg-Cantor-Gymnasium" @@ -16,7 +16,7 @@ slider: # slider item loop - title : "Das Georg-Cantor-Gymnasium" - content : "Schule mit dem Gütesiegel: Begabungsfördernde Schule" + content : "Schule mit dem Gütesiegel ''Begabungsfördernde Schule''" animation_in : "right" animation_out : "down" # available animation : left, right, up, down @@ -27,7 +27,7 @@ slider: # slider item loop - title : "Das Georg-Cantor-Gymnasium" - content : "Ein Primegymnasium der Martin-Luther-Universität Halle-Wittenberg" + content : "Primegymnasium der Martin-Luther-Universität Halle-Wittenberg" animation_in : "up" animation_out : "left" # available animation : left, right, up, down @@ -38,7 +38,7 @@ slider: # slider item loop - title : "Das Georg-Cantor-Gymnasium" - content : "Kooperationsschule der Hochschule Merseburg" + content : "Kooperationsschule der Hochschule Merseburg und der Hochschule Anhalt" animation_in : "left" animation_out : "right" # available animation : left, right, up, down @@ -60,25 +60,35 @@ slider: # slider item loop - title : "Das Georg-Cantor-Gymnasium" - content : "Mitglied im Netzwerk Mathematisch-naturwissenschaftlicher Excellence-Center an Schulen (MINT-EC)" + content : "Mitglied im Netzwerk MINT-EC" animation_in : "up" animation_out : "left" # available animation : left, right, up, down button: enable : true label : "Mehr erfahren" - link : "" + link : "https://mint-ec.de" + + - title : "Das Georg-Cantor-Gymnasium" + content : "Projektschule LemaS" + animation_in : "left" + animation_out : "right" + # available animation : left, right, up, down + button: + enable : true + label : "Mehr erfahren" + link : "https://mint-ec.de" # slider item loop - title : "Das Georg-Cantor-Gymnasium" - content : "Jugend Forscht Schule 2018" - animation_in : "up" - animation_out : "left" + content : "KMK ''Jugend forscht''-Schule 2018" + animation_in : "right" + animation_out : "down" # available animation : left, right, up, down button: enable : true label : "Mehr erfahren" - link : "" + link : "https://www.kmk.org/aktuelles/artikelansicht/georg-cantor-gymnasium-halle-saale-ist-die-jugend-forscht-schule-2018.html" ############################# success ############################# success_banner: @@ -113,7 +123,7 @@ about: enable : true title : "Website im Aufbau" image : "media/about/about-us.jpg" - content : "* Hier entsteht eine neue Website für das Georg-Cantor-Gymnasium in Halle(Saale). \n* Alle Bereiche, die mit (UMSTRITTEN) gekennzeichnet sind, müssen noch diskutiert werden und deren Existenz ist noch nicht versichert. \n* Da die Wesite noch im Aufbau ist fehlen noch viele Inhalte und mehrere Bereiche. \n* **Informationen auf dieser Testwebsite können mit der Realität nicht übereinstimmen.** \n* Der Quellcode der Website ist [hier](https://github.com/lxdb/gcg-website) abrufbar. \n* Hier ist der Deployment-Status der Website sichtbar: ![.github/workflows/workflow.yml](https://github.com/eesev9ie/gcg-website/workflows/.github/workflows/workflow.yml/badge.svg) \n* Dieser Bereich wird in der Zukunft einen Kurztext über die Schule enthalten" + content : "* Hier entsteht eine neue Website für das Georg-Cantor-Gymnasium in Halle(Saale). \n* Da die Wesite noch im Aufbau ist fehlen noch viele Inhalte und mehrere Bereiche. \n* **Informationen auf dieser Testwebsite können mit der Realität nicht übereinstimmen.** \n* Der Quellcode der Website ist [hier](https://github.com/lxdb/gcg-website) abrufbar. \n* Hier ist der Deployment-Status der Website sichtbar: ![.github/workflows/workflow.yml](https://github.com/eesev9ie/gcg-website/workflows/.github/workflows/workflow.yml/badge.svg) \n* Dieser Bereich wird in der Zukunft einen Kurztext über die Schule enthalten." button: enable : true label : "Über die Schule" @@ -142,7 +152,7 @@ success_story: enable : true bg_image : "media/backgrounds/success-story.jpg" title : "Über die Schule" - content : "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." + content : "Das Georg-Cantor-Gymnasium wurde im Jahre 1988 als eine mathematisch-naturwissenschaftliche Schule gegründet. Über die vielen Jahre kamen viele Veränderungen auf die Schule zu. Nach der Verleihung des Namen ''Georg-Cantor'', umformung zu einem Gymnasium, dem Umzug in ein neues Gebäude u.v.m ist die Schule heute ein erfolgreiches, modernes und produktives Gymnasium mit mathematisch-naturwissenschaftlichem Schwerpunkt, und dem Gütesiegel begabungsfördernde Schule vom Landesinstitut für Schulqualität und Lehrbildung." # video link video_link : "https://www.youtube.com/watch?v=v2ovvOmv-xw" diff --git a/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content index 1b87e0a..69ed513 100644 --- a/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content +++ b/resources/_gen/assets/scss/scss/style.scss_f300667da4f5b5f84e1a9e0702b2fdde.content @@ -410,16 +410,18 @@ textarea.form-control { padding-left: 0; } .content ul li { position: relative; - margin-bottom: 10px; } + padding-left: 20px; + margin-bottom: 10px; + list-style-type: none; } .content ul li::before { position: absolute; - content: ""; - height: 10px; - width: 10px; - border-radius: 50%; - background: #ffbc3b; - left: -25px; - top: 5px; } + content: "\e65d"; + font-family: "themify"; + font-size: 14px; + left: 0; + top: 1px; + color: #ffbc3b; + transition: .3s ease; } .content table { text-align: left; @@ -454,7 +456,7 @@ textarea.form-control { object-fit: cover; } .top-header { - font-size: 12px; + font-size: 13px; transition: transform .2s ease; transform-origin: top; font-weight: 600; } @@ -623,8 +625,8 @@ link:focus, /* banner feature */ .feature-icon { - font-size: 50px; - color: #ffbc3b; + font-size: 60px; + color: #1a1a37; display: inline-block; } .feature-blocks { @@ -682,7 +684,7 @@ link:focus, border-radius: 50%; background: #ffbc3b; color: #fff; - font-size: 20px; + font-size: 25px; text-align: center; } .play-btn i { line-height: 80px; } @@ -744,16 +746,6 @@ link:focus, /* /teacher */ /* footer */ -.newsletter { - background-image: linear-gradient(to right, transparent 50%, #ffbc3b 50%); - margin-bottom: -170px; - position: relative; - z-index: 1; } - .newsletter-block { - padding-left: 50px; } - @media (max-width: 575px) { - .newsletter-block { - padding-left: 15px; } } .input-wrapper { position: relative; } .input-wrapper button { diff --git a/static/media/about/about-page.jpg b/static/media/about/about-page.jpg deleted file mode 100755 index 4fb79c7..0000000 Binary files a/static/media/about/about-page.jpg and /dev/null differ diff --git a/static/media/backgrounds/page-title-n.jpg b/static/media/backgrounds/page-title-n.jpg deleted file mode 100644 index 0734b59..0000000 Binary files a/static/media/backgrounds/page-title-n.jpg and /dev/null differ diff --git a/static/media/backgrounds/page-title.jpg b/static/media/backgrounds/page-title.jpg deleted file mode 100755 index 6138302..0000000 Binary files a/static/media/backgrounds/page-title.jpg and /dev/null differ diff --git a/static/media/banner/banner-1.jpg b/static/media/banner/banner-1.jpg deleted file mode 100644 index 170b375..0000000 Binary files a/static/media/banner/banner-1.jpg and /dev/null differ diff --git a/static/media/banner/banner-2.png b/static/media/banner/banner.png similarity index 100% rename from static/media/banner/banner-2.png rename to static/media/banner/banner.png diff --git a/static/media/blog/post-1.jpg b/static/media/blog/post-1.jpg deleted file mode 100755 index 42a8c29..0000000 Binary files a/static/media/blog/post-1.jpg and /dev/null differ diff --git a/static/media/blog/post-2.jpg b/static/media/blog/post-2.jpg deleted file mode 100755 index 9a940c1..0000000 Binary files a/static/media/blog/post-2.jpg and /dev/null differ diff --git a/static/media/blog/post-3.jpg b/static/media/blog/post-3.jpg deleted file mode 100755 index 4a81fd8..0000000 Binary files a/static/media/blog/post-3.jpg and /dev/null differ diff --git a/static/media/cantorlogo.bmp b/static/media/cantorlogo.bmp deleted file mode 100644 index c6ff3ee..0000000 Binary files a/static/media/cantorlogo.bmp and /dev/null differ diff --git a/static/media/courses/course-1.jpg b/static/media/courses/course-1.jpg deleted file mode 100755 index 8a3484d..0000000 Binary files a/static/media/courses/course-1.jpg and /dev/null differ diff --git a/static/media/courses/course-2.jpg b/static/media/courses/course-2.jpg deleted file mode 100755 index 38c91ed..0000000 Binary files a/static/media/courses/course-2.jpg and /dev/null differ diff --git a/static/media/courses/course-3.jpg b/static/media/courses/course-3.jpg deleted file mode 100755 index 99188f0..0000000 Binary files a/static/media/courses/course-3.jpg and /dev/null differ diff --git a/static/media/courses/course-4.jpg b/static/media/courses/course-4.jpg deleted file mode 100755 index b471497..0000000 Binary files a/static/media/courses/course-4.jpg and /dev/null differ diff --git a/static/media/courses/course-5.jpg b/static/media/courses/course-5.jpg deleted file mode 100755 index 8ad72e9..0000000 Binary files a/static/media/courses/course-5.jpg and /dev/null differ diff --git a/static/media/courses/course-6.jpg b/static/media/courses/course-6.jpg deleted file mode 100755 index 990f847..0000000 Binary files a/static/media/courses/course-6.jpg and /dev/null differ diff --git a/static/media/courses/course-single.jpg b/static/media/courses/course-single.jpg deleted file mode 100755 index e135432..0000000 Binary files a/static/media/courses/course-single.jpg and /dev/null differ diff --git a/static/media/event-speakers/speaker-1.jpg b/static/media/event-speakers/speaker-1.jpg deleted file mode 100755 index 0f5493e..0000000 Binary files a/static/media/event-speakers/speaker-1.jpg and /dev/null differ diff --git a/static/media/event-speakers/speaker-2.jpg b/static/media/event-speakers/speaker-2.jpg deleted file mode 100755 index 86ccf4f..0000000 Binary files a/static/media/event-speakers/speaker-2.jpg and /dev/null differ diff --git a/static/media/event-speakers/speaker-3.jpg b/static/media/event-speakers/speaker-3.jpg deleted file mode 100755 index 9f4ce19..0000000 Binary files a/static/media/event-speakers/speaker-3.jpg and /dev/null differ diff --git a/static/media/event-speakers/speaker-4.jpg b/static/media/event-speakers/speaker-4.jpg deleted file mode 100755 index df0df13..0000000 Binary files a/static/media/event-speakers/speaker-4.jpg and /dev/null differ diff --git a/static/media/events/event-1.jpg b/static/media/events/event-1.jpg deleted file mode 100755 index 2f69484..0000000 Binary files a/static/media/events/event-1.jpg and /dev/null differ diff --git a/static/media/events/event-2.jpg b/static/media/events/event-2.jpg deleted file mode 100755 index 36e822d..0000000 Binary files a/static/media/events/event-2.jpg and /dev/null differ diff --git a/static/media/events/event-3.jpg b/static/media/events/event-3.jpg deleted file mode 100755 index 326050a..0000000 Binary files a/static/media/events/event-3.jpg and /dev/null differ diff --git a/static/media/forms/logo_202.png b/static/media/forms/logo_202.png deleted file mode 100644 index af9b02a..0000000 Binary files a/static/media/forms/logo_202.png and /dev/null differ diff --git a/static/media/forms/research-1.jpg b/static/media/forms/research-1.jpg deleted file mode 100755 index effd8e4..0000000 Binary files a/static/media/forms/research-1.jpg and /dev/null differ diff --git a/static/media/forms/research-2.jpg b/static/media/forms/research-2.jpg deleted file mode 100755 index ec2473f..0000000 Binary files a/static/media/forms/research-2.jpg and /dev/null differ diff --git a/static/media/forms/research-3.jpg b/static/media/forms/research-3.jpg deleted file mode 100755 index 47c06c5..0000000 Binary files a/static/media/forms/research-3.jpg and /dev/null differ diff --git a/static/media/forms/research-4.jpg b/static/media/forms/research-4.jpg deleted file mode 100755 index 20983c5..0000000 Binary files a/static/media/forms/research-4.jpg and /dev/null differ diff --git a/static/media/forms/research-5.jpg b/static/media/forms/research-5.jpg deleted file mode 100755 index 9cac11c..0000000 Binary files a/static/media/forms/research-5.jpg and /dev/null differ diff --git a/static/media/forms/research-6.jpg b/static/media/forms/research-6.jpg deleted file mode 100755 index f46e362..0000000 Binary files a/static/media/forms/research-6.jpg and /dev/null differ diff --git a/static/media/ganztagsangebote/ag.jpg b/static/media/ganztagsangebote/ag.jpg deleted file mode 100644 index 2d8e6fb..0000000 Binary files a/static/media/ganztagsangebote/ag.jpg and /dev/null differ diff --git a/static/media/ganztagsangebote/nawigator.jpg b/static/media/ganztagsangebote/nawigator.jpg index 5e59f79..aa8c030 100644 Binary files a/static/media/ganztagsangebote/nawigator.jpg and b/static/media/ganztagsangebote/nawigator.jpg differ diff --git a/static/media/marker.png b/static/media/marker.png deleted file mode 100755 index c410c03..0000000 Binary files a/static/media/marker.png and /dev/null differ diff --git a/static/media/scholarship/scholarship-item-1.jpg b/static/media/scholarship/scholarship-item-1.jpg deleted file mode 100755 index 49d5b56..0000000 Binary files a/static/media/scholarship/scholarship-item-1.jpg and /dev/null differ diff --git a/static/media/scholarship/scholarship-item-2.jpg b/static/media/scholarship/scholarship-item-2.jpg deleted file mode 100755 index c9bf349..0000000 Binary files a/static/media/scholarship/scholarship-item-2.jpg and /dev/null differ diff --git a/static/media/scholarship/scholarship-item-3.jpg b/static/media/scholarship/scholarship-item-3.jpg deleted file mode 100755 index 506eb3e..0000000 Binary files a/static/media/scholarship/scholarship-item-3.jpg and /dev/null differ diff --git a/static/media/scholarship/scholarship.jpg b/static/media/scholarship/scholarship.jpg deleted file mode 100755 index 99d4645..0000000 Binary files a/static/media/scholarship/scholarship.jpg and /dev/null differ diff --git a/static/media/slide1.jpg b/static/media/slide1.jpg deleted file mode 100644 index 170b375..0000000 Binary files a/static/media/slide1.jpg and /dev/null differ diff --git a/static/media/success/success_banner.png b/static/media/success/success_banner.png index e4dbe1c..8c60727 100755 Binary files a/static/media/success/success_banner.png and b/static/media/success/success_banner.png differ diff --git a/static/media/success/website_logo.png b/static/media/success/website_logo.png deleted file mode 100644 index aca456b..0000000 Binary files a/static/media/success/website_logo.png and /dev/null differ