From a5713514f4427d999a5cad6e4b21adc8a0b721cd Mon Sep 17 00:00:00 2001
From: bb1950328 <bb1950328@gmail.com>
Date: Sun, 24 Jan 2021 16:19:15 +0000
Subject: [PATCH] Display link to source code repo as image if params.source.iconLight is specified dont use hardcoded "images/" prefix in params.logo.lightMode and .darkMode
---
exampleSite/config.toml | 7 ++++---
assets/sass/_nav.sass | 3 +++
layouts/partials/nav.html | 21 +++++++++++++++++----
exampleSite/static/images/GitHubMarkLight.svg | 3 +++
exampleSite/static/images/GitHubMarkDark.svg | 3 +++
5 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/assets/sass/_nav.sass b/assets/sass/_nav.sass
index 8c6a008..bc239d3 100644
--- a/assets/sass/_nav.sass
+++ b/assets/sass/_nav.sass
@@ -62,3 +62,6 @@
.search
@media screen and (min-width: 992px)
margin-right: 1.5rem
+ &_repo
+ picture, img
+ max-width: 2rem
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 008404f..4816e81 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -59,12 +59,13 @@
# Site logo
[params.logo]
- lightMode = "compose.svg"
- darkMode = "compose-light.svg"
+ lightMode = "images/compose.svg"
+ darkMode = "images/compose-light.svg"
[params.source]
name = "GitHub"
- icon = "github.svg"
+ iconLight = "images/GitHubMarkLight.svg"
+ iconDark = "images/GitHubMarkDark.svg"
url = "https://github.com/onweru/compose/"
# optional
diff --git a/exampleSite/static/images/GitHubMarkDark.svg b/exampleSite/static/images/GitHubMarkDark.svg
new file mode 100644
index 0000000..68a6943
--- /dev/null
+++ b/exampleSite/static/images/GitHubMarkDark.svg
@@ -0,0 +1,3 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" transform="scale(64)" fill="#FFF"/>
+</svg>
\ No newline at end of file
diff --git a/exampleSite/static/images/GitHubMarkLight.svg b/exampleSite/static/images/GitHubMarkLight.svg
new file mode 100644
index 0000000..93af7db
--- /dev/null
+++ b/exampleSite/static/images/GitHubMarkLight.svg
@@ -0,0 +1,3 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z" transform="scale(64)" fill="#1B1F23"/>
+</svg>
\ No newline at end of file
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index d37133c..238d98a 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -3,8 +3,8 @@
<nav class="wrap nav menu">
<a href="{{ $s.BaseURL }}" class="nav_brand">
{{- $logos := $sp.logo }}
- {{- $litPath := absURL (printf "images/%s" $logos.lightMode) }}
- {{- $darkPath := absURL (printf "images/%s" $logos.darkMode) }}
+ {{- $litPath := absURL ($logos.lightMode) }}
+ {{- $darkPath := absURL ($logos.darkMode) }}
<picture data-lit="{{ $litPath }}" data-dark="{{ $darkPath }}">
{{ with $sp.enableDarkMode }}
<source srcset = '{{ $darkPath }}' media="(prefers-color-scheme: dark)">
@@ -34,8 +34,21 @@
</li>
{{- end }}
{{ $repo := $sp.source }}
- <li class="nav-item">
- <a class="nav-link" href="{{ $repo.url }}" target="_blank">{{ $repo.name }}</a>
+ <li class="nav-item nav_repo">
+ <a class="nav-link" href="{{ $repo.url }}" target="_blank">
+ {{ if $repo.iconLight }}
+ {{- $litPath := absURL ($repo.iconLight) }}
+ {{- $darkPath := absURL ($repo.iconDark) }}
+ <picture data-lit="{{ $litPath }}" data-dark="{{ $darkPath }}">
+ {{ with $sp.enableDarkMode }}
+ <source srcset = '{{ $darkPath }}' media="(prefers-color-scheme: dark)">
+ {{ end }}
+ <img srcset = '{{ $litPath }}' alt = '{{ $repo.name }} Repo'>
+ </picture>
+ {{ else }}
+ {{ $repo.name }}
+ {{ end }}
+ </a>
</li>
<li class="nav-item">{{ partial "mode" . }}</li>
</ul>
--
Gitblit v1.10.0