Skip to content

Various improvements to speed and a11y #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lunarequest wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Various improvements to speed and a11y #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
deee0f6
preload fonts
Lunarequest Feb 23, 2023
d68fe9e
use rel=me for mastodon in socials
Lunarequest Feb 23, 2023
88b56ae
preload fontawesome
Lunarequest Feb 23, 2023
34088be
add support for aria-label for social inks
Lunarequest Feb 23, 2023
97478e6
use crossOrigin
Lunarequest Feb 23, 2023
e9b2dce
set mimetype
Lunarequest Feb 23, 2023
0b5c57e
use fontawesome's kits. they are just smaller and better
Lunarequest Feb 24, 2023
e1dce1c
aria_labels!
Lunarequest Feb 24, 2023
b058926
defer fontawesome
Lunarequest Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<!DOCTYPE html>
<html lang="{{ .Site.LanguageCode }}">
<head>
{{ partial "head.html" . }}
</head>
<body>
{{ partial "header.html" . }}
{{ block "main" . }}{{ end }}
{{ partial "footer.html" . }}
</body>
</html>

<head>
{{ partial "head.html" . }}
</head>

<body>
{{ partial "header.html" . }}
{{ block "main" . }}{{ end }}
{{ partial "footer.html" . }}
<script defer src="{{ .Site.Params.fontawesomeurl }}" crossorigin="anonymous"></script>
</body>

</html>
63 changes: 24 additions & 39 deletions layouts/partials/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,36 @@
<meta charset="utf-8" />
<title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ .Title }}{{ end }}</title>
<meta name="description"
content="{{ if .Params.Description }}
<meta name="description" content="{{ if .Params.Description }}
{{- .Params.Description -}}
{{else if .Site.Params.Description}}
{{- .Site.Params.Description -}}
{{ end }}"
>
{{ end }}">
{{- with .Site.Author.Name }}
<meta name="author" content="{{ . }}" />
<meta name="author" content="{{ . }}" />
{{- end }}
{{ partial "analytics.html" . }}
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link
rel="alternate"
type="application/rss+xml"
href="{{ .Site.BaseURL }}index.xml"
title="{{ .Site.Title }}"
/>
<link rel="alternate" type="application/rss+xml" href="{{ .Site.BaseURL }}index.xml" title="{{ .Site.Title }}" />
{{ template "_internal/twitter_cards.html" . }}
{{ if isset .Site.Taxonomies "series" }}
{{ template "_internal/opengraph.html" . }}
{{ template "_internal/opengraph.html" . }}
{{ end }}
<!-- Stylesheets -->
<link rel="stylesheet" href="{{ .Site.BaseURL }}fontawesome/css/all.min.css" />


{{ $main := resources.Get "css/main.css" }}
{{ $syntax := resources.Get "css/syntax.css" }}
{{ $styles := (slice $main $syntax) | resources.Concat "css/styles.css" | minify }}
<link
crossorigin="anonymous"
href="{{ $styles.RelPermalink }}"
integrity="{{ $styles.Data.Integrity }}"
rel="preload stylesheet"
as="style"
/>
<link crossorigin="anonymous" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Integrity }}"
rel="preload stylesheet" as="style" />

{{ range .Site.Params.customCSS }}
<link rel="stylesheet" href="{{ . | absURL }}" />
<link rel="stylesheet" href="{{ . | absURL }}" />
{{ end }}

{{ $dark := resources.Get "css/dark.css" | minify }}
<link
id="dark-mode-theme"
crossorigin="anonymous"
href="{{ $dark.RelPermalink }}"
integrity="{{ $dark.Data.Integrity }}"
rel="preload stylesheet"
as="style"
/>
<link id="dark-mode-theme" crossorigin="anonymous" href="{{ $dark.RelPermalink }}"
integrity="{{ $dark.Data.Integrity }}" rel="preload stylesheet" as="style" />

<!-- Load theme mode from browser cache -->
<script>
Expand All @@ -67,18 +48,22 @@
<script defer crossorigin="anonymous" src="{{ $theme.RelPermalink }}" integrity="{{ $theme.Data.Integrity }}"></script>

{{ $instantpage := resources.Get "js/instantpage.min.js" }}
<script defer crossorigin="anonymous" src="{{ $instantpage.RelPermalink }}" integrity="{{ $instantpage.Data.Integrity }}"></script>
<script defer crossorigin="anonymous" src="{{ $instantpage.RelPermalink }}"
integrity="{{ $instantpage.Data.Integrity }}"></script>

