Skip to content

Commit d8416ee

Browse files
authored
Revert "✨ Feat: logo alt and remove logo JS"
1 parent a7731a1 commit d8416ee

3 files changed

Lines changed: 51 additions & 44 deletions

File tree

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ layouts/_default/index.json
3030
layouts/shortcodes/screenshot.html
3131
layouts/shortcodes/figure.html
3232
layouts/partials/hugo-embedded/shortcodes/figure-default.html
33+
34+
assets/js/appearance.js

assets/js/appearance.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,41 @@ window.addEventListener("DOMContentLoaded", (event) => {
9696
}
9797
});
9898

99+
99100
var updateMeta = () => {
100101
var elem, style;
101102
elem = document.querySelector('body');
102103
style = getComputedStyle(elem);
103104
document.querySelector('meta[name="theme-color"]').setAttribute('content', style.backgroundColor);
104105
}
105106

107+
{{ if and (.Site.Params.Logo) (.Site.Params.SecondaryLogo) }}
108+
{{ $primaryLogo := resources.Get .Site.Params.Logo }}
109+
{{ $secondaryLogo := resources.Get .Site.Params.SecondaryLogo }}
110+
{{ if and ($primaryLogo) ($secondaryLogo) }}
111+
var updateLogo = (targetAppearance) => {
112+
var imgElems = document.querySelectorAll("img.logo");
113+
var logoContainers = document.querySelectorAll("span.logo");
114+
115+
targetLogoPath =
116+
targetAppearance == "{{ .Site.Params.DefaultAppearance }}" ?
117+
"{{ $primaryLogo.RelPermalink }}" : "{{ $secondaryLogo.RelPermalink }}"
118+
for (const elem of imgElems) {
119+
elem.setAttribute("src", targetLogoPath)
120+
}
121+
122+
{{ if eq $primaryLogo.MediaType.SubType "svg" }}
123+
targetContent =
124+
targetAppearance == "{{ .Site.Params.DefaultAppearance }}" ?
125+
`{{ $primaryLogo.Content | safeHTML }}` : `{{ $secondaryLogo.Content | safeHTML }}`
126+
for (const container of logoContainers) {
127+
container.innerHTML = targetContent;
128+
}
129+
{{ end }}
130+
}
131+
{{ end }}
132+
{{- end }}
133+
106134
var getTargetAppearance = () => {
107135
return document.documentElement.classList.contains("dark") ? "dark" : "light"
108136
}

layouts/partials/header/basic.html

Lines changed: 21 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,26 @@
11
<div class="main-menu flex items-center w-full gap-2 p-1 pl-0">
2-
{{ $primary := resources.Get .Site.Params.Logo }}
3-
{{ $secondary := resources.Get .Site.Params.SecondaryLogo }}
4-
5-
{{ if or $primary $secondary }}
6-
<div>
7-
<a href="{{ "" | relLangURL }}" class="flex">
8-
<span class="sr-only">{{ .Site.Title | markdownify }}</span>
9-
10-
{{ if $primary }}
11-
<div class="{{ cond $secondary "block dark:hidden" "" }}">
12-
{{- if eq $primary.MediaType.SubType "svg" -}}
13-
<span class="logo object-scale-down object-left nozoom">
14-
{{ $primary.Content | safeHTML }}
15-
</span>
16-
{{ else }}
17-
<img
18-
src="{{ $primary.RelPermalink }}"
19-
width="{{ div $primary.Width 2 }}"
20-
height="{{ div $primary.Height 2 }}"
21-
class="logo max-h-20 max-w-20 object-scale-down object-left nozoom"
22-
alt="Site logo">
23-
{{ end }}
24-
</div>
25-
{{ end }}
26-
27-
{{ if $secondary }}
28-
<div class="hidden dark:block">
29-
{{ if eq $secondary.MediaType.SubType "svg" }}
30-
<span class="logo object-scale-down object-left nozoom">
31-
{{ $secondary.Content | safeHTML }}
32-
</span>
33-
{{ else }}
34-
<img
35-
src="{{ $secondary.RelPermalink }}"
36-
width="{{ div $secondary.Width 2 }}"
37-
height="{{ div $secondary.Height 2 }}"
38-
class="logo max-h-20 max-w-20 object-scale-down object-left nozoom"
39-
alt="Site logo (dark mode)">
40-
{{ end }}
41-
</div>
42-
{{ end }}
43-
</a>
44-
</div>
2+
{{ if .Site.Params.Logo }}
3+
{{ $logo := resources.Get .Site.Params.Logo }}
4+
{{ if $logo }}
5+
<div>
6+
<a href="{{ "" | relLangURL }}" class="flex">
7+
<span class="sr-only">{{ .Site.Title | markdownify }}</span>
8+
{{ if eq $logo.MediaType.SubType "svg" }}
9+
<span class="logo object-scale-down object-left nozoom">
10+
{{ $logo.Content | safeHTML }}
11+
</span>
12+
{{ else }}
13+
<img
14+
src="{{ $logo.RelPermalink }}"
15+
width="{{ div $logo.Width 2 }}"
16+
height="{{ div $logo.Height 2 }}"
17+
class="logo max-h-20 max-w-20 object-scale-down object-left nozoom"
18+
alt="">
19+
{{ end }}
20+
</a>
21+
</div>
22+
{{ end }}
4523
{{ end }}
46-
4724
{{ if not .Site.Params.disableTextInHeader | default true }}
4825
<a href="{{ "" | relLangURL }}" class="text-base font-medium truncate min-w-0 shrink">
4926
{{ .Site.Title | markdownify }}

0 commit comments

Comments
 (0)