diff --git a/src/_includes/layouts/member.njk b/src/_includes/layouts/member.njk index f3c1612..7d8c05d 100644 --- a/src/_includes/layouts/member.njk +++ b/src/_includes/layouts/member.njk @@ -5,29 +5,34 @@ {% block content %}
-
-
-

{{ name }}

-

{{ position }}

-
{{ content | safe }}
- {% if personalSite %} -

- site perso : - -

- {% endif %} - {% if socialTwitter %} - - {% endif %} - {% if socialLinkedin %} - - {% endif %} - {% if socialMastodon %} - - {% endif %} -
-
- profile de {{ name }} +
+

{{ name }}

+

{{ position }}

+ {% if positionInternal %} +

{{ positionInternal }}

+ {% endif %} +
+
+ photo de {{ name }} + {% if personalSite %} +

+ site web : + {{ personalSite }} +

+ {% endif %} + {% if socialMastodon %} + + {% endif %} + {% if socialTwitter %} + + {% endif %} + {% if socialLinkedin %} + + {% endif %} +
+
+ {{ content | safe }} +
Voir tous les membres diff --git a/src/scss/_theme.scss b/src/scss/_theme.scss index a6dea5a..1bb6812 100644 --- a/src/scss/_theme.scss +++ b/src/scss/_theme.scss @@ -53,3 +53,12 @@ main { color: var(--color-selection-text); background-color: var(--color-selection-bg); } + +a, +a:visited { + color: var(--color-dark); + + &.highlight { + background-color: var(--color-primary); + } +} diff --git a/src/scss/components/_member-list.scss b/src/scss/components/_member-list.scss index 9dd52f6..22c4fcd 100644 --- a/src/scss/components/_member-list.scss +++ b/src/scss/components/_member-list.scss @@ -20,12 +20,6 @@ align-items: center; color: var(--color-dark); - // a, - // a:visited { - // text-decoration: none; - // color: var(--color-dark); - // } - img { border-radius: 50%; height: 17rem; diff --git a/src/scss/components/_member.scss b/src/scss/components/_member.scss index be80597..280987d 100644 --- a/src/scss/components/_member.scss +++ b/src/scss/components/_member.scss @@ -1,27 +1,61 @@ .member { display: flex; flex-direction: column; - margin-bottom: 20rem; + margin-top: 8rem; + margin-bottom: 16rem; + + h1 { + font-size: 2rem; + } + + .position { + font-size: 1.125rem; + } &__wrapper { display: grid; - grid-template-columns: .6fr .4fr; + grid-template-columns: .4fr .6fr; grid-template-rows: 1fr; grid-column-gap: 1.5rem; grid-row-gap: 0; - margin-top: 8rem; + margin-top: 2.5rem; + } + + &__info { + img { + border-radius: 50%; + width: 16rem; + margin-bottom: 2rem; + } + + .social { + display: inline-block; + margin-top: 1.5rem; + + + .social { + margin-left: 1rem; + } + } } &__bio { - margin-top: 2.5rem; + position: relative; + p, p + p { margin-top: 1.5rem; - - span { - font-weight: 600; - } + } + + &::before { + content: ''; + display: block; + position: absolute; + background-image: url("data:image/svg+xml,%3Csvg width='221' height='138' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M220.5 137.5h-99v-77L160 0h49.5l-22 55h33v82.5zm-121 0H.5v-77L39 0h49.5l-22 55h33v82.5z' fill='%23F1F0F6'/%3E%3C/svg%3E"); + width: 221px; + height: 138px; + z-index: -1; + top: -6rem; + left: -1.5rem; } } @@ -29,6 +63,7 @@ align-self: flex-end; font-size: 1.125rem; font-weight: 700; + margin-top: 2rem; &:visited { color: inherit; diff --git a/src/scss/components/_presentation.scss b/src/scss/components/_presentation.scss index e0f27c0..d2e518a 100644 --- a/src/scss/components/_presentation.scss +++ b/src/scss/components/_presentation.scss @@ -35,11 +35,6 @@ } } - a, - a:visited { - color: var(--color-dark); - } - + figure, + p { display: flex; @@ -71,7 +66,6 @@ display: flex; list-style: none; margin-top: auto; - margin-bottom: 1.5rem; li + li { margin-left: -2rem; diff --git a/src/transforms/parse-transform.js b/src/transforms/parse-transform.js index 178665b..5757014 100644 --- a/src/transforms/parse-transform.js +++ b/src/transforms/parse-transform.js @@ -11,7 +11,7 @@ module.exports = function(value, outputPath) { }); const document = DOM.window.document; - const articleImages = [...document.querySelectorAll('main section:not(.process-cae, .presentation) article img, .intro img')]; + const articleImages = [...document.querySelectorAll('main section:not(.process-cae, .presentation, .member) article img, .intro img')]; const articleHeadings = [ ...document.querySelectorAll('main article h2, main article h3') ];