Skip to content
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.

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

fix: various a11y improvements #31

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions layouts/_default/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ <h2 class="h4">{{ site.Params.showing_posts }} <span class="title-border">{{ .Ti
<!-- Previous page. -->
{{ if $paginator.HasPrev }}
<li class="page-item prev d-flex align-items-center">
<a class="page-link disabled" href="{{ $paginator.Prev.URL }}" aria-label="Pagination Arrow"><i
<a class="page-link" href="{{ $paginator.Prev.URL }}" role="button" aria-label="Pagination Previous" aria-disabled="false"><i
class="fas fa-arrow-left me-3"></i>{{ site.Params.previous_button }}
</a>
</li>
{{ else }}
<li class="page-item prev d-flex align-items-center disabled">
<span class="page-link disabled" aria-label="Pagination Arrow"><i
<span class="page-link disabled" role="button" aria-label="Pagination Previous" aria-disabled="true"><i
class="fas fa-arrow-left me-3"></i>{{ site.Params.previous_button }}
</span>
</li>
Expand Down Expand Up @@ -84,7 +84,7 @@ <h2 class="h4">{{ site.Params.showing_posts }} <span class="title-border">{{ .Ti
<!-- Output page numbers. -->
{{ if eq ($.Scratch.Get "page_number_flag") true }}
<li class="page-item">
<a href="{{ .URL }}" class="page-link {{if eq . $paginator}}active{{end}}">
<a href="{{ .URL }}" class="page-link {{if eq . $paginator}}active{{end}}" aria-label="Go to page {{ .PageNumber }}"{{if eq . $paginator}} aria-current="page"{{end}}>
{{ .PageNumber }}
</a>
</li>
Expand All @@ -93,13 +93,13 @@ <h2 class="h4">{{ site.Params.showing_posts }} <span class="title-border">{{ .Ti
<!-- Next page. -->
{{ if $paginator.HasNext }}
<li class="page-item next d-flex align-items-center">
<a class="page-link arrow" href="{{ $paginator.Next.URL }}" aria-label="Pagination">{{ site.Params.next_button }}<i
<a class="page-link arrow" href="{{ $paginator.Next.URL }}" role="button" aria-label="Pagination Next" aria-disabled="false"><span class="d-none d-sm-inline">{{ site.Params.next_button }}</span><i
class="fas fa-arrow-right ms-3"></i>
</a>
</li>
{{ else }}
<li class="page-item next d-flex align-items-center disabled">
<span class="page-link arrow" aria-label="Pagination">{{ site.Params.next_button }}<i class="fas fa-arrow-right ms-3"></i>
<span class="page-link arrow disabled" role="button" aria-label="Pagination Next" aria-disabled="true"><span class="d-none d-sm-inline">{{ site.Params.next_button }}</span><i class="fas fa-arrow-right ms-3"></i>
</span>
</li>
{{ end }}
Expand Down
10 changes: 5 additions & 5 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ <h2 class="h4 title-border">{{ . | markdownify}}</h2>
<!-- Previous page. -->
{{ if $paginator.HasPrev }}
<li class="page-item prev d-flex align-items-center">
<a class="page-link disabled" href="{{ $paginator.Prev.URL }}" aria-label="Pagination Arrow"><i
<a class="page-link" href="{{ $paginator.Prev.URL }}" role="button" aria-label="Pagination Previous" aria-disabled="false"><i
class="fas fa-arrow-left me-3"></i><span class="d-none d-sm-inline">{{ site.Params.previous_button }}</span>
</a>
</li>
{{ else }}
<li class="page-item prev d-flex align-items-center disabled">
<span class="page-link disabled" aria-label="Pagination Arrow"><i
<span class="page-link disabled" role="button" aria-label="Pagination Previous" aria-disabled="true"><i
class="fas fa-arrow-left me-3"></i><span class="d-none d-sm-inline">{{ site.Params.previous_button }}</span>
</span>
</li>
Expand Down Expand Up @@ -156,7 +156,7 @@ <h2 class="h4 title-border">{{ . | markdownify}}</h2>
<!-- Output page numbers. -->
{{ if eq ($.Scratch.Get "page_number_flag") true }}
<li class="page-item">
<a href="{{ .URL }}" class="page-link {{if eq . $paginator}}active{{end}}">
<a href="{{ .URL }}" class="page-link {{if eq . $paginator}}active{{end}}" aria-label="Go to page {{ .PageNumber }}"{{if eq . $paginator}} aria-current="page"{{end}}>
{{ .PageNumber }}
</a>
</li>
Expand All @@ -165,13 +165,13 @@ <h2 class="h4 title-border">{{ . | markdownify}}</h2>
<!-- Next page. -->
{{ if $paginator.HasNext }}
<li class="page-item next d-flex align-items-center">
<a class="page-link arrow" href="{{ $paginator.Next.URL }}" aria-label="Pagination"><span class="d-none d-sm-inline">{{ site.Params.next_button }}</span><i
<a class="page-link arrow" href="{{ $paginator.Next.URL }}" role="button" aria-label="Pagination Next" aria-disabled="false"><span class="d-none d-sm-inline">{{ site.Params.next_button }}</span><i
class="fas fa-arrow-right ms-3"></i>
</a>
</li>
{{ else }}
<li class="page-item next d-flex align-items-center disabled">
<span class="page-link arrow" aria-label="Pagination"><span class="d-none d-sm-inline">{{ site.Params.next_button }}</span><i class="fas fa-arrow-right ms-3"></i>
<span class="page-link arrow disabled" role="button" aria-label="Pagination Next" aria-disabled="true"><span class="d-none d-sm-inline">{{ site.Params.next_button }}</span><i class="fas fa-arrow-right ms-3"></i>
</span>
</li>
{{ end }}
Expand Down
8 changes: 4 additions & 4 deletions layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<ul class="list-unstyled search me-3">
{{ if site.Params.search }}
<li class="list-inline-item">
<a href="#" class="toggle-search" data-target="#search-wrap"><i class="fas fa-search"></i></a>
<a href="#" class="toggle-search" data-target="#search-wrap" aria-label="Search"><i class="fas fa-search"></i></a>
</li>
{{ end }}
<li class="list-inline-item">
<a href="#" class="toggle-side-nav" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight"
<a href="#" class="toggle-side-nav" aria-label="Toggle navigation" aria-controls="offcanvasRight" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight"
aria-controls="offcanvasRight"><i class="fas fa-bars"></i></a>
</li>
</ul>
Expand All @@ -34,7 +34,7 @@
{{ $pageURL:= $currentPage.Permalink | absLangURL }}
{{ $active := eq $menuURL $pageURL }}
{{ if .HasChildren }}
<li class="nav-item dropdown
<li class="nav-item dropdown
{{ range .Children }}
{{ $childURL := .URL | absLangURL }}
{{ $active := eq $childURL $pageURL }}
Expand Down Expand Up @@ -75,7 +75,7 @@
{{ if site.Params.search }}
<ul class="list-unstyled search d-none d-lg-block">
<li class="list-inline-item">
<button class="toggle-search" data-target="#search-wrap"><i class="fas fa-search"></i></button>
<button class="toggle-search" aria-label="Search" data-target="#search-wrap"><i class="fas fa-search"></i></button>
</li>
</ul>
{{ end }}
Expand Down