style updates, mailmap

This commit is contained in:
Denys Konovalov 2023-04-23 14:14:40 +02:00
parent c101c7ba1e
commit 61250c137d
15 changed files with 152 additions and 199 deletions

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

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

@ -1,6 +1,7 @@
(function ($) { (function ($) {
'use strict'; 'use strict';
// adapt header to height
function adaptHeight () { function adaptHeight () {
var height = $('.top-header').innerHeight(); var height = $('.top-header').innerHeight();
if ($('header').offset().top > 10) { if ($('header').offset().top > 10) {
@ -16,7 +17,7 @@
} }
} }
// Preloader js // load scripts
$(window).on('load', function () { $(window).on('load', function () {
$('.preloader').fadeOut(100); $('.preloader').fadeOut(100);
adaptHeight(); adaptHeight();
@ -25,23 +26,22 @@
$('.hero-section').addClass('hs-banner'); $('.hero-section').addClass('hs-banner');
$('.page-title-section').addClass('pts-banner'); $('.page-title-section').addClass('pts-banner');
} else { } else {
$('.navigation').removeClass('nav-bg');
$('.hero-section').removeClass('hs-banner'); $('.hero-section').removeClass('hs-banner');
$('.page-title-section').removeClass('pts-banner'); $('.page-title-section').removeClass('pts-banner');
} }
}); });
// Sticky Menu // sticky menu
$(window).scroll(adaptHeight); $(window).scroll(adaptHeight);
// Background-media // background image
$('[data-background]').each(function () { $('[data-background]').each(function () {
$(this).css({ $(this).css({
'background-image': 'url(' + $(this).data('background') + ')' 'background-image': 'url(' + $(this).data('background') + ')'
}); });
}); });
//Hero Slider // hero slider
$('.hero-slider').slick({ $('.hero-slider').slick({
autoplay: true, autoplay: true,
autoplaySpeed: 5000, autoplaySpeed: 5000,
@ -82,14 +82,14 @@
} }
); );
} }
//Active changer // active changer
$('.filter-controls li').on('click', function () { $('.filter-controls li').on('click', function () {
$('.filter-controls li').removeClass('active'); $('.filter-controls li').removeClass('active');
$(this).addClass('active'); $(this).addClass('active');
}); });
}); });
// Count Up // count up
function counter() { function counter() {
var oTop; var oTop;
if ($('.count').length !== 0) { if ($('.count').length !== 0) {
@ -121,18 +121,3 @@
}); });
})(jQuery); })(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});
}

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

@ -174,15 +174,10 @@ a h4 {
font-size: 36px; font-size: 36px;
} }
/* page title */
.page-title-section { .page-title-section {
padding: 200px 0 80px; padding: 200px 0 80px;
} }
/* /page title */
.list-styled { .list-styled {
padding-left: 25px; padding-left: 25px;
@ -214,6 +209,7 @@ textarea.form-control {
/* pagination */ /* pagination */
.pagination { .pagination {
justify-content: center; justify-content: center;
@ -269,7 +265,7 @@ textarea.form-control {
&::before { &::before {
position: absolute; position: absolute;
content: "\f0B2A"; content: "\f0B2A";
font-family: "Material Design Icons"; font-family: $icon-font;
font-size: 14px; font-size: 14px;
left: 0; left: 0;
top: 1px; top: 1px;
@ -289,6 +285,7 @@ textarea.form-control {
max-width: 100%; max-width: 100%;
margin-bottom: 1rem; margin-bottom: 1rem;
border: 1px solid #dee2e6; border: 1px solid #dee2e6;
table-layout: fixed;
th, th,
td { td {
@ -312,13 +309,13 @@ textarea.form-control {
blockquote { blockquote {
border-left: 3px solid $primary-color; border: 1px solid $border-color;
border-top: 1px solid $primary-color; border-left: 5px solid $primary-color;
border-bottom: 1px solid $primary-color;
padding: 20px; padding: 20px;
padding-left: 40px;
background-color: $light; background-color: $light;
p { p {
margin-bottom: 0;
color: $text-color; color: $text-color;
font-style: italic !important; font-style: italic !important;
} }
@ -327,26 +324,15 @@ textarea.form-control {
} }
} }
pre { pre {
padding: 10px 20px; padding: 10px 20px;
background: $light; background: $light;
} }
} }
.person-thumb-sm {
height: 85px;
width: 85px;
object-fit: cover;
}
summary { summary {
font-weight: 900; font-weight: 900;
margin: -.5em -.5em 0; font-size: 22px;
padding: .5em;
font-size: 20px;
color: $secondary-color; color: $secondary-color;
&.hover { &.hover {
@ -357,6 +343,7 @@ summary {
details[open] { details[open] {
padding: .5em; padding: .5em;
padding-bottom: 0;
} }
details[open] summary { 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 { .top-banner {
padding-top: 160px !important; padding-top: 160px !important;
} }
@ -397,3 +461,30 @@ details[open] summary {
width: 100%; width: 100%;
height: 600px; 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;
}
}
}

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

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

@ -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;
}
}
}

@ -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;
}
}
}
}

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

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

@ -8,7 +8,7 @@ crossorigin=""/>
integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA==" integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
crossorigin=""></script> crossorigin=""></script>
<section class="section-sm bg-gray"> <section class="section-sm pb-0 bg-gray">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-6 mb-4 mb-lg-0"> <div class="col-lg-6 mb-4 mb-lg-0">
@ -48,11 +48,25 @@ crossorigin=""/>
</div> </div>
</section> </section>
<section class="section pt-0 bg-gray"> <section class="section-sm bg-gray">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div id="map" class="card col-12" style="height: 50vh;"> <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> </div>
</div> </div>

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

@ -61,7 +61,6 @@
{{ $topics = $topics | append (slice (slice .title 30 (md5 .title) )) }} {{ $topics = $topics | append (slice (slice .title 30 (md5 .title) )) }}
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ $topics = $topics | jsonify }}
<script> <script>
WordCloud( WordCloud(
document.getElementById('wc-canvas'), document.getElementById('wc-canvas'),
@ -81,9 +80,9 @@
/* hover: function(item, dimension, event) { /* hover: function(item, dimension, event) {
item && item[2] ? event.target.style.textDecorationLine = "underline" : null item && item[2] ? event.target.style.textDecorationLine = "underline" : null
},*/ },*/
fontFamily: 'Tilt Warp, serif', fontFamily: 'Rubik, sans-serif',
fontWeight: 700, fontWeight: 700,
list: JSON.parse("{{ $topics }}"), list: JSON.parse("{{ $topics | jsonify }}"),
shrinkToFit: true, shrinkToFit: true,
gridSize: 50, gridSize: 50,
rotateRatio: 0, rotateRatio: 0,

@ -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);