small fixes

This commit is contained in:
teldra 2022-06-12 13:50:06 +02:00
parent e2157a0a6b
commit f5f586fa90
19 changed files with 226 additions and 226 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 680 KiB

View File

@ -0,0 +1,31 @@
article {
.article_content {
}
.articlemeta {
margin-top: 1rem;
margin-bottom: .5rem;
&:first-child {
font-weight: bold;
}
}
}
.article_footer {
font-size: 20%;
display: flex;
flex-direction: column;
justify-content: center;
margin-top: 1rem;
.mod_times, .foundations {
display: flex;
flex-direction: column;
.mod_times_item:first-child, {
margin-bottom: .4rem;
}
}
.foundations {
display: flex;
margin-bottom: 1rem;
}
}

View File

@ -14,3 +14,42 @@
word-break: break-all;
}
}
@media (min-width: 640px) {
.banner {
margin-left: auto;
margin-right: auto;
}
}
@media (min-width: 768px) {
.banner {
max-width: 768px;
margin-left: auto;
margin-right: auto;
}
}
@media (min-width: 1024px) {
.banner {
max-width: 1024px;
margin-left: auto;
margin-right: auto;
}
}
@media (min-width: 1280px) {
.banner {
max-width: 1280px;
margin-left: auto;
margin-right: auto;
}
}
@media (min-width: 1920px) {
.banner {
max-width: 1920px;
margin-left: auto;
margin-right: auto;
}
}

View File

@ -1,15 +0,0 @@
@media only screen and (min-width: 600px) {
.main {
width: 80%;
margin-left: auto;
margin-right: auto;
}
.twolists {
display: flex; flex-wrap: wrap; justify-content: space-around;
div {
display: flex;
flex-direction: column;
width: 45%;
}
}
}

View File

@ -6,3 +6,19 @@
* {
font-family: 'Nanum';
}
@media (min-width: 640px) {
}
@media (min-width: 768px) {
}
@media (min-width: 1024px) {
}
@media (min-width: 1280px) {
}
@media (min-width: 1920px) {
}

View File

@ -0,0 +1,42 @@
.gen_list {
width: 100%;
.article_list {
margin-bottom: 5rem;
}
a {
text-decoration: none;
&:hover {
.img {
height: 140px;
background-size: 120% auto;
}
.img-only {
height: 360px;
background-size: 110% auto;
background-position: top;
}
}
}
img {
width: 100%;
}
h3 {
margin-top: 0rem;
}
.img {
width: 100%;
height: 140px;
transition: all .3s ease-in-out;
background-position: center center;
background-size: 100% auto;
background-repeat: no-repeat;
}
.img-only {
width: 100%;
height: 360px;
transition: all .2s ease-in-out;
background-size: 100% auto;
background-position: top center;
background-repeat: no-repeat;
}
}

View File

@ -0,0 +1,16 @@
.two_lists {
display: flex;
flex-direction: column;
justify-content: space-between;
margin-left: auto;
margin-right: auto;
}
@media (min-width: 640px) {
.two_lists {
flex-direction: row;
.gen_list {
width: 48%;
}
}
}

View File

