Merge pull request 'Layout-Verbesserungen' (#201) from cantortechnik/gcg-website:master into master
Reviewed-on: https://git.cantorgymnasium.de/gcg/gcg-website/pulls/201
This commit is contained in:
commit
7c0141fb99
@ -1,33 +1,7 @@
|
|||||||
(function ($) {
|
(function ($) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// Preloader js
|
function adaptHeight () {
|
||||||
$(window).on('load', function () {
|
|
||||||
$('.preloader').fadeOut(100);
|
|
||||||
if ($('header').offset().top > 10) {
|
|
||||||
$('.top-header').addClass('hide');
|
|
||||||
$('.navigation').addClass('nav-bg');
|
|
||||||
$('.navigation').css('margin-top','-'+height+'px');
|
|
||||||
} else {
|
|
||||||
$('.top-header').removeClass('hide');
|
|
||||||
if (!$('#top-banner').length) {
|
|
||||||
$('.navigation').removeClass('nav-bg');
|
|
||||||
}
|
|
||||||
$('.navigation').css('margin-top','-'+0+'px');
|
|
||||||
}
|
|
||||||
if ($('#top-banner').length) {
|
|
||||||
$('.navigation').addClass('nav-bg');
|
|
||||||
$('.hero-section').addClass('hs-banner');
|
|
||||||
$('.page-title-section').addClass('pts-banner');
|
|
||||||
} else {
|
|
||||||
$('.navigation').removeClass('nav-bg');
|
|
||||||
$('.hero-section').removeClass('hs-banner');
|
|
||||||
$('.page-title-section').removeClass('pts-banner');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Sticky Menu
|
|
||||||
$(window).scroll(function () {
|
|
||||||
var height = $('.top-header').innerHeight();
|
var height = $('.top-header').innerHeight();
|
||||||
if ($('header').offset().top > 10) {
|
if ($('header').offset().top > 10) {
|
||||||
$('.top-header').addClass('hide');
|
$('.top-header').addClass('hide');
|
||||||
@ -40,9 +14,25 @@
|
|||||||
}
|
}
|
||||||
$('.navigation').css('margin-top','-'+0+'px');
|
$('.navigation').css('margin-top','-'+0+'px');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Preloader js
|
||||||
|
$(window).on('load', function () {
|
||||||
|
$('.preloader').fadeOut(100);
|
||||||
|
adaptHeight();
|
||||||
|
if ($('#top-banner').length) {
|
||||||
|
$('.navigation').addClass('nav-bg');
|
||||||
|
$('.hero-section').addClass('hs-banner');
|
||||||
|
$('.page-title-section').addClass('pts-banner');
|
||||||
|
} else {
|
||||||
|
$('.navigation').removeClass('nav-bg');
|
||||||
|
$('.hero-section').removeClass('hs-banner');
|
||||||
|
$('.page-title-section').removeClass('pts-banner');
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Sticky Menu
|
||||||
|
$(window).scroll(adaptHeight);
|
||||||
|
|
||||||
// Background-media
|
// Background-media
|
||||||
$('[data-background]').each(function () {
|
$('[data-background]').each(function () {
|
||||||
@ -60,8 +50,8 @@
|
|||||||
infinite: true,
|
infinite: true,
|
||||||
arrows: true,
|
arrows: true,
|
||||||
fade: true,
|
fade: true,
|
||||||
prevArrow: '<button type=\'button\' class=\'prevArrow\'><i class=\'mdi mdi-chevron-left\'></i></button>',
|
prevArrow: '<button type=\'button\' class=\'prevArrow\'><i class=\'mdi mdi-chevron-left arrowIcon\'></i></button>',
|
||||||
nextArrow: '<button type=\'button\' class=\'nextArrow\'><i class=\'mdi mdi-chevron-right\'></i></button>',
|
nextArrow: '<button type=\'button\' class=\'nextArrow\'><i class=\'mdi mdi-chevron-right arrowIcon\'></i></button>',
|
||||||
dots: true
|
dots: true
|
||||||
});
|
});
|
||||||
$('.hero-slider').slickAnimation();
|
$('.hero-slider').slickAnimation();
|
||||||
|
@ -31,7 +31,7 @@ h1, .h1{
|
|||||||
}
|
}
|
||||||
|
|
||||||
h2, .h2{
|
h2, .h2{
|
||||||
font-size: 40px;
|
font-size: 35px;
|
||||||
@include mobile {
|
@include mobile {
|
||||||
font-size: 30px;
|
font-size: 30px;
|
||||||
}
|
}
|
||||||
|
@ -37,6 +37,10 @@
|
|||||||
right: 0;
|
right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.arrowIcon {
|
||||||
|
font-size: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
.slick-dots {
|
.slick-dots {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
@ -59,7 +59,7 @@ events:
|
|||||||
- enddate: 2022-11-03T23:00:00.000Z
|
- enddate: 2022-11-03T23:00:00.000Z
|
||||||
date: 2022-10-24T13:22:08.641Z
|
date: 2022-10-24T13:22:08.641Z
|
||||||
title: Herbstferien
|
title: Herbstferien
|
||||||
location: nicht in der Schule
|
location:
|
||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2022-11-08T14:23:14.581Z
|
date: 2022-11-08T14:23:14.581Z
|
||||||
title: Zweite Runde der Internationalen Physikolympiade
|
title: Zweite Runde der Internationalen Physikolympiade
|
||||||
@ -135,7 +135,7 @@ events:
|
|||||||
- enddate: 2023-01-05T06:00:00.000Z
|
- enddate: 2023-01-05T06:00:00.000Z
|
||||||
date: 2022-12-21T14:55:18.525Z
|
date: 2022-12-21T14:55:18.525Z
|
||||||
title: Weihnachtsferien
|
title: Weihnachtsferien
|
||||||
location: nicht in der Schule
|
location:
|
||||||
- enddate: 2023-01-20T05:00:00.000Z
|
- enddate: 2023-01-20T05:00:00.000Z
|
||||||
date: 2023-01-16T14:57:43.479Z
|
date: 2023-01-16T14:57:43.479Z
|
||||||
title: Spezialistenlager Mathematik und Physik der Klassen 8 - 11
|
title: Spezialistenlager Mathematik und Physik der Klassen 8 - 11
|
||||||
@ -147,7 +147,7 @@ events:
|
|||||||
- enddate: 2023-02-03T04:00:00.000Z
|
- enddate: 2023-02-03T04:00:00.000Z
|
||||||
date: 2023-01-27T14:59:49.571Z
|
date: 2023-01-27T14:59:49.571Z
|
||||||
title: Skilager Klasse 11
|
title: Skilager Klasse 11
|
||||||
location: " "
|
location:
|
||||||
- enddate: 2023-02-03T05:00:00.000Z
|
- enddate: 2023-02-03T05:00:00.000Z
|
||||||
date: 2023-01-30T15:01:48.171Z
|
date: 2023-01-30T15:01:48.171Z
|
||||||
title: Modulkurs Chemie Klasse 11
|
title: Modulkurs Chemie Klasse 11
|
||||||
@ -163,7 +163,7 @@ events:
|
|||||||
- enddate: 2023-02-11T07:00:00.000Z
|
- enddate: 2023-02-11T07:00:00.000Z
|
||||||
date: 2023-02-06T15:07:19.620Z
|
date: 2023-02-06T15:07:19.620Z
|
||||||
title: Winterferien
|
title: Winterferien
|
||||||
location: nicht in der Schule
|
location:
|
||||||
- enddate: 2023-02-17T04:00:00.000Z
|
- enddate: 2023-02-17T04:00:00.000Z
|
||||||
date: 2023-02-13T15:08:20.930Z
|
date: 2023-02-13T15:08:20.930Z
|
||||||
title: Modulkurs Chemie der 12. Klassen
|
title: Modulkurs Chemie der 12. Klassen
|
||||||
@ -256,7 +256,7 @@ events:
|
|||||||
- enddate: 2023-04-08T06:00:00.000Z
|
- enddate: 2023-04-08T06:00:00.000Z
|
||||||
date: 2023-04-03T14:21:05.216Z
|
date: 2023-04-03T14:21:05.216Z
|
||||||
title: Osterferien
|
title: Osterferien
|
||||||
location: nicht in der Schule
|
location:
|
||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2023-03-22T15:21:08.979Z
|
date: 2023-03-22T15:21:08.979Z
|
||||||
title: Landeschemieolympiade
|
title: Landeschemieolympiade
|
||||||
@ -284,7 +284,7 @@ events:
|
|||||||
- enddate: 2023-05-18T22:00:00.000Z
|
- enddate: 2023-05-18T22:00:00.000Z
|
||||||
date: 2023-05-15T14:21:10.514Z
|
date: 2023-05-15T14:21:10.514Z
|
||||||
title: Pfingstferien
|
title: Pfingstferien
|
||||||
location: nicht in der Schule
|
location:
|
||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2023-05-23T14:21:10.753Z
|
date: 2023-05-23T14:21:10.753Z
|
||||||
title: Verpflichtende Zentrale Klassenarbeit Deutsch der 6. Klassen
|
title: Verpflichtende Zentrale Klassenarbeit Deutsch der 6. Klassen
|
||||||
@ -300,7 +300,7 @@ events:
|
|||||||
- date: 2023-05-30T16:40:01.000+02:00
|
- date: 2023-05-30T16:40:01.000+02:00
|
||||||
enddate: ""
|
enddate: ""
|
||||||
title: Lehrer-Präventionstag
|
title: Lehrer-Präventionstag
|
||||||
location: " "
|
location:
|
||||||
- date: 2023-06-01T16:41:16.000+02:00
|
- date: 2023-06-01T16:41:16.000+02:00
|
||||||
enddate: ""
|
enddate: ""
|
||||||
title: Sportfest mit Spendenlauf
|
title: Sportfest mit Spendenlauf
|
||||||
@ -308,7 +308,7 @@ events:
|
|||||||
- enddate: 2023-06-09T02:00:00.000Z
|
- enddate: 2023-06-09T02:00:00.000Z
|
||||||
date: 2023-06-05T15:44:26.521Z
|
date: 2023-06-05T15:44:26.521Z
|
||||||
title: Klassenfahrtswochen der Klassen 7 und 10
|
title: Klassenfahrtswochen der Klassen 7 und 10
|
||||||
location: nicht in der Schule
|
location:
|
||||||
- enddate: 2023-06-16T05:00:00.000Z
|
- enddate: 2023-06-16T05:00:00.000Z
|
||||||
date: 2023-06-13T15:44:26.948Z
|
date: 2023-06-13T15:44:26.948Z
|
||||||
title: Mitteldeutsche Regionalrunde der Chemieolympiade
|
title: Mitteldeutsche Regionalrunde der Chemieolympiade
|
||||||
@ -336,11 +336,11 @@ events:
|
|||||||
- enddate: 2023-06-30T03:00:00.000Z
|
- enddate: 2023-06-30T03:00:00.000Z
|
||||||
date: 2023-06-27T15:44:28.388Z
|
date: 2023-06-27T15:44:28.388Z
|
||||||
title: Ökopraktikum der 11. Klassen
|
title: Ökopraktikum der 11. Klassen
|
||||||
location: " "
|
location:
|
||||||
- date: 2023-06-28T16:45:21.000+02:00
|
- date: 2023-06-28T16:45:21.000+02:00
|
||||||
enddate: ""
|
enddate: ""
|
||||||
title: '"Der Puppenspieler" - Theaterprojekt der Klasse 10'
|
title: '"Der Puppenspieler" - Theaterprojekt der Klasse 10'
|
||||||
location: " "
|
location:
|
||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2023-06-29T13:00:28.876Z
|
date: 2023-06-29T13:00:28.876Z
|
||||||
title: Ausgabe der Reifezeugnisse
|
title: Ausgabe der Reifezeugnisse
|
||||||
@ -352,11 +352,11 @@ events:
|
|||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2023-07-03T15:44:29.868Z
|
date: 2023-07-03T15:44:29.868Z
|
||||||
title: Exkursionstag der Klassen 5 und 6
|
title: Exkursionstag der Klassen 5 und 6
|
||||||
location: " "
|
location:
|
||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2023-07-03T15:44:30.356Z
|
date: 2023-07-03T15:44:30.356Z
|
||||||
title: Sozialer Tag der Klassen 7-11
|
title: Sozialer Tag der Klassen 7-11
|
||||||
location: Georg-Cantor-Gymnasium
|
location:
|
||||||
- date: 2023-07-04T16:55:45.000+02:00
|
- date: 2023-07-04T16:55:45.000+02:00
|
||||||
enddate: ""
|
enddate: ""
|
||||||
title: Mannschaftswettbewerb Chemie Klasse 10
|
title: Mannschaftswettbewerb Chemie Klasse 10
|
||||||
@ -364,11 +364,11 @@ events:
|
|||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2023-07-04T15:44:30.803Z
|
date: 2023-07-04T15:44:30.803Z
|
||||||
title: Exkursionstag der Klassen 7-11
|
title: Exkursionstag der Klassen 7-11
|
||||||
location: " "
|
location:
|
||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2023-07-04T15:44:31.329Z
|
date: 2023-07-04T15:44:31.329Z
|
||||||
title: Sozialer Tag der Klassen 5-6
|
title: Sozialer Tag der Klassen 5-6
|
||||||
location: Georg-Cantor-Gymnasium
|
location:
|
||||||
- enddate: ""
|
- enddate: ""
|
||||||
date: 2023-07-05T15:54:47.837Z
|
date: 2023-07-05T15:54:47.837Z
|
||||||
title: Letzter Schultag - Ausgabe der Zeugnisse zum Schuljahresende
|
title: Letzter Schultag - Ausgabe der Zeugnisse zum Schuljahresende
|
||||||
@ -376,5 +376,5 @@ events:
|
|||||||
- enddate: 2023-08-16T04:00:00.000Z
|
- enddate: 2023-08-16T04:00:00.000Z
|
||||||
date: 2023-07-06T15:54:48.476Z
|
date: 2023-07-06T15:54:48.476Z
|
||||||
title: Sommerferien
|
title: Sommerferien
|
||||||
location: nicht in der Schule
|
location:
|
||||||
---
|
---
|
||||||
|
@ -17,9 +17,9 @@ slider:
|
|||||||
animation_in: left
|
animation_in: left
|
||||||
animation_out: right
|
animation_out: right
|
||||||
button:
|
button:
|
||||||
enable: false
|
enable: true
|
||||||
label: ""
|
label: Über uns
|
||||||
link: ""
|
link: about
|
||||||
- content: Schule mit dem Gütesiegel "Begabungsfördernde Schule"
|
- content: Schule mit dem Gütesiegel "Begabungsfördernde Schule"
|
||||||
animation_in: left
|
animation_in: left
|
||||||
animation_out: right
|
animation_out: right
|
||||||
|
@ -224,12 +224,25 @@
|
|||||||
|
|
||||||
{{ range first 3 $events }}
|
{{ range first 3 $events }}
|
||||||
<li class="d-md-table mb-4 w-100 border-bottom hover-shadow">
|
<li class="d-md-table mb-4 w-100 border-bottom hover-shadow">
|
||||||
<div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-4 termin-tc"><span class="h2 d-block">{{ time.Format "2" .date}}</span> <span class="d-block">{{ time.Format "Jan 2006" .date}}</span> {{ with .enddate }} <br> bis {{ time.Format "2 Jan 2006" . }} {{end}}</div>
|
<div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-0 termin-tc">
|
||||||
<div class="d-md-table-cell px-4 vertical-align-middle mb-4 mb-md-0 p-2">
|
<span class="h2 d-block">{{ time.Format "2" .date}}</span>
|
||||||
<p href="{{ .Permalink }}" class="h4 mb-3 d-block">{{ .title }}</p>
|
<span class="d-block">{{ time.Format "Jan 2006" .date}}</span>
|
||||||
<p class="mb-0">{{ .summary | truncate 100 }}</p>
|
{{ with .enddate }}
|
||||||
|
<br>
|
||||||
|
bis {{ time.Format "2 Jan 2006" . }}
|
||||||
|
{{ end }}
|
||||||
</div>
|
</div>
|
||||||
<div class="d-md-table-cell text-right pr-0 pr-md-4 p-2"><p><i class="mdi mdi-map-marker-radius text-primary mr-2"></i>{{ .location | markdownify }}</p></div>
|
<div class="d-md-table-cell px-4 vertical-align-middle mb-4 mb-md-0 p-2">
|
||||||
|
<p class="h4 mb-0 d-block">{{ .title }}</p>
|
||||||
|
</div>
|
||||||
|
{{ with .location }}
|
||||||
|
<div class="d-md-table-cell text-right pr-0 pr-md-4 p-2 vertical-align-middle">
|
||||||
|
<p>
|
||||||
|
<i class="mdi mdi-map-marker-radius-outline icon-s text-primary mr-2"></i>
|
||||||
|
{{ . | markdownify }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{{ end }}
|
||||||
</li>
|
</li>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
@ -51,6 +51,9 @@
|
|||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
{{ range .Children }}
|
{{ range .Children }}
|
||||||
<a class="dropdown-item text-uppercase" href="{{ .URL | absLangURL }}" target="{{ if .Params.External }}_blank{{ else }}_self{{end}}">{{ .Name }}</a>
|
<a class="dropdown-item text-uppercase" href="{{ .URL | absLangURL }}" target="{{ if .Params.External }}_blank{{ else }}_self{{end}}">{{ .Name }}</a>
|
||||||
|
{{ if .Params.separator }}
|
||||||
|
<hr>
|
||||||
|
{{ end }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
@ -7,12 +7,25 @@
|
|||||||
<ul class="list-unstyled">
|
<ul class="list-unstyled">
|
||||||
{{ range .Params.events }}
|
{{ range .Params.events }}
|
||||||
<li class="d-md-table mb-4 w-100 border-bottom hover-shadow">
|
<li class="d-md-table mb-4 w-100 border-bottom hover-shadow">
|
||||||
<div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-0 termin-tc"><span class="h2 d-block">{{ time.Format "2" .date}}</span> <span class="d-block">{{ time.Format "Jan 2006" .date}}</span> {{ with .enddate }} <br> bis {{ time.Format "2 Jan 2006" . }} {{end}}</div>
|
<div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-0 termin-tc">
|
||||||
<div class="d-md-table-cell px-4 vertical-align-middle mb-4 mb-md-0 p-2">
|
<span class="h2 d-block">{{ time.Format "2" .date}}</span>
|
||||||
<p href="{{ .Permalink }}" class="h4 mb-3 d-block">{{ .title }}</p>
|
<span class="d-block">{{ time.Format "Jan 2006" .date}}</span>
|
||||||
<p class="mb-0">{{ .summary | truncate 100 }}</p>
|
{{ with .enddate }}
|
||||||
|
<br>
|
||||||
|
bis {{ time.Format "2 Jan 2006" . }}
|
||||||
|
{{ end }}
|
||||||
</div>
|
</div>
|
||||||
<div class="d-md-table-cell text-right pr-0 pr-md-4 p-2"><p><i class="mdi mdi-map-marker-radius-outline icon-s text-primary mr-2"></i>{{ .location | markdownify }}</p></div>
|
<div class="d-md-table-cell px-4 vertical-align-middle mb-4 mb-md-0 p-2">
|
||||||
|
<p class="h4 mb-0 d-block">{{ .title }}</p>
|
||||||
|
</div>
|
||||||
|
{{ with .location }}
|
||||||
|
<div class="d-md-table-cell text-right pr-0 pr-md-4 p-2 vertical-align-middle">
|
||||||
|
<p>
|
||||||
|
<i class="mdi mdi-map-marker-radius-outline icon-s text-primary mr-2"></i>
|
||||||
|
{{ . | markdownify }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{{ end }}
|
||||||
</li>
|
</li>
|
||||||
{{ end }}
|
{{ end }}
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -475,8 +475,7 @@ collections:
|
|||||||
- {label: "Titel", name: "title", widget: "string", required: true}
|
- {label: "Titel", name: "title", widget: "string", required: true}
|
||||||
- {label: "Datum/Startdatum", name: "date", widget: "datetime", required: true, date_format: "dd.MM.yyyy", time_format: false, format: "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"}
|
- {label: "Datum/Startdatum", name: "date", widget: "datetime", required: true, date_format: "dd.MM.yyyy", time_format: false, format: "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"}
|
||||||
- {label: "Enddatum", name: "enddate", widget: "datetime", required: false, date_format: "dd.MM.yyyy", time_format: false, format: "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", default: ""}
|
- {label: "Enddatum", name: "enddate", widget: "datetime", required: false, date_format: "dd.MM.yyyy", time_format: false, format: "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", default: ""}
|
||||||
- {label: "Ort", name: "location", widget: "string", required: true}
|
- {label: "Ort", name: "location", widget: "string", required: false}
|
||||||
- {label: "Beschreibung", name: "summary", widget: "string", required: false}
|
|
||||||
required: false
|
required: false
|
||||||
- name: "forms-index"
|
- name: "forms-index"
|
||||||
label: "Dokumente und Formulare"
|
label: "Dokumente und Formulare"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user