From f149af8bb0be98e6a83c4a121c3cd4a193723fde Mon Sep 17 00:00:00 2001 From: alexisben <alex@noesya.coop> Date: Wed, 16 Nov 2022 14:24:16 +0100 Subject: [PATCH] nav link --- assets/sass/_theme/hugo-osuny.sass | 66 ++++++++++++------------ assets/sass/_theme/sections/persons.sass | 2 +- layouts/pages/list.html | 3 -- layouts/partials/blocks/toc.html | 2 +- layouts/partials/pages/toc.html | 8 +-- layouts/partials/posts/toc.html | 4 +- layouts/partials/programs/toc.html | 10 ++-- layouts/partials/sitemap/toc.html | 2 +- 8 files changed, 47 insertions(+), 50 deletions(-) diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass index 613ffb57..596031b1 100644 --- a/assets/sass/_theme/hugo-osuny.sass +++ b/assets/sass/_theme/hugo-osuny.sass @@ -29,37 +29,37 @@ @import "design-system/typography" // Blocks -// @import "blocks/datatable" -// @import "blocks/call_to_action" -// @import "blocks/chapter" -// @import "blocks/contact" -// @import "blocks/definitions" -// @import "blocks/embed" -// @import "blocks/files" -// @import "blocks/gallery" -// @import "blocks/image" -// @import "blocks/key_figures" -// @import "blocks/organization_chart" -// @import "blocks/pages" -// @import "blocks/partners" -// @import "blocks/posts" -// @import "blocks/testimonials" -// @import "blocks/timeline" -// @import "blocks/video" +@import "blocks/datatable" +@import "blocks/call_to_action" +@import "blocks/chapter" +@import "blocks/contact" +@import "blocks/definitions" +@import "blocks/embed" +@import "blocks/files" +@import "blocks/gallery" +@import "blocks/image" +@import "blocks/key_figures" +@import "blocks/organization_chart" +@import "blocks/pages" +@import "blocks/partners" +@import "blocks/posts" +@import "blocks/testimonials" +@import "blocks/timeline" +@import "blocks/video" -// // Sections -// @import "sections/administrators" -// @import "sections/authors" -// @import "sections/categories" -// @import "sections/diplomas" -// @import "sections/home" -// @import "sections/organizations" -// @import "sections/pages" -// @import "sections/papers" -// @import "sections/persons" -// @import "sections/posts" -// @import "sections/programs" -// @import "sections/researchers" -// @import "sections/sitemap" -// @import "sections/teachers" -// @import "sections/volumes" +// Sections +@import "sections/administrators" +@import "sections/authors" +@import "sections/categories" +@import "sections/diplomas" +@import "sections/home" +@import "sections/organizations" +@import "sections/pages" +@import "sections/papers" +@import "sections/persons" +@import "sections/posts" +@import "sections/programs" +@import "sections/researchers" +@import "sections/sitemap" +@import "sections/teachers" +@import "sections/volumes" diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass index fc2a1751..89229052 100644 --- a/assets/sass/_theme/sections/persons.sass +++ b/assets/sass/_theme/sections/persons.sass @@ -34,7 +34,7 @@ div.persons @include grid(5, xxl) .persons__section - @include page-without-nav + @include in-page-without-nav .lead padding-top: $spacing2 @include media-breakpoint-up(md) diff --git a/layouts/pages/list.html b/layouts/pages/list.html index f3bd7a14..ef199dab 100644 --- a/layouts/pages/list.html +++ b/layouts/pages/list.html @@ -21,10 +21,7 @@ </div> {{ else }} {{ partial "pages/image.html" .Params.image }} - {{/* LEGACY */}}{{ partial "pages/body.html" .Content }} - {{/* LEGACY */}}{{ partial "pages/body.html" .Params.legacy_text }} {{ partial "pages/children.html" .Params.children }} - {{/* LEGACY */}}{{ partial "posts/related.html" $category }} {{ end }} {{ end }} diff --git a/layouts/partials/blocks/toc.html b/layouts/partials/blocks/toc.html index 14219480..1d269b14 100644 --- a/layouts/partials/blocks/toc.html +++ b/layouts/partials/blocks/toc.html @@ -1,7 +1,7 @@ {{ range . -}} {{- if .title }} <li> - <a class="nav-link" href="#block-{{ .position }}">{{ partial "PrepareHTML" .title }}</a> + <a href="#block-{{ .position }}">{{ partial "PrepareHTML" .title }}</a> </li> {{ end -}} {{- end -}} diff --git a/layouts/partials/pages/toc.html b/layouts/partials/pages/toc.html index 90f330e0..564018ca 100644 --- a/layouts/partials/pages/toc.html +++ b/layouts/partials/pages/toc.html @@ -40,25 +40,25 @@ {{ $h2s := partial "H2Extract" .context.Content }} {{- if and (not $h2s) (partial "GetTextFromHTML" .context.Content) }} <li> - <a class="nav-link" href="#page-informations">{{ i18n "pages.informations" }}</a> + <a href="#page-informations">{{ i18n "pages.informations" }}</a> </li> {{ end -}} {{- range $index, $h2 := $h2s }} <li> - <a class="nav-link" href="#page-h2-{{$index}}">{{ plainify $h2 }}</a> + <a href="#page-h2-{{$index}}">{{ plainify $h2 }}</a> </li> {{ end -}} {{- if .context.Pages }} <li> - <a class="nav-link" href="#page-children">{{ i18n "pages.details" }}</a> + <a href="#page-children">{{ i18n "pages.details" }}</a> </li> {{ end -}} {{- if .category.Pages }} <li> - <a class="nav-link" href="#page-posts">{{ i18n "pages.posts" }}</a> + <a href="#page-posts">{{ i18n "pages.posts" }}</a> </li> {{ end -}} diff --git a/layouts/partials/posts/toc.html b/layouts/partials/posts/toc.html index bb92ceb8..2fdfb7a1 100644 --- a/layouts/partials/posts/toc.html +++ b/layouts/partials/posts/toc.html @@ -4,12 +4,12 @@ <ol> {{- if and (not $h2s) (partial "GetTextFromHTML" .Content) }} <li> - <a class="nav-link" href="#page-informations">{{ i18n "pages.informations" }}</a> + <a href="#page-informations">{{ i18n "pages.informations" }}</a> </li> {{ end -}} {{- range $index, $h2 := $h2s }} <li> - <a class="nav-link" href="#page-h2-{{$index}}">{{ plainify $h2 }}</a> + <a href="#page-h2-{{$index}}">{{ plainify $h2 }}</a> </li> {{- end -}} {{- partial "blocks/toc.html" .Params.blocks -}} diff --git a/layouts/partials/programs/toc.html b/layouts/partials/programs/toc.html index 73bf0556..c37f2f6d 100644 --- a/layouts/partials/programs/toc.html +++ b/layouts/partials/programs/toc.html @@ -2,19 +2,19 @@ <nav class="toc" id="nav-toc" aria-label="{{ i18n "commons.toc" }}"> <ol> <li> - <a class="nav-link" href="#essential">{{ i18n "programs.toc.essential" }}</a> + <a href="#essential">{{ i18n "programs.toc.essential" }}</a> </li> <li> - <a class="nav-link" href="#presentation">{{ i18n "programs.toc.presentation" }}</a> + <a href="#presentation">{{ i18n "programs.toc.presentation" }}</a> </li> <li> - <a class="nav-link" href="#pedagogy">{{ i18n "programs.toc.pedagogy" }}</a> + <a href="#pedagogy">{{ i18n "programs.toc.pedagogy" }}</a> </li> <li> - <a class="nav-link" href="#results">{{ i18n "programs.toc.results" }}</a> + <a href="#results">{{ i18n "programs.toc.results" }}</a> </li> <li> - <a class="nav-link" href="#admission">{{ i18n "programs.toc.admission" }}</a> + <a href="#admission">{{ i18n "programs.toc.admission" }}</a> </li> </ol> </nav> diff --git a/layouts/partials/sitemap/toc.html b/layouts/partials/sitemap/toc.html index 412e3550..49a56588 100644 --- a/layouts/partials/sitemap/toc.html +++ b/layouts/partials/sitemap/toc.html @@ -3,7 +3,7 @@ {{ range site.Sections }} {{ if ne .Type "sitemap" }} <li> - <a class="nav-link" href="#{{ .Type }}">{{ safeHTML .Title }}</a> + <a href="#{{ .Type }}">{{ safeHTML .Title }}</a> </li> {{ end }} {{ end }} -- GitLab