Merge remote-tracking branch 'origin/master' into pr/73

# Conflicts:
#	layouts/index.html
This commit is contained in:
zjedi 2023-03-14 18:20:04 +01:00
commit 0e17f0b7b7
72 changed files with 3481 additions and 8059 deletions

View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="{{ .Site.Language.Lang }}">
{{- partial "head.html" . -}}
<body>
{{- partial "header.html" . -}}
@ -7,11 +7,16 @@
{{- partial "footer.html" . -}}
<!-- We do need jQuery to be loaded before HugoScroll script -->
<script type="text/javascript" src='{{ "js/jquery-3.6.0.min.js" | absURL }}'></script>
{{ $scriptJquery := resources.Get "js/jquery-3.6.3.min.js" }}
<!-- The main JavaScript files for HugoScroll -->
<script type="text/javascript" src='{{ "js/icons.js" | absURL }}'></script>
<script type="text/javascript" src='{{ "js/index.js" |absURL }}'></script>
{{ $scriptIcons := resources.Get "js/icons.js" }}
{{ $scriptIndex := resources.Get "js/index.js" }}
{{ $js := slice $scriptJquery $scriptIcons $scriptIndex | resources.Concat "js/script.js" | resources.Minify | resources.Fingerprint }}
<script src="{{ $js.Permalink }}" integrity="{{ $js.Data.Integrity }}" ></script>
<!-- A partial to be overwritten by the user.
Simply place a custom_body.html into
your local /layouts/partials-directory -->

View file

@ -1,10 +1,8 @@
{{ define "main" }}
<main class="content page-template page-{{ .Slug }}" role="main">
<main class="content page-template page-{{ .Slug }}">
<article class="post page">
<header class="post-header">
<a id="blog-logo" href="{{ "/" | relURL }}">
{{ .Site.Title }}
</a>
<a id="blog-logo" href="{{ "/" | relURL }}"><i class="fa fa-chevron-left" aria-hidden="true"></i> {{ .Site.Title }}</a>
</header>
<h1 class="post-title">{{ .Title }}</h1>
<section class="post-content">

View file

@ -2,15 +2,22 @@
{{ $headless := .Site.GetPage "/homepage" }}
{{ $sections := $headless.Resources.ByType "page" }}
{{ $sections := cond .Site.BuildDrafts $sections (where $sections "Draft" "==" false) }}
{{ $filtered := where $sections "Params.external" "==" nil }}
<header id="site-head" {{ with .Params.header_image }}style="background-image: url({{ . }})"{{ end }}>
<div class="vertical">
<div id="site-head-content" class="inner">
{{ with .Params.header_logo }}<img class="blog-logo" src="{{ . }}" />{{ end }}
{{ with .Params.header_headline }}<h1 class="blog-title">{{ . }}</h1>{{ end }}
{{ if .Site.Params.title_guard }}<div class="title-and-description-guard">{{ end }}
{{ with .Params.header_headline }}<h1 class="blog-title">{{ . | safeHTML }}</h1>{{ end }}
{{ with .Params.header_subheadline }}<h2 class="blog-description">{{ . }}</h2>{{ end }}
{{ if .Site.Params.title_guard }}</div>{{ end }}
{{ range where $sections ".Params.header_menu" "eq" true }}
{{ if isset .Params "external" }}
<a class='btn site-menu' href='{{ .Params.external }}'>{{ .Title }} <icon class="fa fa-external-link"></icon></a>
{{ else }}
<a class='btn site-menu' data-title-anchor='{{ anchorize .Title }}'>{{ .Title }}</a>
{{ end }}
{{ end }}
<i id='header-arrow' class="fa fa-angle-down"></i>
</div>
@ -20,7 +27,7 @@
<div class='fixed-nav'>
</div>
{{ range $index_val, $elem_val := $sections }}
{{ range $index_val, $elem_val := $filtered }}
<div class='post-holder'>
<article id='{{ anchorize .Title }}' class='post {{ if eq $index_val 0 }}first{{ end }} {{ if eq (add $index_val 1) (len $sections) }}last{{ end }}'>
<header class="post-header">

View file

@ -1,4 +1,4 @@
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>{{ with .Title }}{{ . }}{{ else }}{{ .Site.Title }}{{ end }}</title>
@ -19,13 +19,13 @@
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="{{ "css/screen.css" | absURL }}" />
<link rel="stylesheet" href="{{ "css/fonts.css" | absURL }}" type="text/css" />
<link
rel="stylesheet"
href="{{ "fork-awesome/css/fork-awesome.min.css" | absURL }}"
type="text/css"
/>
{{ $stylesheetFA := resources.Get "css/fork-awesome.css" }}
{{ $stylesheetNormalize := resources.Get "css/normalize.css" }}
{{ $stylesheetFonts := resources.Get "css/fonts.css" }}
{{ $stylesheetScreen := resources.Get "css/screen.css" }}
{{ $stylesheet := slice $stylesheetNormalize $stylesheetFA $stylesheetFonts $stylesheetScreen | resources.Concat "css/style.css" | resources.Minify | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $stylesheet.Permalink }}" type="text/css" integrity="{{ $stylesheet.Data.Integrity }}" />
{{ template "_internal/opengraph.html" . }}
{{ template "_internal/twitter_cards.html" . }}

View file

@ -0,0 +1 @@
{{ with .Get "href" }}<a href="{{ . }}" target="_blank">{{ end }}{{ with .Get "text" }}{{ . }}</a>{{ end }}

View file

@ -0,0 +1,2 @@
<!-- raw html -->
{{.Inner}}