@ -1,91 +1,54 @@
.page-intro {
text-align: center;
a { text-decoration: underline; }
margin-top: 3rem;
margin-bottom: 1rem;
padding-right: 1.1rem;
font-size: 150%;
}
main {
flex-grow: 1;
overflow: auto;
.main {
width: 98vw;
margin-left: auto;
margin-right: auto;
}
.page-intro {
text-align: center;
a { text-decoration: underline; }
margin-top: 3rem;
margin-bottom: 1rem;
padding-right: 1.1rem;
font-size: 150%;
}
.gen_list {
.text {
}
.article_list {
margin-bottom: 5rem;
}
a {
text-decoration: none;
&:hover {
.img {
height: 140px;
background-size: 120% auto;
}
.img-only {
height: 360px;
background-size: 110% auto;
background-position: top;
}
}
}
img {
width: 100%;
}
h3 {
margin-top: 0rem;
}
.img {
width: 100%;
height: 140px;
transition: all .3s ease-in-out;
background-position: center center;
background-size: 100% auto;
background-repeat: no-repeat;
}
.img-only {
width: 100%;
height: 360px;
transition: all .2s ease-in-out;
background-size: 100% auto;
background-position: top center;
background-repeat: no-repeat;
}
}
width: 98vw;
margin-left: auto;
margin-right: auto;
min-height: 90vh;
}
@media (min-width: 600px) {
aside {
text-align: center;
}
.main_upper {
display: flex;
flex-direction: column;
}
@media (min-width: 640px) {
.main, .banner {
max-width: 640px;
.main {
margin-left: auto;
margin-right: auto;
aside {
text-align: right;
min-width: 25%;
}
.main_upper {
flex-direction: row;
justify-content: space-between;
}
}
}
@media (min-width: 768px) {
.main, .banner {
.main {
max-width: 768px;
margin-left: auto;
margin-right: auto;
}
.two_lists {
display: flex;
justify-content: space-between;
.gen_list {
width: 45%;
}
}
}
@media (min-width: 1024px) {
.main, .banner {
.main {
max-width: 1024px;
margin-left: auto;
margin-right: auto;
@ -93,7 +56,7 @@ main {
}
@media (min-width: 1280px) {
.main, .banner {
.main {
max-width: 1280px;
margin-left: auto;
margin-right: auto;
@ -101,7 +64,7 @@ main {
}
@media (min-width: 1920px) {
.main, .banner {
.main {
max-width: 1920px;
margin-left: auto;
margin-right: auto;

View File

@ -1,110 +0,0 @@
:root {
--max-width: 1024px; }
#container {
background: var(--background);
}
header {
position: fixed;
width: 100%;
max-width: var(--max-width);
background: var(--background);
}
.headerinner {
display: flex;
align-items: center;
justify-content: space-between;
flex-direction: row;
flex-wrap: wrap;
padding: .2rem;
padding-right: .7rem;
padding-bottom: .5rem;
a {
color: white;
margin-left: .8rem;
margin-top: .5rem;
text-shadow: 1px 2px 3px rgba(0, 0, 0, 1), 1px 2px 3px rgba(0, 0, 0, 1);
text-decoration: none;
}
img {
filter: drop-shadow(0px 3px 3px rgba(0, 0, 0, 1));
}
}
.banner {
padding-top: 6rem;
display: flex;
justify-content: center;
align-items: center;
/* Set a specific height */
height: 30vh;
/* Position and center the image to scale nicely on all screens */
background-position: top;
background-repeat: no-repeat;
background-size: auto 100vh;
background-attachment: fixed;
h1 {
color: white;
text-shadow: 0px 3px 32px rgba(0, 0, 0, 1), 0px 3px 32px rgba(0, 0, 0, 1);
font-size: 350%;
}
}
main {
display: flex;
padding-right: 1rem;
.content_intro {
text-align: center; margin-top: 3.5rem; margin-bottom: 3.5rem;
a { color: var(--text-bright); }
}
.index_section { padding: 1rem;
a { text-decoration: none; }
}
h3 {
margin-bottom: .5rem;
}
.articlemeta {
margin-bottom: .6rem;
&:first-child {
font-weight: bold;
}
}
.article_list_section {
margin-bottom: 6rem;
}
.articlecontent {
padding-left: .8rem;
}
.articletitle {
padding-left: .4rem;
font-size: 110%;
}
}
article, .article_footer {
padding-left: 1rem;
}
article {
margin-top: 1.5rem;
min-height: 33rem;
}
@media only screen and (min-width: 600px) {
main {
.content_intro {
font-size: 130%;
}
.index_lists {
display: flex; flex-wrap: wrap; justify-content: space-around;
.index_section { max-width: 42%; }
}
}
}

View File

@ -10,7 +10,10 @@
{{ partial "snippets/banner" . -}}
<div class="main">
{{ block "content" . -}}{{- end }}
<div class="main_upper">
{{ block "add_content" . -}}{{- end }}
{{ block "sidebar" . -}}{{- end }}
</div>
{{ block "pagefooter" . -}}{{- end }}
</div>
<footer class="footer">

View File

@ -11,6 +11,13 @@
{{ end }}
{{ define "content" }}
{{ if ne .Content "" }}
{{ partial "snippets/content" (dict "content" .Content) }}
{{ end }}
{{ end }}
{{ define "add_content" }}
{{- $pages := where .Site.RegularPages "Permalink" "!=" .Permalink -}}
{{- $paginator := "" -}}
{{- $partial := .Layout -}}
@ -39,7 +46,6 @@
{{ end }}
{{ $partial = string (printf "layout/%s" $partial) }}
{{ partial $partial (dict "context" . "pages" $pages "content" .Content "type" .Type "paginate" $paginate) }}
{{ end }}
@ -59,7 +65,7 @@
{{ end }}
</aside>
{{ end }}
{{ else if eq .Section "events" }}
{{ else if or (eq .Section "events") (eq .Section "recurrent") }}
{{ if gt .Site.Taxonomies.events 0 }}
<aside class="sidebar">

View File

@ -2,7 +2,7 @@
<h1>{{ if (i18n .Title (dict "Count" 0))}}{{ i18n .Title (dict "Count" 0) }}{{ else }}{{ .Title }}{{ end }}</h1>
{{ end }}
{{ define "content" }}
{{ define "add_content" }}
{{ $partial_before := "" }}
{{ $partial := "layout/article" }}
{{ $pic := "true" }}
@ -25,14 +25,15 @@
{{ define "sidebar" }}
{{ if ne .Type "tools" }}
<aside class="sidebar">
{{ if .Params.categories }}
{{ if or .Params.categories .Params.events }}
<h3 class="align_menu">{{ if i18n "categories" }}{{ i18n "categories" }}{{ else }}{{ "Categories" }}{{ end }}</h3>
{{ end }}
{{ if .Params.categories }}
{{ range .Params.categories }}
<div class="align_menu"><a href="{{ "/categories/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></div>
{{ end }}
{{ end }}
{{ if .Params.events }}
<h3 class="align_menu">{{ if i18n "categories" }}{{ i18n "categories" }}{{ else }}{{ "Categories" }}{{ end }}</h3>
{{ range .Params.events }}
<div class="align_menu"><a href="{{ "/events/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></div>
{{ end }}
@ -61,7 +62,7 @@
<div class="article_footer">
{{ with .Params.foundations }}
<b>Träger der Veranstaltung:</b>
<div class="article_footer_foundations1">
<div class="foundations">
{{ range . }}
{{ $l := . }}
{{ $url := "" }}
@ -72,24 +73,24 @@
{{- $res_im := resources.GetMatch (printf "/images/foundations/%s*" $l ) -}}
{{ if $res_im }}
<div class="article_footer_item1">
<div class="foundations_item">
{{ if $url }}<a href="{{ $url | safeHTML }}">{{ end }}<img src="{{- $res_im.Permalink -}}" class="borderrad4px article_footer_item1" /> {{ if $url }}</a>{{ end }}
</div>
{{ else }}
<div class="article_footer_item1">
<div class="foundations_item">
assets/images/foundations/{{- $l -}} .* missing
</div>
{{ end }}
{{ end }}
</div>
{{ end }}
<div class="article_footer_foundations2">
<div class="article_footer_item2">
<div class="mod_times">
<div class="mod_times_item">
<b>{{ if i18n "created" }}{{ i18n "created" }}{{ else }}{{ "Created" }}{{ end }}</b>
{{ .Date | time.Format ":date_full" }}
</div>
{{ if ne .Date .Lastmod }}
<div class="article_footer_item2">
<div class="mod_times_item">
<b>{{ if i18n "lastmod" }}{{ i18n "lastmod" }}{{ else }}{{ "Last modification" }}{{ end }}</b>
{{ .Lastmod | time.Format ":date_full" }}
</div>

View File

@ -1,4 +1,12 @@
{{ define "content" }}
{{ if ne .Content "" }}
{{ partial "snippets/content" (dict "content" .Content) }}
{{ end }}
{{ end }}
{{ define "add_content" }}
{{- $all := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections }}
{{ $days := int (mul (mul (int .Site.Params.featured_expire) 7) -1) }}
@ -18,16 +26,13 @@
{{ if i18n $feat }}
{{ $feat = i18n $feat }}
{{ end }}
{{ if ne .Content "" }}
{{ partial "snippets/content" (dict "content" .Content) }}
{{ end }}
<div class="two_lists">
{{ partial "layout/gen_list" (dict "context" . "pages" $featured "title" $feat )}}
{{ partial "layout/gen_list" (dict "context" . "pages" $posts "title" $news "limit" "5" )}}
</div>
{{ end }}
{{ define "sidebar" }}
{{ "" }}
{{ end }}

View File

@ -21,7 +21,7 @@
{{ partial "snippets/article_metadata" $metas }}
{{- if .context.Content -}}
<div class="article_content minheight">{{- .context.Content -}}</div>
<div class="article_content">{{- .context.Content -}}</div>
{{ end }}

View File

@ -11,9 +11,7 @@
{{ $p = $paginator.Pages }}
{{ end }}
{{ if or .content (and (.paginate) (.content) (eq $paginator.PageNumber 1)) }}
{{ partial "snippets/content" (dict "content" .context.Content) }}
{{ end }}
{{ if $p }}
<div class="gen_list">

View File

@ -1,7 +1,5 @@
<section>
{{ $type := .type }}
{{ range .pages }}
<a href="{{ .Page.Permalink }}" style="margin-right: 1rem;">{{ .Page.Title }} {{ if eq $type "tags"}}{{ .Count }}{{ end }}</a>
{{ end }}
</section>

View File

@ -59,5 +59,5 @@
{{ end }}
</div>
{{ else }}
<div class="banner"><h1>{{ $title }}</h1></div>
<div class="banner"><h1>{{ $title }}</h1><p>assets/images/banner/{{ $what -}}.* missing..</div>
{{ end }}

View File

@ -8,11 +8,14 @@
{{ $font := resources.Get "scss/font.scss" | resources.ToCSS }}
{{ $header := resources.Get "scss/header.scss" | resources.ToCSS }}
{{ $banner := resources.Get "scss/banner.scss" | resources.ToCSS }}
{{ $index := resources.Get "scss/index.scss" | resources.ToCSS }}
{{ $gen_list := resources.Get "scss/gen_list.scss" | resources.ToCSS }}
{{ $main := resources.Get "scss/main.scss" | resources.ToCSS }}
{{ $article := resources.Get "scss/article.scss" | resources.ToCSS }}
{{ $pagination := resources.Get "scss/pagination.scss" | resources.ToCSS }}
{{ $footer := resources.Get "scss/footer.scss" | resources.ToCSS }}
{{ $generator := resources.Get "scss/generator.scss" | resources.ToCSS }}
{{ $allcss := slice $water $font $container $header $banner $main $pagination $footer $generator | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }}
{{ $allcss := slice $water $font $container $header $banner $index $gen_list $main $article $pagination $footer $generator | resources.Concat "/css/vendor.css" | minify | fingerprint "sha512" }}
<link rel="stylesheet" href="{{ $allcss.RelPermalink }}" integrity="{{ $allcss.Data.Integrity }}">
<link rel="stylesheet" href="/css/visibleIf.css" type="text/css" />

View File

@ -32,21 +32,25 @@ function button(x) {
const id = document.getElementById('content');
if (x == "url") {
let url = prompt("Please enter URL", "https://wikipedia.org");
let desc = prompt("Description", "The free Encyclopedia");
var out = "[" + desc + "](" + url + ") ";
if (url != null) {
let desc = prompt("Description", "The free Encyclopedia");
if (desc != null) {var out = "[" + desc + "](" + url + ") ";}
}
}
if (x == "headline") {
let headline = prompt("Headline", "Act One");
var out = "## " + headline + "\n\n";
if (headline != null) {var out = "## " + headline + "\n\n";}
}
if (x == "pic") {
let desc = prompt("Description", "Wikipedia logo");
let pic = prompt("Please enter URL or Number", "https://www.wikipedia.org/portal/wikipedia.org/assets/img/Wikipedia-logo-v2.png");
var out = "![" + desc + "](" + pic + ") ";
if (desc != null) {
let pic = prompt("Please enter URL or Number", "https://www.wikipedia.org/portal/wikipedia.org/assets/img/Wikipedia-logo-v2.png");
if (pic != null) {var out = "![" + desc + "](" + pic + ") ";}
}
}
if (x == "bold") {
let bold = prompt("Bold", "");
var out = "\*\*" + bold + "\*\* ";
if (bold != null) {var out = "\*\*" + bold + "\*\* ";}
}
if (x == "paragraph") {
var out = "\n\n";