diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55215be6e9d8365c4289ab84a868c7d963403b1a..66315f88450c64259609039dfbd794322f5ece57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### [2.3.3](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.3.2...v2.3.3) (2023-06-23)
+
+
+### Bug Fixes
+
+* **news:** show header only on post list + fix style ([26af5d3](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/26af5d36920c49e0a446612d3c89f92fd9a256f5))
+* **orientation:** recap bug fix ([1d7969b](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/1d7969bfb0d9774462eee2750403486f4b2f0b5e))
+
### [2.3.2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.3.1...v2.3.2) (2023-06-22)
diff --git a/package.json b/package.json
index 92102e5d8ce2a3a93d4f434d04d0488c61a5bbc2..2e39497bb932dc756b277857aee0b603369ff32a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "pamn",
- "version": "2.3.2",
+ "version": "2.3.3",
"scripts": {
"ng": "ng",
"start": "ng serve --configuration=local,fr --proxy-config proxy.conf.json",
diff --git a/src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.html b/src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.html
index 3c4c192a4301bf8109d913cd80942ece17276c20..febfbd4e2460854bdd7e773cffb94b439b583d8c 100644
--- a/src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.html
+++ b/src/app/form/orientation-form-view/global-components/orientation-recap/orientation-recap.component.html
@@ -22,7 +22,7 @@
<div *ngFor="let need of needs">{{ need.displayText }}</div>
</div>
</div>
- <div *ngIf="recap.language" fxLayout="row">
+ <div *ngIf="recap?.language" fxLayout="row">
<div class="label">Langue souhaitée</div>
<div class="info">
<div>{{ recap.language }}</div>
diff --git a/src/app/post/components/post-details/post-details.component.html b/src/app/post/components/post-details/post-details.component.html
index 0f1aca9ff6894091951b1610001aadf43d5febb0..0ef228a5970f4b178addd2696605ed364aea4a91 100644
--- a/src/app/post/components/post-details/post-details.component.html
+++ b/src/app/post/components/post-details/post-details.component.html
@@ -1,32 +1,34 @@
-<div *ngIf="post" class="postContainer" fxLayout="column" fxLayoutGap="16px">
- <div fxLayout="row">
- <div
- class="backLink"
- fxLayout="row"
- fxLayoutAlign=" center"
- tabindex="0"
- (click)="backToPosts()"
- (keyup.enter)="backToPosts()"
- >
- <svg class="chevronLeft" aria-hidden="true">
- <use [attr.xlink:href]="'assets/form/sprite.svg#chevronLeft'"></use>
- </svg>
- <span>Retour</span>
+<div class="section-container no-padding news">
+ <div *ngIf="post" class="postContainer" fxLayout="column" fxLayoutGap="16px">
+ <div fxLayout="row">
+ <div
+ class="backLink"
+ fxLayout="row"
+ fxLayoutAlign=" center"
+ tabindex="0"
+ (click)="backToPosts()"
+ (keyup.enter)="backToPosts()"
+ >
+ <svg class="chevronLeft" aria-hidden="true">
+ <use [attr.xlink:href]="'assets/form/sprite.svg#chevronLeft'"></use>
+ </svg>
+ <span>Retour</span>
+ </div>
</div>
- </div>
- <div class="gh-canvas">
- <div fxLayout="column" fxLayoutAlign="center none">
- <app-post-tag [post]="post" />
- <h2 fxLayout="row" class="title">{{ post.title }}</h2>
- <div fxLayout="column" class="informations">
- <div>{{ post.author }}</div>
- <div>
- {{ post.created_at | date : 'dd MMM y' }}
+ <div class="gh-canvas">
+ <div fxLayout="column" fxLayoutAlign="center none">
+ <app-post-tag [post]="post" />
+ <h2 fxLayout="row" class="title">{{ post.title }}</h2>
+ <div fxLayout="column" class="informations">
+ <div>{{ post.author }}</div>
+ <div>
+ {{ post.created_at | date : 'dd MMM y' }}
+ </div>
</div>
</div>
- </div>
- <div class="description">
- <div [innerHtml]="post.safeHtml"></div>
+ <div class="description">
+ <div [innerHtml]="post.safeHtml"></div>
+ </div>
</div>
</div>
</div>
diff --git a/src/app/post/components/post-list/post-list.component.html b/src/app/post/components/post-list/post-list.component.html
index ae7f644db810c2233e48642253921ed21d20bb36..b22e137ea2a9573438e7aaed98a9388a5877f31f 100644
--- a/src/app/post/components/post-list/post-list.component.html
+++ b/src/app/post/components/post-list/post-list.component.html
@@ -1,20 +1,6 @@
-<div class="section-container no-padding" fxLayout="row" fxLayoutGap="32px">
+<app-post-header />
+<div class="section-container no-padding news">
<div fxLayout="column" class="list-container" fxLayoutGap="16px">
- <!-- <div fxLayout="column" *ngIf="displayTags()">
- <div fxLayout="row wrap" fxLayoutAlign="none center" fxLayoutGap="8px">
- <div
- fxLayout="row"
- fxLayoutAlign="start center"
- fxLayoutGap="9px"
- *ngFor="let filter of filters | slice: 1"
- class="tag"
- (click)="removeTag(filter)"
- >
- <p>{{ filter.slug | titlecase }}</p>
- <app-svg-icon [type]="'ico'" [iconColor]="'currentColor'" [icon]="'cancel'"/>
- </div>
- </div>
- </div> -->
<div fxLayout="column">
<div *ngIf="allPosts.length <= 0 && !isLoading" fxLayout="column">
<p>Aucun résultat ne correspond à votre recherche.</p>
diff --git a/src/app/post/components/post-list/post-list.component.scss b/src/app/post/components/post-list/post-list.component.scss
index 18feff3305c06b7499f7b219d9bae22f4070df96..cb5854d4e01c0852e0aabd0d2b13144967d3ac85 100644
--- a/src/app/post/components/post-list/post-list.component.scss
+++ b/src/app/post/components/post-list/post-list.component.scss
@@ -3,19 +3,6 @@
@import 'shapes';
@import 'breakpoint';
-.section-container {
- background: $grey-8;
- min-height: 68vh;
- width: 100%;
- .row-border {
- border-bottom: 1px dashed $grey-4;
- padding-bottom: 16px;
- }
- h2 {
- font-style: italic !important;
- text-transform: uppercase;
- }
-}
h2 {
font-style: italic !important;
text-transform: uppercase;
diff --git a/src/app/post/components/post-publish/post-publish.component.html b/src/app/post/components/post-publish/post-publish.component.html
index 4d6bcab97a8e7ff1159b82380f3d7d01d914b4a0..f86c28083f29c5eb776d9a03daeb1a0036ecc9da 100644
--- a/src/app/post/components/post-publish/post-publish.component.html
+++ b/src/app/post/components/post-publish/post-publish.component.html
@@ -1,44 +1,46 @@
-<div class="container" fxLayout="column" fxLayoutGap="16px">
- <div fxLayout="row">
- <div
- class="backLink"
- fxLayout="row"
- fxLayoutAlign="center"
- tabindex="0"
- (click)="backToPosts()"
- (keyup.enter)="backToPosts()"
- >
- <svg class="chevronLeft" aria-hidden="true">
- <use [attr.xlink:href]="'assets/form/sprite.svg#chevronLeft'"></use>
- </svg>
- <span>Retour</span>
- </div>
- </div>
- <div fxLayout="column" class="content" fxLayoutGap="16px" fxLayoutAlign="center center">
- <h2>Publier votre actualité</h2>
- <div class="image">
- <svg aria-hidden="true">
- <use [attr.xlink:href]="'../../../../assets/post/sprite.svg#publishLogo'"></use>
- </svg>
- </div>
- <div class="informations">
- <p>Vous pouvez nous envoyer votre actualité en distinguant ces 4 éléments :</p>
- <ul>
- <li>- le titre</li>
- <li>- le texte</li>
- <li>- l’auteur</li>
- <li>- l’image (facultatif)</li>
- </ul>
- <br />
- <p>Si votre actualité existe déjà sur un autre site, envoyez-nous simplement son adresse URL</p>
- <br />
- </div>
- <div>
- <a
- class="btn-primary"
- [href]="'mailto:inclusionnumerique@grandlyon.com?subject=Nouvelle actualité à intégrer&body=' + bodyMail"
- >Envoyer votre actu par mail</a
+<div class="section-container no-padding news">
+ <div class="container" fxLayout="column" fxLayoutAlign="center" fxLayoutGap="16px">
+ <div fxLayout="row">
+ <div
+ class="backLink"
+ fxLayout="row"
+ fxLayoutAlign="center"
+ tabindex="0"
+ (click)="backToPosts()"
+ (keyup.enter)="backToPosts()"
>
+ <svg class="chevronLeft" aria-hidden="true">
+ <use [attr.xlink:href]="'assets/form/sprite.svg#chevronLeft'"></use>
+ </svg>
+ <span>Retour</span>
+ </div>
+ </div>
+ <div fxLayout="column" class="content" fxLayoutGap="16px" fxLayoutAlign="center center">
+ <h2>Publier votre actualité</h2>
+ <div class="image">
+ <svg aria-hidden="true">
+ <use [attr.xlink:href]="'../../../../assets/post/sprite.svg#publishLogo'"></use>
+ </svg>
+ </div>
+ <div class="informations">
+ <p>Vous pouvez nous envoyer votre actualité en distinguant ces 4 éléments :</p>
+ <ul>
+ <li>- le titre</li>
+ <li>- le texte</li>
+ <li>- l’auteur</li>
+ <li>- l’image (facultatif)</li>
+ </ul>
+ <br />
+ <p>Si votre actualité existe déjà sur un autre site, envoyez-nous simplement son adresse URL</p>
+ <br />
+ </div>
+ <div>
+ <a
+ class="btn-primary"
+ [href]="'mailto:inclusionnumerique@grandlyon.com?subject=Nouvelle actualité à intégrer&body=' + bodyMail"
+ >Envoyer votre actu par mail</a
+ >
+ </div>
</div>
</div>
</div>
diff --git a/src/app/post/components/post-publish/post-publish.component.scss b/src/app/post/components/post-publish/post-publish.component.scss
index 342209276a065893dd2bb48dc30fbf24da7ce785..20440cd61d9e693c3ad1c8348fb36e865c161381 100644
--- a/src/app/post/components/post-publish/post-publish.component.scss
+++ b/src/app/post/components/post-publish/post-publish.component.scss
@@ -9,6 +9,7 @@ $margin-post: 20px;
min-height: calc(
var(--vh, 1vh) * 100 - #{$header-height} - #{$footer-height} - #{$header-post-height} - #{$margin-post} * 2
);
+ width: 100%;
}
.chevronLeft {
height: 24px;
diff --git a/src/app/post/news.component.html b/src/app/post/news.component.html
index c13e087d3af264c99a1d57868b50c2edb43c8eee..0caf3ee563e87254a00d4ca591e6f5b72fb4e9dd 100644
--- a/src/app/post/news.component.html
+++ b/src/app/post/news.component.html
@@ -1,5 +1,2 @@
-<app-post-header />
<h1 class="visually-hidden">Actualités</h1>
-<div class="section-container no-padding news">
- <router-outlet></router-outlet>
-</div>
+<router-outlet></router-outlet>
diff --git a/src/assets/scss/_ghost.scss b/src/assets/scss/_ghost.scss
index 4262d5670362505f6945d5e8df4a570653a48c12..072843f02f9e1489f3cd5c0848f3600063212140 100644
--- a/src/assets/scss/_ghost.scss
+++ b/src/assets/scss/_ghost.scss
@@ -15,39 +15,38 @@ $margin-post: 20px;
min-height: calc(
var(--vh, 1vh) * 100 - #{$header-height} - #{$footer-height} - #{$header-post-height} - #{$margin-post} * 3
);
-}
-.title {
- @include lato-bold-30;
- color: $grey-1;
- margin-bottom: 8px;
-}
-.description {
- div {
- max-width: 860px;
- line-height: 180%;
+ .title {
+ @include lato-bold-30;
+ color: $grey-1;
+ margin-bottom: 8px;
}
- > div > * + * {
- margin-top: 1em;
+ .description {
+ div {
+ max-width: 860px;
+ line-height: 180%;
+ }
+ > div > * + * {
+ margin-top: 1em;
+ }
}
-}
-
-.gh-canvas {
- display: grid;
- grid-template-columns:
- [full-start] minmax(4vmin, auto) [wide-start] minmax(auto, 240px) [main-start] min(720px, calc(100% - 8vw))
- [main-end] minmax(auto, 240px) [wide-end] minmax(4vmin, auto) [full-end];
-}
-.gh-canvas > * {
- grid-column: main-start/main-end;
-}
-.gh-canvas .article-image {
- grid-column: wide-start/wide-end;
- width: 100%;
- margin: 4vmin 0 0;
- img {
- display: block;
- margin-left: auto;
- margin-right: auto;
+ .gh-canvas {
+ display: grid;
+ grid-template-columns:
+ [full-start] minmax(4vmin, auto) [wide-start] minmax(auto, 240px) [main-start] min(720px, calc(100% - 8vw))
+ [main-end] minmax(auto, 240px) [wide-end] minmax(4vmin, auto) [full-end];
+ }
+ .gh-canvas > * {
+ grid-column: main-start/main-end;
+ }
+ .gh-canvas .article-image {
+ grid-column: wide-start/wide-end;
width: 100%;
+ margin: 4vmin 0 0;
+ img {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ width: 100%;
+ }
}
}