From 36d4b7062fb678ac0a262de6505a6d66970d3a49 Mon Sep 17 00:00:00 2001 From: Olivia206 <olivia.simonet206@gmail.com> Date: Tue, 26 Sep 2023 09:44:24 +0200 Subject: [PATCH] added footer layout to search button --- assets/sass/_theme/design-system/search.sass | 9 +++++++-- layouts/_default/baseof.html | 10 ++++++---- layouts/partials/commons/menu.html | 10 ++++++---- layouts/partials/footer/footer-simple.html | 8 ++++++++ layouts/partials/header/search.html | 4 ++++ 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/assets/sass/_theme/design-system/search.sass b/assets/sass/_theme/design-system/search.sass index b5a6369a..e343e5be 100644 --- a/assets/sass/_theme/design-system/search.sass +++ b/assets/sass/_theme/design-system/search.sass @@ -148,12 +148,12 @@ 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) + position: fixed + z-index: 10 &::after position: absolute right: $spacing0 @@ -162,3 +162,8 @@ width: 100vw &.in-page-with-toc bottom: px2rem(44) + +.pagefind-footer + padding: 0 + margin-bottom: calc(#{$spacing3} + #{half($spacing3)}) + diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 68beb97d..96f9fc76 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -16,10 +16,12 @@ {{- 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" . -}} + {{ partial "header/search.html" + (dict + "position" "fixed" + "context" . + ) + }} {{ end }} {{- block "main" . }}{{- end }} {{- partial "hooks/before-main-end" . -}} diff --git a/layouts/partials/commons/menu.html b/layouts/partials/commons/menu.html index 57273528..20cc58ba 100644 --- a/layouts/partials/commons/menu.html +++ b/layouts/partials/commons/menu.html @@ -64,10 +64,12 @@ {{ end -}} {{ 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" . -}} + {{ partial "header/search.html" + (dict + "position" "menu" + "context" . + ) + }} {{ end }} {{ if and (eq $kind "primary") (site.Params.menu.i18n.display) }} {{ partial "header/i18n.html" . }} diff --git a/layouts/partials/footer/footer-simple.html b/layouts/partials/footer/footer-simple.html index 40f8d288..0a5e44da 100644 --- a/layouts/partials/footer/footer-simple.html +++ b/layouts/partials/footer/footer-simple.html @@ -12,6 +12,14 @@ {{ partial "footer/social.html" }} </div> <div class="footer-legals"> + {{ if and (site.Params.search.active) (eq site.Params.search.position "footer")}} + {{ partial "header/search.html" + (dict + "position" "footer" + "context" . + ) + }} + {{ end }} {{ partial "footer/legals.html" }} </div> </div> diff --git a/layouts/partials/header/search.html b/layouts/partials/header/search.html index ce06120e..d9fbe756 100644 --- a/layouts/partials/header/search.html +++ b/layouts/partials/header/search.html @@ -1,3 +1,7 @@ +<button id="search-button" class="pagefind-ui__toggle pagefind-{{ .position }}" aria-expanded="false"> + {{- i18n (printf "commons.search.title") -}} +</button> + <script src="/pagefind/pagefind-ui.js"></script> <div id="search" class="search__modal" aria-hidden="true" aria-modal="true" role="dialog"> <button class="search__close" aria-label="{{ i18n "commons.search.close" }}"> -- GitLab