From addce360a43790a6b998dba9d4e5c11d148ff51c Mon Sep 17 00:00:00 2001 From: Olivia206 <olivia.simonet206@gmail.com> Date: Mon, 25 Sep 2023 17:12:56 +0200 Subject: [PATCH] added search link to a11y menu --- assets/js/theme/design-system/search.js | 1 - assets/sass/_theme/design-system/search.sass | 13 ++++++++++++- layouts/_default/baseof.html | 6 ++++++ layouts/partials/commons/menu.html | 5 +++-- layouts/partials/header/accessibility.html | 1 + 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/assets/js/theme/design-system/search.js b/assets/js/theme/design-system/search.js index 3eb82f83..2de0815c 100644 --- a/assets/js/theme/design-system/search.js +++ b/assets/js/theme/design-system/search.js @@ -15,7 +15,6 @@ class Search { } listen() { - this.button.addEventListener('click', () => { this.toggle(true); this.removedItems = this.element.querySelector('.pagefind-ui__suppressed', '.pagefind-ui__search-clear'); diff --git a/assets/sass/_theme/design-system/search.sass b/assets/sass/_theme/design-system/search.sass index 098df933..8f9c0dc0 100644 --- a/assets/sass/_theme/design-system/search.sass +++ b/assets/sass/_theme/design-system/search.sass @@ -144,4 +144,15 @@ &__message top: calc(#{$spacing4} + #{$spacing2}) &__results-area - padding-top: calc(#{$spacing3} + #{half($spacing0)}) \ No newline at end of file + padding-top: calc(#{$spacing3} + #{half($spacing0)}) + +.pagefind-fixed + position: fixed + background: $color-background + bottom: 0 + left: $spacing3 + z-index: 10 + min-width: calc(#{$spacing3} * 3) + &::after + position: absolute + right: $spacing0 \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 574bc71f..68beb97d 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -15,6 +15,12 @@ {{- partial "header/accessibility.html" -}} {{- partial "header/header.html" . -}} <main{{ if .Params.contents }} class="page-with-blocks"{{ end }} id="main" tabindex="-1"> + {{ if and (site.Params.search.active) (eq site.Params.search.position "fixed")}} + <button id="search-button" class="pagefind-ui__toggle pagefind-fixed " aria-expanded="false"> + {{- i18n (printf "commons.search.title") -}} + </button> + {{- partial "header/search.html" . -}} + {{ end }} {{- block "main" . }}{{- end }} {{- partial "hooks/before-main-end" . -}} </main> diff --git a/layouts/partials/commons/menu.html b/layouts/partials/commons/menu.html index 38af212e..57273528 100644 --- a/layouts/partials/commons/menu.html +++ b/layouts/partials/commons/menu.html @@ -62,8 +62,9 @@ </li> {{- end -}} {{ end -}} - {{ if and (eq $kind "primary") (site.Params.search.active)}} - <button class="pagefind-ui__toggle" aria-expanded="false"> + + {{ if and (eq $kind "primary") (site.Params.search.active) (eq site.Params.search.position "menu")}} + <button id="search-button" class="pagefind-ui__toggle" aria-expanded="false"> {{- i18n (printf "commons.search.title") -}} </button> {{- partial "header/search.html" . -}} diff --git a/layouts/partials/header/accessibility.html b/layouts/partials/header/accessibility.html index 5bee0e49..1bd46fef 100644 --- a/layouts/partials/header/accessibility.html +++ b/layouts/partials/header/accessibility.html @@ -2,5 +2,6 @@ <ul aria-label="{{ i18n "commons.accessibility.shortcut_navigation"}}"> <li><a href="#main">{{ i18n "commons.accessibility.main_content" }}</a></li> <li><a href="#navigation">{{ i18n "commons.accessibility.menu" }}</a></li> + <li><a href="#search-button">{{ i18n "commons.accessibility.search" }}</a></li> </ul> </nav> -- GitLab