denyskon/gcg-website
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

style updates, mailmap

Browse Source
This commit is contained in:
Denys Konovalov 2023-04-23 14:14:40 +02:00
parent 93c8542cdc
commit c86cc37c44
16 changed files with 160 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitea/workflows/dev.yaml
View File

@ -11,22 +11,19 @@ concurrency:
jobs:
dev-build:
if: gitea.repository == 'gcg/gcg-website' && gitea.event_name == 'push'
if: gitea.repository == 'gcg/gcg-website'
runs-on: act-runner-user
timeout-minutes: 5
steps:
- name: clone
uses: actions/checkout@v3
- name: build
run: hugo --minify --gc --baseURL "https://dev.cantorgymnasium.de/" --buildDrafts --buildFuture -d dev
- name: deploy
run: |
cd dev
pagefind --source=.
rsync -azr --delete ./ /opt/data/webdata/gcg-website-dev/
- name: notification
uses: actions/telegram-action@main
if: always()

7
.gitea/workflows/prod.yaml
View File

@ -19,16 +19,13 @@ jobs:
steps:
- name: clone
uses: actions/checkout@v3
- name: build
run: hugo --minify --gc --baseURL "https://cantorgymnasium.de/"
- name: deploy
run: |
cd public
pagefind --source=.
rsync -azr --delete ./ /opt/data/webdata/gcg-website/
- name: notification
uses: actions/telegram-action@main
if: always()
@ -43,10 +40,8 @@ jobs:
steps:
- name: clone
uses: actions/checkout@v3
- name: build
run: hugo --minify --gc --baseURL "https://test.cantorgymnasium.de/" --buildDrafts --buildFuture -d test
- name: deploy
run: |
cd test
@ -59,10 +54,8 @@ jobs:
steps:
- name: clone
uses: actions/checkout@v3
- name: build
run: hugo --minify --gc --baseURL "https://cantorgymnasium.de/"
- name: deploy
run: |
cd public

9
.mailmap
View File

@ -1,8 +1,15 @@
Chiamaka Michelle Okoro <amakaokoro07@gmail.com>
Denys Konovalov <kontakt@denyskon.de> <denys.konovalov@protonmail.com>
Denys Konovalov <kontakt@denyskon.de> <service@lxdb.de>
Denys Konovalov <kontakt@denyskon.de> <dinia200719@gmail.com>
Denys Konovalov <kontakt@denyskon.de> <68147873+eesev9ie@users.noreply.github.com>
Denys Konovalov <kontakt@denyskon.de> <denys.konovlov@protonmail.com>
Denys Konovalov <kontakt@denyskon.de> <denys.konovalov@protonmai.com>
Denys Konovalov <kontakt@denyskon.de> <privat@denyskon.de>
Dominic Winzer <dominicwinzer@web.de>
Felix Berger <jan.felix.berger@gmx.de>
Lilli Berthold <lilli.berthold@outlook.de> <uwe.berthold.lilli@gmail.com>
Lilli Berthold <lilli.berthold@outlook.de> <92160257+lilliiiii@users.noreply.github.com>
Lilly Meißner <hebu2007@web.de> <lmeissner@git.cantorgymnasium.de>
Lilly Meißner <hebu2007@web.de> <hebu2007@web.de>
Soeren Pflug <soeren.pflug@gmail.com>
Timm Rockel <timmrockel@gmail.com>

29
assets/js/script.js
View File

@ -1,6 +1,7 @@
(function ($) {
'use strict';
// adapt header to height
function adaptHeight () {
var height = $('.top-header').innerHeight();
if ($('header').offset().top > 10) {
@ -16,7 +17,7 @@
}
}
// Preloader js
// load scripts
$(window).on('load', function () {
$('.preloader').fadeOut(100);
adaptHeight();
@ -25,23 +26,22 @@
$('.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
// sticky menu
$(window).scroll(adaptHeight);
// Background-media
// background image
$('[data-background]').each(function () {
$(this).css({
'background-image': 'url(' + $(this).data('background') + ')'
});
});
//Hero Slider
// hero slider
$('.hero-slider').slick({
autoplay: true,
autoplaySpeed: 5000,
@ -82,14 +82,14 @@
}
);
}
//Active changer
// active changer
$('.filter-controls li').on('click', function () {
$('.filter-controls li').removeClass('active');
$(this).addClass('active');
});
});
// Count Up
// count up
function counter() {
var oTop;
if ($('.count').length !== 0) {
@ -121,18 +121,3 @@
});
})(jQuery);
var acc = document.getElementsByClassName("accordion");
var i;
for (i = 0; i < acc.length; i++) {
acc[i].addEventListener("click", function() {
this.classList.toggle("active");
var panel = this.nextElementSibling;
if (panel.style.maxHeight) {
panel.style.maxHeight = null;
} else {
panel.style.maxHeight = panel.scrollHeight + "px";
}
}, {passive: true});
}

9
assets/scss/_buttons.scss
View File

