From 70cd04bab603c2d78ba96d8c8752bc1189a731ad Mon Sep 17 00:00:00 2001 From: Matthieu Bessat Date: Sun, 10 Mar 2024 17:33:41 +0100 Subject: [PATCH] fix: sticky content nav, news list, adhesions --- assets/sass/adhesion.scss | 20 +++++++++---- assets/sass/article.scss | 7 ++++- assets/sass/general.scss | 47 +++++++++++++++++++++++++++++ assets/sass/header.scss | 12 +++++--- assets/sass/landing.scss | 2 ++ content/adhesion/_index.md | 9 ------ content/association/_index.md | 2 -- content/association/activites.md | 5 ++++ content/association/bureau.md | 5 ++++ content/association/comissions.md | 5 ++++ layouts/actualites/list.html | 2 +- layouts/actualites/single.html | 4 +-- layouts/adhesion/list.html | 31 +++++++++++++++---- layouts/association/list.html | 49 +++++++++++++------------------ layouts/partials/header.html | 14 +++++++-- 15 files changed, 152 insertions(+), 62 deletions(-) diff --git a/assets/sass/adhesion.scss b/assets/sass/adhesion.scss index 3232f72..0430791 100644 --- a/assets/sass/adhesion.scss +++ b/assets/sass/adhesion.scss @@ -178,7 +178,7 @@ } -.adhesion-choice { +.adhesion-choices { display: grid; grid-template-columns: 1fr 1fr; column-gap: .5rem; @@ -188,12 +188,12 @@ } } -.adhesion-choice__item { +.adhesion-choices__item { border: 1px solid gray; text-align: center; } -.adhesion-choice__item { +.adhesion-choices__item { &:hover, &:focus { background: transparent !important; box-shadow: inset 0 0 10px $accent-dark; @@ -204,7 +204,7 @@ } } -.adhesion-choice__item__icon { +.adhesion-choices__item__icon { margin-bottom: 1rem; svg { padding: .8rem; @@ -213,5 +213,15 @@ } } -.adhesion-choice__item { +@media (max-width: $md-breakpoint) { + .adhesion-choices { + display: block; + .adhesion-choices__item { + width: 100%; + margin-bottom: 1rem; + } + .adhesion-choices__item:last-child { + margin-bottom: 0; + } + } } diff --git a/assets/sass/article.scss b/assets/sass/article.scss index 4951068..2f8eb86 100644 --- a/assets/sass/article.scss +++ b/assets/sass/article.scss @@ -1,3 +1,4 @@ +// in the context of reading the article .article__date { font-style: italic; } @@ -6,10 +7,14 @@ max-width: 100%; img { + object-fit: contain; + aspect-ratio: 1; + max-height: 60vh; max-width: 100%; } } +// card in list .article-card { display: flex; background-color: rgba(0, 0, 0, 0.2); @@ -108,6 +113,7 @@ float: right; } + @media (max-width: $sm-breakpoint) { .prominent-article { .article__title { @@ -123,4 +129,3 @@ } } - diff --git a/assets/sass/general.scss b/assets/sass/general.scss index ec9ee1d..6a09876 100644 --- a/assets/sass/general.scss +++ b/assets/sass/general.scss @@ -187,3 +187,50 @@ figure { .icon-facebook { fill: lighten(#0866FF, 20%) !important; } + +.content-with-side-menu { + // display: grid; + // grid-template-columns: 1fr 1fr 1fr 1fr; + + // margin: 0 auto; + // width: 85%; + + // display: grid; + // grid-template-columns: 20rem 1fr; + // column-gap: 3rem; + position: relative; + + .side-menu__container { + position: sticky; + top: 7rem; + left: 5rem; + width: 25rem; + height: 0; + } + .side-menu { + } + +} + +.sticky-nav { + position: sticky; + top: 7rem; + background: white; + border: 1px solid black; + + ul { + display: flex; + justify-content: space-between; + align-items: stretch; + list-style-type: none; + padding: 0; + margin: 0; + height: 100%; + li { + width: 100%; + margin: 0; + padding: .5rem 1rem; + border: 1px solid $background-secondary; + } + } +} diff --git a/assets/sass/header.scss b/assets/sass/header.scss index 0494e2d..38f0e2a 100644 --- a/assets/sass/header.scss +++ b/assets/sass/header.scss @@ -1,7 +1,3 @@ -.after-header { - overflow-x: hidden; -} - $header-height: 6rem; .site-header { @@ -29,12 +25,20 @@ $header-height: 6rem; margin: 0; li { margin-right: 1.5rem; + display: flex; + align-items: center; } li:last-of-type { margin-right: 0; } } +.membership-header-button { + font-size: 1rem; + padding: .5rem 2rem; + min-width: initial; +} + .site-header__nav { a { color: white; diff --git a/assets/sass/landing.scss b/assets/sass/landing.scss index e156c99..9909647 100644 --- a/assets/sass/landing.scss +++ b/assets/sass/landing.scss @@ -267,6 +267,8 @@ } .landing-main { + overflow-x: hidden; // fix later + section:first-of-type { border-top: 1px solid rgba(1, 1, 1, 0.2); } diff --git a/content/adhesion/_index.md b/content/adhesion/_index.md index b446953..5505a9f 100644 --- a/content/adhesion/_index.md +++ b/content/adhesion/_index.md @@ -5,12 +5,3 @@ featured_image: src: ./images/default_logo.png --- -## Pourquoi adhérer ? - -à remplir depuis l'affiche adhérer de damien - -## Comment adhérer ? - -### Via Helloasso - -### Par bulletin papier diff --git a/content/association/_index.md b/content/association/_index.md index de23016..5e6b8b6 100644 --- a/content/association/_index.md +++ b/content/association/_index.md @@ -25,5 +25,3 @@ Il est formé des membres du bureau et d'autres personnes volontaires. 2/3 des membres sont nommés par la famille des propriétaires du domaine. - - diff --git a/content/association/activites.md b/content/association/activites.md index e69de29..85f07fc 100644 --- a/content/association/activites.md +++ b/content/association/activites.md @@ -0,0 +1,5 @@ +--- +title: Les activités de l'association +date: 2024-03-10 +--- + diff --git a/content/association/bureau.md b/content/association/bureau.md index e69de29..a3cf9e4 100644 --- a/content/association/bureau.md +++ b/content/association/bureau.md @@ -0,0 +1,5 @@ +--- +title: Le bureau +date: 2024-03-10 +--- + diff --git a/content/association/comissions.md b/content/association/comissions.md index e69de29..f9587db 100644 --- a/content/association/comissions.md +++ b/content/association/comissions.md @@ -0,0 +1,5 @@ +--- +title: Les comissions +date: 2024-03-10 +--- + diff --git a/layouts/actualites/list.html b/layouts/actualites/list.html index 6d175ae..c0c7b8e 100644 --- a/layouts/actualites/list.html +++ b/layouts/actualites/list.html @@ -17,7 +17,7 @@ {{ if .Params.featured_image }} {{ $featuredImage = .Resources.GetMatch (.Params.featured_image.src | safeURL) }} {{ end }} - {{ $featuredImage := $featuredImage.Resize "450x" }} + {{ $featuredImage := $featuredImage.Fill "400x300 Center" }}
{{ with .Params.featured_image.caption }} diff --git a/layouts/actualites/single.html b/layouts/actualites/single.html index c797637..6fec149 100644 --- a/layouts/actualites/single.html +++ b/layouts/actualites/single.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+

{{ .Title }}

@@ -15,7 +15,7 @@ {{ if .Params.featured_image }} {{ $featuredImage := .Resources.GetMatch (.Params.featured_image.src | safeURL) }} {{ if $featuredImage }} - {{ $featuredImage = $featuredImage.Resize "1000x" }} + {{ $featuredImage = $featuredImage.Resize "900x" }}
{{ with .Params.featured_image.caption }} diff --git a/layouts/adhesion/list.html b/layouts/adhesion/list.html index 69ab7bc..406f7c2 100644 --- a/layouts/adhesion/list.html +++ b/layouts/adhesion/list.html @@ -8,32 +8,51 @@
{{ with .Title }}

{{ . }}

{{ end }} -

2 méthodes d'adhésions possibles :

-
+

Comment adhérer ?

+

2 méthodes d'adhésions sont possibles :

+
-
+
{{ partial "helpers/svg" (dict "path" "icons/helloasso") }}
HelloAsso -
+
{{ partial "helpers/svg" (dict "path" "icons/write") }}
Papier
+

Pourquoi adhérer ?

+

+ Adhérer permet de participer aux activités internes de l'association, participer aux différentes commissions. +

+

+ L'adhésion permet de prendre part aux assemblées générales de l'association : elle donne le droit de vote et le droit de candidater à un siège d'administrateur. +

+ +

Les tarifs

+
    +
  • Individuel
    • +
  • Individuel bienfaiteur
    • +
  • Couple
    • +
  • Couple bienfaiteur
    • +
  • Moral
    • +
  • Moral bienfaiteur
    • +
+ {{ if .Content }}
{{ with .Content }}
{{ . }}
{{ end }} diff --git a/layouts/association/list.html b/layouts/association/list.html index 68cd03d..dfc8c6c 100644 --- a/layouts/association/list.html +++ b/layouts/association/list.html @@ -1,34 +1,25 @@ {{ define "main" }} -
-
+
+
+ {{ $listtitle := .Title }} + {{ with .Title }}

{{ . }}

{{ end }} + + -
+ {{ if .Content }} +
+ {{ with .Content }}
{{ . }}
{{ end }} +
+ {{ end }} +
- -
- {{ $listtitle := .Title }} - - {{ with .Title }}

{{ . }}

{{ end }} -
    - {{ range .Pages }} -
  • -
    - {{ if eq $listtitle "Posts" }} - {{ .Date.Format "2006-01-02" }} {{.Title }} - {{ else }} - {{.Title }} - {{ end }} -
    -
    • - {{ end }} -
- - {{ if .Content }} -
- {{ with .Content }}
{{ . }}
{{ end }} -
- {{ end }} -
- {{ end }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 7d242e5..cae8d77 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -9,7 +9,14 @@
  • Actualités
  • L'association
  • Documentation
    • -
  • Adhérer
    • +
  • + + Adhérer + +
    • {{ end }} @@ -22,10 +29,11 @@