{{- if (eq .Layout `search`) -}}
{{ $flexsearch := resources.Get "js/flexsearch.bundle.js" }}
<script defer crossorigin="anonymous" src="{{ $flexsearch.RelPermalink }}" integrity="{{ $flexsearch.Data.Integrity }}"></script>
{{ $flexsearch := resources.Get "js/flexsearch.bundle.js" }}
<script defer crossorigin="anonymous" src="{{ $flexsearch.RelPermalink }}"
integrity="{{ $flexsearch.Data.Integrity }}"></script>

{{ $mark := resources.Get "js/mark.min.js" }}
{{ $basesearch := resources.Get "js/search.js" }}
{{ $mark := resources.Get "js/mark.min.js" }}
{{ $basesearch := resources.Get "js/search.js" }}

{{ $searchJSFile := printf "js/%s.search.js" .Language.Lang }}
{{ $search := (slice $mark $basesearch) | resources.Concat "js/search.js" | resources.ExecuteAsTemplate $searchJSFile . | resources.Fingerprint }}
<script defer crossorigin="anonymous" src="{{ $search.RelPermalink }}" integrity="{{ $search.Data.Integrity }}"></script>
{{ $searchJSFile := printf "js/%s.search.js" .Language.Lang }}
{{ $search := (slice $mark $basesearch) | resources.Concat "js/search.js" | resources.ExecuteAsTemplate $searchJSFile .
| resources.Fingerprint }}
<script defer crossorigin="anonymous" src="{{ $search.RelPermalink }}"
integrity="{{ $search.Data.Integrity }}"></script>
{{- end -}}

{{ hugo.Generator -}}
{{ hugo.Generator -}}
4 changes: 2 additions & 2 deletions layouts/partials/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
{{ range .Site.Params.nav }}
{{ if .icon }}
<li>
<a href="{{ .url | relLangURL }}" id="{{ .name }}"
<a href="{{ .url | relLangURL }}" id="{{ .name }}" aria-label="{{ .aria_label }}"
><em class="{{ .icon }}"></em
></a>
</li>
{{ else }}
<li>
<a href="{{ .url | relLangURL }}" id="{{ .name }}">{{ .name }}</a>
<a href="{{ .url | relLangURL }}" id="{{ .name }}" aria-label="{{ .aria_label }}">{{ .name }}</a>
</li>
{{ end }}
{{ end }}
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/social.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ $len_socials = true }}
{{ range $i, $social := .Site.Params.social }}
{{ if ne $i 0 }} &nbsp;&ndash;&nbsp;{{ end }}
<a href="{{ $social.url }}" name="{{ $social.name }}">
<a rel="me" href="{{ $social.url }}" name="{{ $social.name }}" aria-label="{{ $social.aria_label }}">
<em class="{{ $social.icon }}"></em>
</a>
{{ end }}
Expand All @@ -15,7 +15,7 @@
{{ $base := .Site.BaseURL }}
{{ range $i, $social := .Site.Params.social_static }}
{{ if or ($len_socials) (ne $i 0) }} &nbsp;&ndash;&nbsp; {{ end }}
<a class="social-icon" href="{{ $social.url }}" name="{{ $social.name }}">
<a class="social-icon" href="{{ $social.url }}" name="{{ $social.name }}" aria-label="{{ $social.aria_label }}">
<img
src="{{ $base }}images/{{ $social.icon }}"
alt="{{ $social.name }}"
Expand Down
5 changes: 0 additions & 5 deletions static/fontawesome/css/all.min.css
View file
Open in desktop

This file was deleted.

Binary file removed static/fontawesome/webfonts/fa-brands-400.woff
View file
Open in desktop
Binary file not shown.
Binary file removed static/fontawesome/webfonts/fa-brands-400.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed static/fontawesome/webfonts/fa-regular-400.woff
View file
Open in desktop
Binary file not shown.
Binary file removed static/fontawesome/webfonts/fa-regular-400.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed static/fontawesome/webfonts/fa-solid-900.woff
View file
Open in desktop
Binary file not shown.
Binary file removed static/fontawesome/webfonts/fa-solid-900.woff2
View file
Open in desktop
Binary file not shown.