diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass index 2e0e91397744cf410761095f4d0e3c9b270dd910..eb3448f79b7ccb64c716489c6d4d642527ed4bd7 100644 --- a/assets/sass/_theme/_configuration.sass +++ b/assets/sass/_theme/_configuration.sass @@ -24,6 +24,7 @@ $line-height-base: 1.4 !default // Fonts sizes $body-font-size: px2rem(20) !default +$body-font-size-md: $body-font-size !default $small-font-size: px2rem(14) !default $h1-size-md: px2rem(60) !default @@ -211,8 +212,8 @@ $post-time-color: color-contrast($main-color, 20%) !default $toc-color: $main-color !default $toc-active-color: $main-color !default // TODO : checker ce que ça fait $toc-font-family: $body-font-family !default -$toc-font-size: $h4-size !default -$toc-font-size-md: $h4-size-md !default +$toc-font-size: $body-font-size !default +$toc-font-size-md: $body-font-size-md !default $toc-line-height: $h4-line-height !default $toc-font-weight: normal !default diff --git a/assets/sass/_theme/design-system/grid.sass b/assets/sass/_theme/design-system/grid.sass index 7526586be78713b512f8d12a2c5fe1e839a42685..7620fd0a46a67c7f7a0207732883f58da0d52f99 100644 --- a/assets/sass/_theme/design-system/grid.sass +++ b/assets/sass/_theme/design-system/grid.sass @@ -5,20 +5,25 @@ position: relative @include media-breakpoint-up(md) body:not(.full-width) & - > aside, > .document-nav - @include container - pointer-events: none - height: 100% - left: 50% - position: absolute - transform: translateX(-50%) - width: 100% - > div - @include sticky($spacing1) - margin-bottom: $spacing1 - > * - width: col(4) - pointer-events: auto + > aside, > .document-nav, > .toc + // @include container + // pointer-events: none + // height: 100% + // left: 50% + // position: absolute + // transform: translateX(-50%) + // width: 100% + // > div + // @include sticky($spacing1) + // margin-bottom: $spacing1 + // > * + // width: col(4) + // pointer-events: auto + position: sticky + top: 0 + margin-left: Max(#{$grid-gutter}, calc(50vw - #{$grid-max-width} / 2 + #{$grid-gutter})) + // width: calc(calc(100vw - #{$grid-max-width} / 2) * (3 / 12)) + width: calc(min(100vw, #{$grid-max-width}) * (3/12)) > .blocks .block-content padding-left: offset(5) diff --git a/assets/sass/_theme/design-system/top.sass b/assets/sass/_theme/design-system/top.sass index 8ccbfc8b861b8ab73f846361aa820f3683f0c820..0c337b615850cffbc3d31f5ee1d559f596a7d179 100644 --- a/assets/sass/_theme/design-system/top.sass +++ b/assets/sass/_theme/design-system/top.sass @@ -1,9 +1,9 @@ /* TODO à renomer */ .top - align-items: baseline - display: flex - flex-wrap: wrap - justify-content: space-between + // align-items: baseline + // display: flex + // flex-wrap: wrap + // justify-content: space-between margin-bottom: $spacing1 position: relative h2, p diff --git a/assets/sass/_theme/hugo-osuny.sass b/assets/sass/_theme/hugo-osuny.sass index 613ffb570a7fc88affb3b7c1e5020af9cdf82aa7..596031b148a624644ca1730ea04bf909e181666f 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 fc2a17518bbc8002923deaf327dced883d2d6f0c..89229052403292785bc29e1a89e752f3032453a4 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/partials/pages/document-nav.html b/layouts/partials/pages/document-nav.html index fa3001673277de2b81fd7667c6c2419defde7643..24e15dff29590c63dea199b64310e0413952b9ff 100644 --- a/layouts/partials/pages/document-nav.html +++ b/layouts/partials/pages/document-nav.html @@ -1,5 +1 @@ -<div class="document-nav"> - <div> - {{- partial "pages/toc.html" . -}} - </div> -</div> +{{- partial "pages/toc.html" . -}} diff --git a/layouts/partials/pages/toc.html b/layouts/partials/pages/toc.html index 90f330e04bf5ab9ca939789b081b8441b03d0f9b..7977eac5a882e7982afe0d41b4dbb7d2b39c58df 100644 --- a/layouts/partials/pages/toc.html +++ b/layouts/partials/pages/toc.html @@ -27,7 +27,7 @@ {{- end -}} {{- if $show_aside }} -<nav class="toc" id="nav-toc" aria-label="{{ i18n "commons.toc" }}"> +<nav class="toc toc-pages" id="nav-toc" aria-label="{{ i18n "commons.toc" }}"> <ol> {{- if .context.Params.blocks -}}