diff --git a/assets/sass/_theme/design-system/search.sass b/assets/sass/_theme/design-system/search.sass index 95a34317be0fa81f70e494102dd4789208324b8e..dd7263fd3a69c980b080812a8bcbc823ef08f6c5 100644 --- a/assets/sass/_theme/design-system/search.sass +++ b/assets/sass/_theme/design-system/search.sass @@ -48,14 +48,14 @@ @include media-breakpoint-up(md) padding-right: $spacing3 padding-left: $spacing3 - padding-top: $spacing3 + padding-top: calc(#{half($spacing3)} - #{half($spacing0)} + #{px2rem(2)}) &[aria-hidden=true] display: none .pagefind-ui &::before content: "" background: $color-background - height: calc(#{$spacing3} + #{$spacing1} + #{$spacing2} + #{$spacing1}) + height: calc(#{$spacing3} + #{$spacing1} + #{$spacing1}) left: 0 position: fixed top: 0 @@ -100,7 +100,7 @@ text-align: right z-index: 11 position: fixed - top: $spacing4 + top: calc(#{half($spacing4)} + (#{$spacing1} / 2)) &__search-clear, &__suppressed display: none diff --git a/layouts/partials/footer/social.html b/layouts/partials/footer/social.html index 095c8eb3185bc4e17975c5acccc3a61e22a68dce..422d3e2c0b68ffa5551180b144b7026ec8d00c64 100644 --- a/layouts/partials/footer/social.html +++ b/layouts/partials/footer/social.html @@ -1,6 +1,4 @@ {{ $menu := partial "GetMenu" "social" }} -{{ $site_social_links := index site.Data.website.social }} - {{ if $menu }} {{ partial "commons/menu.html" @@ -11,52 +9,58 @@ )}} {{ end }} -{{ if $site_social_links }} - <ul class="footer-social site-links"> - {{ with $site_social_links.mastodon}} - <li class="mastodon"> - <a href="{{ . }}" rel="noreferrer" title="Mastodon" target="_blank">Mastodon</a> - </li> - {{ end}} - {{ with $site_social_links.peertube}} - <li class="peertube"> - <a href="{{ . }}" rel="noreferrer" title="Peertube" target="_blank">Peertube</a> - </li> - {{ end}} - {{ with $site_social_links.x}} - <li class="x"> - <a href="{{ . }}" rel="noreferrer" title="X, ex-Twitter" target="_blank">X (ex-Twitter)</a> - </li> - {{ end}} - {{ with $site_social_links.linkedin}} - <li class="linkedin"> - <a href="{{ . }}" rel="noreferrer" title="LinkedIn" target="_blank">LinkedIn</a> - </li> - {{ end}} - {{ with $site_social_links.youtube}} - <li class="youtube"> - <a href="{{ . }}" rel="noreferrer" title="Youtube" target="_blank">Youtube</a> - </li> - {{ end}} - {{ with $site_social_links.vimeo}} - <li class="vimeo"> - <a href="{{ . }}" rel="noreferrer" title="Vimeo" target="_blank">Vimeo</a> - </li> - {{ end}} - {{ with $site_social_links.instagram}} - <li class="instagram"> - <a href="{{ . }}" rel="noreferrer" title="Instagram" target="_blank">Instagram</a> - </li> - {{ end}} - {{ with $site_social_links.facebook}} - <li class="facebook"> - <a href="{{ . }}" rel="noreferrer" title="" target="_blank">Facebook</a> - </li> - {{ end}} - {{ with $site_social_links.tiktok}} - <li class="tiktok"> - <a href="{{ . }}" rel="noreferrer" title="TikTok" target="_blank">TikTok</a> - </li> - {{ end}} - </ul> + +{{ if site.Data.website.social }} + + {{ $site_social_links := index site.Data.website.social }} + + {{ if $site_social_links }} + <ul class="footer-social site-links"> + {{ with $site_social_links.mastodon}} + <li class="mastodon"> + <a href="{{ . }}" rel="noreferrer" title="Mastodon" target="_blank">Mastodon</a> + </li> + {{ end}} + {{ with $site_social_links.peertube}} + <li class="peertube"> + <a href="{{ . }}" rel="noreferrer" title="Peertube" target="_blank">Peertube</a> + </li> + {{ end}} + {{ with $site_social_links.x}} + <li class="x"> + <a href="{{ . }}" rel="noreferrer" title="X, ex-Twitter" target="_blank">X (ex-Twitter)</a> + </li> + {{ end}} + {{ with $site_social_links.linkedin}} + <li class="linkedin"> + <a href="{{ . }}" rel="noreferrer" title="LinkedIn" target="_blank">LinkedIn</a> + </li> + {{ end}} + {{ with $site_social_links.youtube}} + <li class="youtube"> + <a href="{{ . }}" rel="noreferrer" title="Youtube" target="_blank">Youtube</a> + </li> + {{ end}} + {{ with $site_social_links.vimeo}} + <li class="vimeo"> + <a href="{{ . }}" rel="noreferrer" title="Vimeo" target="_blank">Vimeo</a> + </li> + {{ end}} + {{ with $site_social_links.instagram}} + <li class="instagram"> + <a href="{{ . }}" rel="noreferrer" title="Instagram" target="_blank">Instagram</a> + </li> + {{ end}} + {{ with $site_social_links.facebook}} + <li class="facebook"> + <a href="{{ . }}" rel="noreferrer" title="" target="_blank">Facebook</a> + </li> + {{ end}} + {{ with $site_social_links.tiktok}} + <li class="tiktok"> + <a href="{{ . }}" rel="noreferrer" title="TikTok" target="_blank">TikTok</a> + </li> + {{ end}} + </ul> + {{ end }} {{ end }} \ No newline at end of file diff --git a/package.json b/package.json index 66b60b9b6f8e93e768ebd4f287838bc297e33688..6005a3c3af535f055c3a9eb1320bf67a01ee51a5 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "glightbox": "^3.1.0", "intersection-observer": "^0.12.0", "leaflet": "^1.9.4", - "shelljs": "^0.8.5", - "pagefind": "^1.0.3" + "pagefind": "^1.0.3", + "shelljs": "^0.8.5" }, "bin": "./bin/osuny.js" }