Merge branch 'master' into pr/81

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Deploy to GitHub Pages
         if: github.event_name == 'push'
-        uses: peaceiris/actions-gh-pages@v3.8.0
+        uses: peaceiris/actions-gh-pages@v3.9.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./public

assets/css/fonts.css

@@ -20,6 +20,7 @@
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 300;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-300.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -34,6 +35,7 @@
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-regular.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -48,6 +50,7 @@
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 600;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-600.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -62,6 +65,7 @@
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 700;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-700.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -76,6 +80,7 @@
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 800;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-800.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -90,6 +95,7 @@
   font-family: 'Open Sans';
   font-style: italic;
   font-weight: 300;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-300italic.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-300italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -104,6 +110,7 @@
   font-family: 'Open Sans';
   font-style: italic;
   font-weight: 400;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-italic.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -118,6 +125,7 @@
   font-family: 'Open Sans';
   font-style: italic;
   font-weight: 600;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-600italic.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-600italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -132,6 +140,7 @@
   font-family: 'Open Sans';
   font-style: italic;
   font-weight: 700;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-700italic.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -146,6 +155,7 @@
   font-family: 'Open Sans';
   font-style: italic;
   font-weight: 800;
+  font-display: swap;
   src: url('../fonts/open-sans-v27-latin-800italic.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-v27-latin-800italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -164,6 +174,7 @@
   font-family: 'Open Sans Condensed';
   font-style: normal;
   font-weight: 300;
+  font-display: swap;
   src: url('../fonts/open-sans-condensed-v21-latin-300.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-condensed-v21-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -177,6 +188,7 @@
 @font-face {
   font-family: 'Open Sans Condensed';
   font-style: italic;
+  font-display: swap;
   font-weight: 300;
   src: url('../fonts/open-sans-condensed-v21-latin-300italic.eot'); /* IE9 Compat Modes */
   src: local(''),
@@ -192,6 +204,7 @@
   font-family: 'Open Sans Condensed';
   font-style: normal;
   font-weight: 700;
+  font-display: swap;
   src: url('../fonts/open-sans-condensed-v21-latin-700.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/open-sans-condensed-v21-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -210,6 +223,7 @@
   font-family: 'Oswald';
   font-style: normal;
   font-weight: 300;
+  font-display: swap;
   src: url('../fonts/oswald-v40-latin-300.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/oswald-v40-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -224,6 +238,7 @@
   font-family: 'Oswald';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src: url('../fonts/oswald-v40-latin-regular.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/oswald-v40-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -238,6 +253,7 @@
   font-family: 'Oswald';
   font-style: normal;
   font-weight: 700;
+  font-display: swap;
   src: url('../fonts/oswald-v40-latin-700.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/oswald-v40-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -256,6 +272,7 @@
   font-family: 'Roboto Slab';
   font-style: normal;
   font-weight: 100;
+  font-display: swap;
   src: url('../fonts/roboto-slab-v16-latin-100.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/roboto-slab-v16-latin-100.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -270,6 +287,7 @@
   font-family: 'Roboto Slab';
   font-style: normal;
   font-weight: 300;
+  font-display: swap;
   src: url('../fonts/roboto-slab-v16-latin-300.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/roboto-slab-v16-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -284,6 +302,7 @@
   font-family: 'Roboto Slab';
   font-style: normal;
   font-weight: 400;
+  font-display: swap;
   src: url('../fonts/roboto-slab-v16-latin-regular.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/roboto-slab-v16-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
@@ -298,6 +317,7 @@
   font-family: 'Roboto Slab';
   font-style: normal;
   font-weight: 700;
+  font-display: swap;
   src: url('../fonts/roboto-slab-v16-latin-700.eot'); /* IE9 Compat Modes */
   src: local(''),
        url('../fonts/roboto-slab-v16-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */

assets/css/screen.css

@@ -414,11 +414,9 @@ table tbody > tr:nth-child(odd) > th {
   background-color: #f6f6f6;
 }
 
-table.plain {
+table.plain tbody > tr:nth-child(odd) > td,
-  tbody > tr:nth-child(odd) > td,
+table.plain tbody > tr:nth-child(odd) > th {
-  tbody > tr:nth-child(odd) > th {
     background: transparent;
-  }
 }
 
 li {

layouts/_default/single.html

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

layouts/index.html

@@ -2,6 +2,8 @@
 {{ $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">
@@ -10,8 +12,12 @@
             {{ with .Params.header_subheadline }}<h2 class="blog-description">{{ . }}</h2>{{ end }}
 
             {{ range where $sections ".Params.header_menu" "eq" true }}
+	      {{ if isset .Params "external" }}
+	         <a class='btn site-menu' href='{{ .Params.external  }}'>{{ .Title }}</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>
     </div>
@@ -20,7 +26,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">

layouts/shortcodes/extlink.html

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

package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "prettier": {
-      "version": "2.7.1",
+      "version": "2.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
       "dev": true
     },
     "prettier-plugin-go-template": {

package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/janraasch/hugo-scroll#readme",
   "devDependencies": {
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.4",
     "prettier-plugin-go-template": "0.0.13"
   }
 }