Merge branch 'master' into pr/45
This commit is contained in:
zjedi
commit
b8fdafcc14
176 changed files with 10740 additions and 8110 deletions
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html lang="{{ .Site.Language.Lang }}">
|
||||
{{- partial "head.html" . -}}
|
||||
<body>
|
||||
{{- partial "header.html" . -}}
|
||||
|
|
@ -7,14 +7,16 @@
|
|||
{{- partial "footer.html" . -}}
|
||||
|
||||
<!-- We do need jQuery to be loaded before HugoScroll script -->
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="https://code.jquery.com/jquery-1.11.3.min.js"
|
||||
></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 -->
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -2,19 +2,24 @@
|
|||
{{ $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_headline }}<h1 class="blog-title">{{ . }}</h1>{{ end }}
|
||||
{{ with .Params.header_logo }}<img id="blog-logo" src="{{ . }}" />{{ 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 }}
|
||||
{{ $button_title := .Title }}
|
||||
{{ with .Params.header_menu_title }}
|
||||
{{ $button_title = . }}
|
||||
{{ end }}
|
||||
{{ with .Params.header_menu_title }}{{ $button_title = . }}{{ end }}
|
||||
{{ if isset .Params "external" }}
|
||||
<a class='btn site-menu' href='{{ .Params.external }}'>{{ $button_title }} <icon class="fa fa-external-link"></icon></a>
|
||||
{{ else }}
|
||||
<a class='btn site-menu' data-title-anchor='{{ anchorize .Title }}'>{{ $button_title }}</a>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
<i id='header-arrow' class="fa fa-angle-down"></i>
|
||||
</div>
|
||||
|
|
@ -24,11 +29,9 @@
|
|||
|
||||
<div class='fixed-nav'>
|
||||
</div>
|
||||
{{ range $index_val, $elem_val := $sections }}
|
||||
{{ range $index_val, $elem_val := $filtered }}
|
||||
{{ $fnav_title := .Title }}
|
||||
{{ with .Params.navigation_menu_title }}
|
||||
{{ $fnav_title = . }}
|
||||
{{ end }}
|
||||
{{ with .Params.navigation_menu_title }}{{ $fnav_title = . }}{{ end }}
|
||||
<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">
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@
|
|||
<section>{{ echoParam .Site.Params "hidebyline" }}</section>
|
||||
{{ if ne .Site.Params.hidedesignbyline true }}
|
||||
<section>
|
||||
<a href="https://themes.gohugo.io/hugo-scroll/">Design</a> template
|
||||
built with ♥️ by
|
||||
<a href="https://www.janraasch.com" title="Jan Raasch">Jan Raasch</a>
|
||||
<a href="https://themes.gohugo.io/hugo-scroll/">Hugo Scroll</a> template
|
||||
</section>{{ end }}
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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,22 +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
|
||||
href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,300italic,700"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css?family=Oswald:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800|Roboto+Slab:400,100,300,700"
|
||||
rel="stylesheet"
|
||||
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" . }}
|
||||
|
|
|
|||
1
layouts/shortcodes/extlink.html
Normal file
1
layouts/shortcodes/extlink.html
Normal file
|
|
@ -0,0 +1 @@
|
|||
{{ with .Get "href" }}<a href="{{ . }}" target="_blank">{{ end }}{{ with .Get "text" }}{{ . }}</a>{{ end }}
|
||||
2
layouts/shortcodes/rawhtml.html
Normal file
2
layouts/shortcodes/rawhtml.html
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
<!-- raw html -->
|
||||
{{.Inner}}
|
||||
Loading…
Add table
Add a link
Reference in a new issue