@ -48,11 +48,6 @@
padding: 10px 35px;
}
.btn-xs {
font-size: 12px;
padding: 5px 15px;
}
.btn-primary {
background: $primary-color;
color: $white;
@ -125,7 +120,3 @@
color: $white;
}
}
.input {
border: 100px;
}

137
assets/scss/_common.scss
View File

@ -174,15 +174,10 @@ a h4 {
font-size: 36px;
}
/* page title */
.page-title-section {
padding: 200px 0 80px;
}
/* /page title */
.list-styled {
padding-left: 25px;
@ -214,6 +209,7 @@ textarea.form-control {
/* pagination */
.pagination {
justify-content: center;
@ -269,7 +265,7 @@ textarea.form-control {
&::before {
position: absolute;
content: "\f0B2A";
font-family: "Material Design Icons";
font-family: $icon-font;
font-size: 14px;
left: 0;
top: 1px;
@ -289,6 +285,7 @@ textarea.form-control {
max-width: 100%;
margin-bottom: 1rem;
border: 1px solid #dee2e6;
table-layout: fixed;
th,
td {
@ -312,13 +309,13 @@ textarea.form-control {
blockquote {
border-left: 3px solid $primary-color;
border-top: 1px solid $primary-color;
border-bottom: 1px solid $primary-color;
border: 1px solid $border-color;
border-left: 5px solid $primary-color;
padding: 20px;
padding-left: 40px;
background-color: $light;
p {
margin-bottom: 0;
color: $text-color;
font-style: italic !important;
}
@ -327,26 +324,15 @@ textarea.form-control {
}
}
pre {
padding: 10px 20px;
background: $light;
}
}
.person-thumb-sm {
height: 85px;
width: 85px;
object-fit: cover;
}
summary {
font-weight: 900;
margin: -.5em -.5em 0;
padding: .5em;
font-size: 20px;
font-size: 22px;
color: $secondary-color;
&.hover {
@ -357,6 +343,7 @@ summary {
details[open] {
padding: .5em;
padding-bottom: 0;
}
details[open] summary {
@ -370,6 +357,83 @@ details[open] summary {
}
}
/* hero */
.hero-section {
padding: 250px 0 200px;
}
.hs-banner {
padding: 50px 0 200px;
}
.hero-slider {
.prevArrow,
.nextArrow {
position: absolute;
bottom: -123px;
z-index: 9;
padding: 15px;
color: rgba($color: $white, $alpha: .5);
border: 0;
font-size: 30px;
transition: all linear .2s;
background: transparent;
&:focus {
outline: 0;
}
&:hover {
color: $primary-color;
}
}
.prevArrow {
right: 60px;
}
.nextArrow {
right: 0;
}
.arrowIcon {
font-size: 40px;
}
.slick-dots {
position: absolute;
left: 0;
bottom: -100px;
padding-left: 0;
li {
display: inline-block;
margin: 0 6px;
&.slick-active {
button {
background: $primary-color;
}
}
button {
color: transparent;
padding: 0;
overflow: hidden;
height: 10px;
width: 10px;
background: rgba($color: $white, $alpha: .5);
border: 0;
outline: 0;
}
}
}
}
/* /hero */
.top-banner {
padding-top: 160px !important;
}
@ -396,4 +460,31 @@ details[open] summary {
.wc-canvas {
width: 100%;
height: 600px;
}
}
.filter-controls{
li{
cursor: pointer;
transition: .1s ease;
&.active{
font-weight: 600;
color: $primary-color;
}
&:hover{
color: $primary-color;
}
}
}
.tag-list{
a{
display: block;
padding: 5px 10px;
background: $light;
color: $text-color;
&:hover{
background-color: $primary-color;
color: $white;
}
}
}

2
assets/scss/_variables.scss
View File

@ -12,6 +12,6 @@ $light: #f8f9fe;
$gray: #f8f8f8;
// Font Variables
$primary-font: 'Fira Sans', sans-serif;
$primary-font: 'Rubik', sans-serif;
$secondary-font: 'Fira Sans', sans-serif;
$icon-font: 'Material Design Icons';

6
assets/scss/style.scss
View File

@ -10,8 +10,4 @@
@import 'templates/navigation';
@import 'templates/slider';
@import 'templates/homepage';
@import 'templates/otherspage';
@import 'templates/homepage';

26
assets/scss/templates/_otherspage.scss
View File

@ -1,26 +0,0 @@
.filter-controls{
li{
cursor: pointer;
transition: .1s ease;
&.active{
font-weight: 600;
color: $primary-color;
}
&:hover{
color: $primary-color;
}
}
}
.tag-list{
a{
display: block;
padding: 5px 10px;
background: $light;
color: $text-color;
&:hover{
background-color: $primary-color;
color: $white;
}
}
}

72
assets/scss/templates/_slider.scss
View File

@ -1,72 +0,0 @@
.hero-section {
padding: 250px 0 200px;
}
.hs-banner {
padding: 50px 0 200px;
}
.hero-slider {
.prevArrow,
.nextArrow {
position: absolute;
bottom: -123px;
z-index: 9;
padding: 15px;
color: rgba($color: $white, $alpha: .5);
border: 0;
font-size: 30px;
transition: all linear .2s;
background: transparent;
&:focus {
outline: 0;
}
&:hover {
color: $primary-color;
}
}
.prevArrow {
right: 60px;
}
.nextArrow {
right: 0;
}
.arrowIcon {
font-size: 40px;
}
.slick-dots {
position: absolute;
left: 0;
bottom: -100px;
padding-left: 0;
li {
display: inline-block;
margin: 0 6px;
&.slick-active {
button {
background: $primary-color;
}
}
button {
color: transparent;
padding: 0;
overflow: hidden;
height: 10px;
width: 10px;
background: rgba($color: $white, $alpha: .5);
border: 0;
outline: 0;
}
}
}
}

2
layouts/404.html
View File

@ -1,6 +1,6 @@
{{ define "main" }}
<section class="section">
<section class="section-sm">
<div class="container">
<div class="row">
<div class="col-12">

2
layouts/abiturienten/single.html
View File

@ -1,6 +1,6 @@
{{ define "main" }}
<section class="section">
<section class="section-sm">
<div class="container">
<div class="row">
<div class="col-12 mb-4">

20
layouts/kontakt/list.html
View File

@ -8,7 +8,7 @@ crossorigin=""/>
integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
crossorigin=""></script>
<section class="section-sm bg-gray">
<section class="section-sm pb-0 bg-gray">
<div class="container">
<div class="row">
<div class="col-lg-6 mb-4 mb-lg-0">
@ -48,11 +48,25 @@ crossorigin=""/>
</div>
</section>
<section class="section pt-0 bg-gray">
<section class="section-sm bg-gray">
<div class="container">
<div class="row">
<div id="map" class="card col-12" style="height: 50vh;">
<script src="/js/map.js"></script>
<script>
var map = L.map('map', {
scrollWheelZoom: false
}).setView([51.473361, 11.965619], 100);
L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
var marker = L.marker([51.473361, 11.965619]).addTo(map);
map.on('click', (e) => {
marker.bindPopup('Georg-Cantor-Gymnasium<br>Torstraße 13<br>06110 Halle (Saale)<br><b><a href="https://www.qwant.com/maps/place/osm:way:54033279@Georg-Cantor-Gymnasium">Route</a>').openPopup();
});
</script>
</div>
</div>
</div>

6
layouts/partials/collapsible.html
View File

@ -1,8 +1,8 @@
<div class="card border-primary rounded-2 hover-shadow mb-4">
<div class="card-body mb-0">
<details class="mb-0">
<summary class="mb-0">{{ .title }}</summary>
<div class="content mt-4">{{ .content | markdownify }}</div>
<details>
<summary>{{ .title }}</summary>
<div class="content">{{ .content | markdownify }}</div>
</details>
</div>
</div>

13
layouts/schulchronik/single.html
View File

@ -50,18 +50,17 @@
<div id="wc-canvas" class="wc-canvas"></div>
{{ $topics := slice }}
{{ if .Params.pretext }}
{{ $topics = $topics | append (slice (slice .Params.Title 200 (md5 .Title))) }}
{{ $topics = $topics | append (slice (slice .Params.Title 200 (md5 .Title))) }}
{{ else }}
{{ $topics = $topics | append (slice (slice .Params.Title 200)) }}
{{ $topics = $topics | append (slice (slice .Params.Title 200)) }}
{{ end }}
{{ range .Params.topics }}
{{ if .superhaufen.enable }}
{{ $topics = $topics | append (slice (slice .title 30 (.superhaufen.link | urlize) "superhaufen" )) }}
{{ $topics = $topics | append (slice (slice .title 30 (.superhaufen.link | urlize) "superhaufen" )) }}
{{ else }}
{{ $topics = $topics | append (slice (slice .title 30 (md5 .title) )) }}
{{ $topics = $topics | append (slice (slice .title 30 (md5 .title) )) }}
{{ end }}
{{ end }}
{{ $topics = $topics | jsonify }}
<script>
WordCloud(
document.getElementById('wc-canvas'),
@ -81,9 +80,9 @@
/* hover: function(item, dimension, event) {
item && item[2] ? event.target.style.textDecorationLine = "underline" : null
},*/
fontFamily: 'Tilt Warp, serif',
fontFamily: 'Rubik, sans-serif',
fontWeight: 700,
list: JSON.parse("{{ $topics }}"),
list: JSON.parse("{{ $topics | jsonify }}"),
shrinkToFit: true,
gridSize: 50,
rotateRatio: 0,

15
static/js/map.js
View File

@ -1,15 +0,0 @@
var map = L.map('map', {
scrollWheelZoom: false
}).setView([51.473361, 11.965619], 100);
L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
var marker = L.marker([51.473361, 11.965619]).addTo(map);
function onMarkerClick(e) {
marker.bindPopup('Georg-Cantor-Gymnasium<br>Torstraße 13<br>06110 Halle (Saale)<br><b><a href="https://www.qwant.com/maps/place/osm:way:54033279@Georg-Cantor-Gymnasium">Route</a>').openPopup();
}
map.on('click', onMarkerClick);