From 7602d2ed714c89563094cc5580bf3cd75519d8c5 Mon Sep 17 00:00:00 2001
From: Alexander Bilz <mail@alexbilz.com>
Date: Sat, 25 Dec 2021 19:36:25 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
.gitignore | 4 +++-
layouts/partials/navbar.html | 2 +-
assets/css/style.css | 23 +++++------------------
layouts/partials/head.html | 2 +-
4 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index 52b6c7d..04e51e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
demo/
.hugo/*
!.hugo/version
-/node_modules
\ No newline at end of file
+.hugo_build.lock
+/node_modules
+.devcontainer
diff --git a/assets/css/style.css b/assets/css/style.css
index 3f32b0b..c0c8ddb 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -285,15 +285,10 @@
padding-right: 20px;
}
-.sl-nav a:hover {
+.sl-nav li label {
cursor: pointer;
}
-.sl-nav li {
- cursor: pointer;
- padding-bottom: 10px;
-}
-
.sl-nav li .dropdown {
display: none;
position: absolute;
@@ -316,17 +311,13 @@
position: relative;
text-align: left;
background: transparent;
- padding: 15px 15px;
- padding-bottom: 0;
+ padding: 12px;
z-index: 2;
color: #3c3c3c;
display: block;
}
-.sl-nav li .dropdown li:last-of-type {
- padding-bottom: 15px;
-}
+
.sl-nav li .dropdown li span {
- font-size: 1.3rem;
white-space: nowrap;
}
.sl-nav li .dropdown li span.active {
@@ -1288,7 +1279,7 @@
position: relative;
text-transform: uppercase;
text-align: center;
- font-size: 1.3em;
+ font-size: 1.6rem;
}
header .nav__list ul {
@@ -1379,16 +1370,12 @@
.sl-nav li .dropdown li {
text-align: center;
- padding: initial;
+ padding: 0.5rem 0.75rem;
}
.sl-nav li .dropdown li span {
padding-left: initial;
}
-
- .sl-nav li label {
- font-size: 0.75em;
- }
}
/* Medium zoom */
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 11a6794..524051b 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -116,7 +116,7 @@
<link rel="icon" type="image/png" sizes="32x32" href="{{ .Site.Params.favicon | relURL }}favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="{{ .Site.Params.favicon | relURL }}favicon-16x16.png" />
- <link rel="canonical" href="{{ .RelPermalink }}" />
+ <link rel="canonical" href="{{ .Permalink }}" />
<!-- RSS -->
{{ with .OutputFormats.Get "rss" -}}
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 0c465d3..6e0f482 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -42,7 +42,7 @@
<ul class="sl-nav" aria-label="Language switcher">
<li>
<input type="checkbox" id="languagepicker" aria-label="switch language" hidden />
- <label for="languagepicker"><a>{{ .Site.Language.LanguageName }}</a></label>
+ <label for="languagepicker">{{ .Site.Language.LanguageName }}</label>
<label for="languagepicker"><i class="fa fa-angle-down" aria-hidden="true"></i></label>
<div class="triangle"></div>
--
Gitblit v1.10.0