From 43d940f2b1599ba4127a944380620679158b4959 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 09:37:11 +0100
Subject: [PATCH 01/16] post-header
---
.../post-header/post-header.component.html | 108 +++---------
.../post-header/post-header.component.scss | 155 ++++--------------
src/assets/ico/sprite.svg | 16 --
src/styles.scss | 2 +-
4 files changed, 54 insertions(+), 227 deletions(-)
diff --git a/src/app/post/components/post-header/post-header.component.html b/src/app/post/components/post-header/post-header.component.html
index 903149717..fefd4c2db 100644
--- a/src/app/post/components/post-header/post-header.component.html
+++ b/src/app/post/components/post-header/post-header.component.html
@@ -1,92 +1,22 @@
-<div class="header-container">
- <div class="section-container news" fxLayout="column" fxLayoutAlign="space-between">
- <div class="section-container title" fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="8px">
- <app-svg-icon class="icon" role="img" [type]="'ico'" [iconClass]="'icon-80'" [icon]="'news-header'" />
- <div>
- <h1 class="no-margin">Fil d’actualité</h1>
- <p class="subtitle no-margin onlyOnDesktop">du réseau d’inclusion numérique</p>
- </div>
- </div>
- <div fxLayout="row" fxLayoutGap="5px" fxLayoutAlign="space-between flex-end" class="overflow">
- <div fxLayout="row" class="row-mobile" role="list">
- <span
- *ngFor="let tag of tags.others"
- class="tag-button"
- fxLayout="row"
- fxLayoutAlign="center center"
- tabindex="0"
- role="listitem"
- [ngClass]="{ active: tag.slug === mainActiveTag.slug || tag.name === mainActiveTag.slug }"
- (click)="activateTag(tag)"
- (keydown.enter)="activateTag(tag)"
- >{{ tag.name }}</span
- >
- </div>
- <div fxLayout="row" class="row-mobile">
- <app-button
- class="publish-button hide-on-mobile"
- [text]="'Publier votre actu'"
- (action)="togglePublishNews()"
- />
- </div>
- <!-- <div
- class="btnSection"
- fxLayout="row"
- fxLayoutAlign="space-between center"
- fxLayoutGap="16px"
- (appClickOutside)="closeModal()"
+<div class="section-container news">
+ <header>
+ <h1>Les actualités</h1>
+ <h2>du réseau d’inclusion numérique</h2>
+ </header>
+
+ <div class="navigation">
+ <nav>
+ <span
+ *ngFor="let tag of tags.others"
+ class="btnTag"
+ tabindex="0"
+ role="listitem"
+ [ngClass]="{ active: tag.slug === mainActiveTag.slug || tag.name === mainActiveTag.slug }"
+ (click)="activateTag(tag)"
+ (keydown.enter)="activateTag(tag)"
+ >{{ tag.name }}</span
>
- <button
- *ngIf="tags.public && tags.public.length > 0"
- type="button"
- fxLayout="row"
- [ngClass]="{
- selected: modalTypeOpened === TypeModal.public,
- containCheckedFilters: checkedPublicTags.length > 0
- }"
- fxLayoutAlign="space-between center"
- (click)="openModal(TypeModal.public)"
- >
- <span class="text">Tout public</span>
- <app-svg-icon
- class="icon"
- [type]="'ico'"
- [iconClass]="modalTypeOpened === TypeModal.public ? 'white icon-32' : 'grey-1 icon-32'"
- [icon]="'news-public'"
- />
- <div class="arrow"></div>
- </button>
- <button
- *ngIf="tags.commune && tags.commune.length > 0"
- class="btn-filter-no-margin"
- type="button"
- fxLayout="row"
- [ngClass]="{
- selected: modalTypeOpened === TypeModal.location,
- containCheckedFilters: checkedLocationTags.length > 0
- }"
- fxLayoutAlign="space-between center"
- (click)="openModal(TypeModal.location)"
- >
- <span class="text">Toutes les communes</span>
- <app-svg-icon
- class="icon"
- [type]="'ico'"
- [iconClass]="modalTypeOpened === TypeModal.location ? 'white' : 'grey-1'"
- [icon]="'news-location'"
- />
- <div class="arrow"></div>
- </button>
- <div *ngIf="modalTypeOpened">
- <app-post-modal-filters
- [modalType]="modalTypeOpened"
- [tags]="getModalData()"
- [inputCheckedTags]="getCheckedModalData()"
- (searchEvent)="filter($event)"
- (closeEvent)="closeModal()"
- ></app-post-modal-filters>
- </div>
- </div> -->
- </div>
+ </nav>
+ <app-button class="publish-button hide-on-mobile" [text]="'Publier votre actu'" (action)="togglePublishNews()" />
</div>
</div>
diff --git a/src/app/post/components/post-header/post-header.component.scss b/src/app/post/components/post-header/post-header.component.scss
index b116997ea..0b58e60f6 100644
--- a/src/app/post/components/post-header/post-header.component.scss
+++ b/src/app/post/components/post-header/post-header.component.scss
@@ -4,135 +4,48 @@
@import 'breakpoint';
@import 'layout';
-h1 {
- .onlyOnDesktop {
- margin: 0;
+header {
+ padding-block: 2rem;
+ h1 {
+ @include font-bold-30;
}
- @media #{$large-phone} {
- @include font-bold-28;
- .onlyOnDesktop {
- display: none;
- }
- }
-}
-
-.header-container {
- background: $white;
- .title {
- margin: 32px 0;
- width: 100%;
- }
- .subtitle {
- @include font-regular-24;
+ h2 {
+ @include font-regular-20;
color: $grey-3;
-
- @media #{$large-phone} {
- @include font-regular-18;
- }
}
}
-.section-container {
- height: 100%;
-}
+.navigation {
+ display: flex;
+ justify-content: space-between;
-.btnSection {
- padding: 16px 0 0px 0;
- button {
- background: $white;
- height: 40px;
- width: 210px;
- border: 1px solid $grey-5;
- padding: 3px 16px 3px 16px;
- outline: none;
- border-radius: 4px;
- cursor: pointer;
- white-space: nowrap;
- @include btn-normal;
- .arrow {
- background-color: transparent;
- border-bottom: 1px solid $grey-2;
- border-right: 1px solid $grey-2;
- transform: translateY(-25%) rotate(45deg);
- margin: 0 5px 0 10px;
- height: 7px;
- width: 7px;
- }
- &:focus {
- border-color: $focus-color;
- }
- }
- .selected {
- background-color: $primary-color;
- border-color: $primary-color !important;
- color: $white;
- .arrow {
- background-color: transparent;
- border-bottom: 1px solid $white;
- border-right: 1px solid $white;
- transform: translateY(25%) rotate(-135deg);
- margin: 0 5px 0 10px;
- height: 7px;
- width: 7px;
- }
- }
- .containCheckedFilters {
- border-color: $primary-color;
- }
- .icon {
- display: none !important;
- }
- @media #{$desktop} {
- button {
- width: 90px;
- }
- .text {
- display: none !important;
- }
- .icon {
- display: inherit !important;
- }
- }
- @media #{$tablet} {
- button {
- display: none !important;
+ border-bottom: 1px solid $grey-4;
+
+ nav {
+ display: flex;
+ .btnTag {
+ padding: 0 16px;
+ @include font-regular-14;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ white-space: nowrap;
+ border-bottom: 3px solid transparent;
+ transition: all 0.3s ease-in-out;
+ &.active {
+ @include font-bold-14;
+ border-color: $grey-1;
+ }
+ &:hover {
+ border-color: $grey-4;
+ }
+ &:focus {
+ outline-color: $primary-color;
+ }
}
}
-}
-.tag-button {
- padding: 8px 10px;
- @include font-regular-16;
- color: $grey-3;
- cursor: pointer;
- white-space: nowrap;
- &.active {
- @include font-bold-16;
- color: $grey-2;
- text-decoration: underline $button-secondary;
- text-underline-offset: 3px;
- }
- &:focus {
- outline-color: $primary-color;
+ app-button {
+ margin-bottom: 4px;
}
}
-
-// Remove margin right on filter pop-up trigger
-.btn-filter-no-margin {
- margin-right: 0 !important;
-}
-
-.row-mobile {
- @media #{$tablet} {
- justify-content: space-between;
- }
-}
-.overflow {
- @media #{$tablet} {
- overflow-x: auto;
- }
-}
-
-.publish-button {
- white-space: nowrap;
-}
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index d7f79f954..984e77d6e 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -480,22 +480,6 @@
stroke="none" />
</symbol>
- <symbol id="news-header" viewBox="0 0 89 88" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M63.5 72H27.0391C29.1476 70.3259 30.5 67.7505 30.5 64.8571V17H70.5V65C70.5 68.866 67.3659 72 63.5 72Z"
- stroke="#828282" stroke-width="2" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M36.5 52C36.5 51.4477 36.9477 51 37.5 51H63.5C64.0523 51 64.5 51.4477 64.5 52C64.5 52.5523 64.0523 53 63.5 53H37.5C36.9477 53 36.5 52.5523 36.5 52ZM36.5 58C36.5 57.4477 36.9477 57 37.5 57H63.5C64.0523 57 64.5 57.4477 64.5 58C64.5 58.5523 64.0523 59 63.5 59H37.5C36.9477 59 36.5 58.5523 36.5 58ZM37.5 63C36.9477 63 36.5 63.4477 36.5 64C36.5 64.5523 36.9477 65 37.5 65H52.5C53.0523 65 53.5 64.5523 53.5 64C53.5 63.4477 53.0523 63 52.5 63H37.5Z"
- fill="#828282" />
- <path d="M30.5 72C27 72 27 72 23 72C18.8055 71.702 15.5 68.3806 15.5 64.327V55H30" stroke="#828282"
- stroke-width="2" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M15.9211 67.663C16.1618 68.4235 16.5012 69.1312 16.9283 69.7667L29.5 57.195V55L28.5841 55L15.9211 67.663ZM20.9667 72.7284C20.1942 72.5073 19.4861 72.1679 18.8539 71.7302L29.5 61.0841V64.195L20.9667 72.7284ZM25.4046 72.1795C26.7069 71.4951 27.7523 70.4308 28.4608 69.1232L25.4046 72.1795ZM24.695 55L21.5841 55L15.5 61.0841V64.195L24.695 55ZM15.5 55L17.695 55L15.5 57.195V55Z"
- fill="#828282" />
- <rect x="34.5" y="24" width="32" height="20" rx="2" fill="#BDBDBD" />
- </symbol>
-
-
-
<symbol id="calendar" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<path d="M8 10H5V13H8V10Z" fill="#333333" />
<path fill-rule="evenodd" clip-rule="evenodd"
diff --git a/src/styles.scss b/src/styles.scss
index 523d80120..3c9065377 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -152,7 +152,7 @@ a {
width: 80%;
max-width: 1200px;
margin: 0 auto;
- padding: 10px 0;
+
@media #{$tablet} {
width: 95%;
max-width: unset;
--
GitLab
From e124a85f0ca7bb04891add77650ce109bb1d89fa Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 09:54:02 +0100
Subject: [PATCH 02/16] post list
---
.../post-list/post-list.component.html | 32 +--
.../post-list/post-list.component.scss | 256 ++++++++----------
2 files changed, 124 insertions(+), 164 deletions(-)
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 b22e137ea..b5ef993ac 100644
--- a/src/app/post/components/post-list/post-list.component.html
+++ b/src/app/post/components/post-list/post-list.component.html
@@ -1,21 +1,17 @@
<app-post-header />
-<div class="section-container no-padding news">
- <div fxLayout="column" class="list-container" fxLayoutGap="16px">
- <div fxLayout="column">
- <div *ngIf="allPosts.length <= 0 && !isLoading" fxLayout="column">
- <p>Aucun résultat ne correspond à votre recherche.</p>
- </div>
- <div fxLayout="row" fxLayoutGap="33px">
- <div class="posts-container" role="list">
- <app-post-card *ngFor="let news of allPosts" class="col" [post]="news" />
- </div>
- </div>
- <div *ngIf="isLoading" class="loader" aria-busy="true">
- <img class="loader-gif" src="/assets/gif/loader_circle_grey.gif" alt />
- </div>
- <div *ngIf="!isLastPage && !isLoading" fxLayout="row" fxLayoutAlign="center center">
- <app-button class="loadMore" [text]="'Voir plus'" [style]="buttonTypeEnum.Primary" (click)="loadMore()" />
- </div>
- </div>
+<div class="section-container news">
+ <div *ngIf="!isLoading && allPosts.length === 0">
+ <p>Aucun résultat ne correspond à votre recherche.</p>
+ </div>
+
+ <div class="posts-container" role="list">
+ <app-post-card *ngFor="let news of allPosts" class="col" [post]="news" />
+ </div>
+
+ <div *ngIf="isLoading" class="loader" aria-busy="true">
+ <img class="loader-gif" src="/assets/gif/loader_circle.gif" alt />
+ </div>
+ <div *ngIf="!isLastPage && !isLoading" class="loadMore">
+ <app-button [text]="'Voir plus'" [style]="buttonTypeEnum.Primary" (click)="loadMore()" />
</div>
</div>
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 d13e23169..75fb0c0cf 100644
--- a/src/app/post/components/post-list/post-list.component.scss
+++ b/src/app/post/components/post-list/post-list.component.scss
@@ -3,182 +3,146 @@
@import 'shapes';
@import 'breakpoint';
-h2 {
- font-style: italic !important;
- text-transform: uppercase;
+.news {
+ padding-top: 2rem;
}
-.last-child {
+@mixin big-container {
+ grid-column: 1 / span 12;
::ng-deep .post {
- border: 0;
- }
-}
-.list-container {
- width: 100%;
-
- h2 {
- @media #{$large-phone} {
- @include font-bold-22;
+ flex-direction: row !important;
+ .title {
+ @include font-regular-32;
}
- @include font-bold-28;
- color: $grey-2;
- margin: 0;
}
- .columnPosts {
- @media #{$large-phone} {
- display: none !important;
+ ::ng-deep .post .imageContainer {
+ margin-right: 36px !important;
+ margin-bottom: unset !important;
+ .image {
+ height: 40vw;
+ max-height: 320px;
+ @media #{$news-max} {
+ height: unset;
+ max-height: unset;
+ }
}
- width: 50%;
}
+}
- @mixin big-container {
- grid-column: 1 / span 12;
- ::ng-deep .post {
- flex-direction: row !important;
- .title {
- @include font-regular-32;
- }
+@mixin small-container {
+ margin-right: unset; // remove margin from other cotnainers
+ grid-column: 1 / span 12;
+ ::ng-deep .post {
+ flex-direction: column !important;
+ .title {
+ @include font-regular-32;
}
- ::ng-deep .post .imageContainer {
- margin-right: 36px !important;
- margin-bottom: unset !important;
- .image {
- height: 40vw;
- max-height: 320px;
- @media #{$news-max} {
- height: unset;
- max-height: unset;
- }
- }
+ }
+ ::ng-deep .post .imageContainer {
+ margin-right: unset !important;
+ margin-bottom: 36px !important;
+ }
+ @media #{$news-max} {
+ ::ng-deep .post .imageContainer .image {
+ height: unset;
+ max-height: 320px;
}
}
+}
- @mixin small-container {
- margin-right: unset; // remove margin from other cotnainers
- grid-column: 1 / span 12;
- ::ng-deep .post {
- flex-direction: column !important;
- .title {
- @include font-regular-32;
- }
- }
- ::ng-deep .post .imageContainer {
- margin-right: unset !important;
- margin-bottom: 36px !important;
- }
- @media #{$news-max} {
- ::ng-deep .post .imageContainer .image {
- height: unset;
- max-height: 320px;
- }
- }
+@mixin twin-container($start) {
+ margin-right: 40px;
+ grid-column: $start / span 6;
+ ::ng-deep .post .imageContainer .image {
+ height: 40vw;
+ max-height: 250px;
}
+ @media #{$news-max} {
+ margin-right: unset;
+ }
+}
- @mixin twin-container($start) {
- margin-right: 40px;
- grid-column: $start / span 6;
- ::ng-deep .post .imageContainer .image {
- height: 40vw;
- max-height: 250px;
- }
- @media #{$news-max} {
- margin-right: unset;
- }
+@mixin triple-container-first {
+ margin-right: 40px;
+ grid-column: 1 / span 4;
+ ::ng-deep .post .imageContainer .image {
+ height: 40vw;
+ max-height: 180px;
+ }
+ @media #{$news-max} {
+ margin-right: unset;
+ }
+}
+@mixin triple-container {
+ margin-right: 40px;
+ grid-column: span 4;
+ ::ng-deep .post .imageContainer .image {
+ height: 40vw;
+ max-height: 180px;
}
+ @media #{$news-max} {
+ margin-right: unset;
+ }
+}
- @mixin triple-container-first {
- margin-right: 40px;
- grid-column: 1 / span 4;
- ::ng-deep .post .imageContainer .image {
- height: 40vw;
- max-height: 180px;
- }
+.posts-container {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(7%, 1fr));
+ grid-column-gap: 1%;
+ grid-row-gap: 40px;
+ max-width: 1080px;
+ .col:nth-child(6n + 1) {
+ @include big-container;
@media #{$news-max} {
- margin-right: unset;
+ @include small-container;
}
- }
- @mixin triple-container {
- margin-right: 40px;
- grid-column: span 4;
- ::ng-deep .post .imageContainer .image {
- height: 40vw;
- max-height: 180px;
+ @media #{$large-phone} {
+ @include small-container;
}
+ }
+ .col:nth-child(6n + 2) {
+ @include triple-container-first;
@media #{$news-max} {
- margin-right: unset;
+ @include twin-container(1);
+ }
+ @media #{$large-phone} {
+ @include small-container;
}
}
-
- .posts-container {
- display: grid;
- padding: 4vmin 0;
- grid-template-columns: repeat(auto-fill, minmax(7%, 1fr));
- grid-column-gap: 1%;
- grid-row-gap: 40px;
- max-width: 1080px;
- .col:nth-child(6n + 1) {
- @include big-container;
- @media #{$news-max} {
- @include small-container;
- }
- @media #{$large-phone} {
- @include small-container;
- }
+ .col:nth-child(6n + 3) {
+ @include triple-container;
+ @media #{$news-max} {
+ @include twin-container(7);
}
- .col:nth-child(6n + 2) {
- @include triple-container-first;
- @media #{$news-max} {
- @include twin-container(1);
- }
- @media #{$large-phone} {
- @include small-container;
- }
+ @media #{$large-phone} {
+ @include small-container;
}
- .col:nth-child(6n + 3) {
- @include triple-container;
- @media #{$news-max} {
- @include twin-container(7);
- }
- @media #{$large-phone} {
- @include small-container;
- }
+ }
+ .col:nth-child(6n + 4) {
+ @include triple-container;
+ @media #{$news-max} {
+ @include small-container;
}
- .col:nth-child(6n + 4) {
- @include triple-container;
- @media #{$news-max} {
- @include small-container;
- }
- @media #{$large-phone} {
- @include small-container;
- }
+ @media #{$large-phone} {
+ @include small-container;
}
- .col:nth-child(6n + 5) {
- @include twin-container(1);
- @media #{$large-phone} {
- @include small-container;
- }
+ }
+ .col:nth-child(6n + 5) {
+ @include twin-container(1);
+ @media #{$large-phone} {
+ @include small-container;
}
- .col:nth-child(6n + 6) {
- @include twin-container(7);
- @media #{$large-phone} {
- @include small-container;
- }
+ }
+ .col:nth-child(6n + 6) {
+ @include twin-container(7);
+ @media #{$large-phone} {
+ @include small-container;
}
}
}
-.tag {
- background: $grey-3;
- color: $white;
- border-radius: 20px;
- cursor: pointer;
- margin-bottom: 10px;
- padding: 0 20px;
- p {
- margin-top: 0;
- margin-bottom: 0;
- }
-}
.loadMore {
- margin-bottom: 20px;
+ margin: 16px auto 32px auto;
+ display: flex;
+ justify-content: center;
}
--
GitLab
From 1e7efbd959aa177ed9d53f6686938971d6747772 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 11:20:27 +0100
Subject: [PATCH 03/16] post list & remove post tag
---
.../post-card/post-card.component.html | 39 +++++------
.../post-card/post-card.component.scss | 67 ++++++++++---------
.../post-card/post-card.component.ts | 2 +-
.../post-details/post-details.component.html | 2 +-
.../post-header/post-header.component.scss | 1 +
.../post-list/post-list.component.scss | 7 +-
.../post-tag/post-tag.component.html | 8 ---
.../post-tag/post-tag.component.scss | 10 ---
.../components/post-tag/post-tag.component.ts | 19 ------
src/app/post/post.module.ts | 2 -
10 files changed, 56 insertions(+), 101 deletions(-)
delete mode 100644 src/app/post/components/post-tag/post-tag.component.html
delete mode 100644 src/app/post/components/post-tag/post-tag.component.scss
delete mode 100644 src/app/post/components/post-tag/post-tag.component.ts
diff --git a/src/app/post/components/post-card/post-card.component.html b/src/app/post/components/post-card/post-card.component.html
index c561fd0de..338dd01db 100644
--- a/src/app/post/components/post-card/post-card.component.html
+++ b/src/app/post/components/post-card/post-card.component.html
@@ -1,41 +1,34 @@
<div
*ngIf="post"
- fxLayout="column"
class="post"
- fxLayoutGap="12px"
tabindex="0"
role="listitem"
- [ngClass]="class"
(click)="showDetails(post)"
(keyup.enter)="showDetails(post)"
>
- <div *ngIf="post.feature_image" fxLayout="column" class="imageContainer">
- <img class="image" alt="image about the news" [src]="post.feature_image" />
+ <div class="imageContainer">
+ <img *ngIf="post.feature_image" alt="Image du post" [src]="post.feature_image" />
+ <ng-container *ngIf="!post.feature_image">
+ <img
+ alt="image appels a projets"
+ [src]="isAppelAProjet() ? '../../../../assets/post/aap.png' : '../../../../assets/post/placeholder.png'"
+ />
+ </ng-container>
</div>
- <div *ngIf="!post.feature_image" fxLayout="column" class="imageContainer">
- <img
- *ngIf="isAppelAProjet()"
- class="image"
- alt="image about appels a projets"
- src="../../../../assets/post/aap.png"
- />
- <img
- *ngIf="!isAppelAProjet()"
- class="image"
- alt="image about appels a projets"
- src="../../../../assets/post/placeholder.png"
- />
- </div>
- <div fxLayout="column" fxLayoutGap="8px" fxLayoutAlign="center">
- <app-post-tag [post]="post" />
+ <div class="informations">
+ <div class="inline">
+ <app-v3-tag-item *ngFor="let tag of post.tags" [label]="tag.name" [color]="'red'" [size]="'small'" />
+ </div>
<h2 fxLayout="row" class="title">
{{ post.title }}
</h2>
- <div fxLayout="column" class="informations">
- <div>{{ post.author }}</div>
+ <div class="details">
+ <div>Publié par : {{ post.author }}</div>
<div>
+ publié le :
{{ post.created_at | date : 'd MMM y' }}
</div>
+ <!-- TODO description -->
</div>
</div>
</div>
diff --git a/src/app/post/components/post-card/post-card.component.scss b/src/app/post/components/post-card/post-card.component.scss
index 3536da34c..0ecf446e5 100644
--- a/src/app/post/components/post-card/post-card.component.scss
+++ b/src/app/post/components/post-card/post-card.component.scss
@@ -4,11 +4,26 @@
.post {
cursor: pointer;
- padding: 16px 0px;
+ padding: 16px;
+ border: 1px solid transparent;
+ transition: all 0.2s ease-in-out;
+ border-radius: 16px;
+ display: flex;
+ flex-direction: column;
+ column-gap: 32px;
+ row-gap: 12px;
+
+ &:hover {
+ border-color: $grey-1;
+ box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.12);
+ }
+
.imageContainer {
- margin-bottom: 12px !important;
+ display: flex;
+ flex-direction: column;
max-width: 600px;
- .image {
+ img {
+ border-radius: 8px;
object-fit: cover;
@media #{$large-phone} {
height: 70px;
@@ -16,36 +31,26 @@
}
}
- .title {
- @media #{$large-phone} {
- @include font-bold-18;
+ .informations {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+
+ .inline {
+ display: flex;
+ gap: 8px;
}
- @include font-bold-22;
- color: $grey-1;
- }
- .description {
- @media #{$large-phone} {
- display: none !important;
+
+ .title {
+ @include font-bold-20;
+ @media #{$large-phone} {
+ @include font-bold-18;
+ }
}
- @include font-regular-16;
- color: $black;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box !important;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- }
- .informations {
- @include font-regular-16;
- div:nth-child(2n) {
- color: $grey-3;
+
+ .details {
+ @include font-regular-14;
+ color: $grey-4-text;
}
}
}
-.project {
- text-align: left;
- .imageContainer,
- .informations {
- display: none !important;
- }
-}
diff --git a/src/app/post/components/post-card/post-card.component.ts b/src/app/post/components/post-card/post-card.component.ts
index fb67224b2..52cf5b045 100644
--- a/src/app/post/components/post-card/post-card.component.ts
+++ b/src/app/post/components/post-card/post-card.component.ts
@@ -10,7 +10,7 @@ import { Post } from '../../models/post.model';
})
export class PostCardComponent {
@Input() post: Post;
- @Input() class: string;
+
public tagEnum = TagEnum;
constructor(private router: Router) {}
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 4d5929b92..3a9a167f4 100644
--- a/src/app/post/components/post-details/post-details.component.html
+++ b/src/app/post/components/post-details/post-details.component.html
@@ -17,7 +17,7 @@
</div>
<div class="gh-canvas">
<div fxLayout="column" fxLayoutAlign="center none">
- <app-post-tag [post]="post" />
+ <!-- <app-post-tag [post]="post" /> -->
<h2 fxLayout="row" class="title">{{ post.title }}</h2>
<div fxLayout="column" class="informations">
<div>{{ post.author }}</div>
diff --git a/src/app/post/components/post-header/post-header.component.scss b/src/app/post/components/post-header/post-header.component.scss
index 0b58e60f6..32e67e62e 100644
--- a/src/app/post/components/post-header/post-header.component.scss
+++ b/src/app/post/components/post-header/post-header.component.scss
@@ -29,6 +29,7 @@ header {
display: flex;
align-items: center;
cursor: pointer;
+ user-select: none;
white-space: nowrap;
border-bottom: 3px solid transparent;
transition: all 0.3s ease-in-out;
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 75fb0c0cf..52fa72820 100644
--- a/src/app/post/components/post-list/post-list.component.scss
+++ b/src/app/post/components/post-list/post-list.component.scss
@@ -16,8 +16,6 @@
}
}
::ng-deep .post .imageContainer {
- margin-right: 36px !important;
- margin-bottom: unset !important;
.image {
height: 40vw;
max-height: 320px;
@@ -38,10 +36,7 @@
@include font-regular-32;
}
}
- ::ng-deep .post .imageContainer {
- margin-right: unset !important;
- margin-bottom: 36px !important;
- }
+
@media #{$news-max} {
::ng-deep .post .imageContainer .image {
height: unset;
diff --git a/src/app/post/components/post-tag/post-tag.component.html b/src/app/post/components/post-tag/post-tag.component.html
deleted file mode 100644
index e1d9de9fd..000000000
--- a/src/app/post/components/post-tag/post-tag.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div>
- <div *ngIf="post.tags[0]" fxLayout="row" class="tag" fxLayoutAlign=" center" fxLayoutGap="12px">
- <span>{{ displayTag(post) }}</span>
- </div>
- <div *ngIf="!post.tags[0]" fxLayout="row" class="tag" fxLayoutAlign=" center" fxLayoutGap="12px">
- <span>infos</span>
- </div>
-</div>
diff --git a/src/app/post/components/post-tag/post-tag.component.scss b/src/app/post/components/post-tag/post-tag.component.scss
deleted file mode 100644
index 576bf3446..000000000
--- a/src/app/post/components/post-tag/post-tag.component.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@import 'typography';
-@import 'color';
-
-.tag {
- @include font-bold-16;
- text-transform: uppercase;
- color: $primary-color;
- fill: $primary-color;
- stroke: $primary-color;
-}
diff --git a/src/app/post/components/post-tag/post-tag.component.ts b/src/app/post/components/post-tag/post-tag.component.ts
deleted file mode 100644
index c39b2fb6f..000000000
--- a/src/app/post/components/post-tag/post-tag.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { TagEnum } from '../../enum/tag.enum';
-import { Post } from '../../models/post.model';
-
-@Component({
- selector: 'app-post-tag',
- templateUrl: './post-tag.component.html',
- styleUrls: ['./post-tag.component.scss'],
-})
-export class PostTagComponent {
- @Input() post: Post;
-
- public displayTag(post: Post): string {
- if (post.tags.length > 1) {
- return post.tags.filter((tag) => tag.slug !== TagEnum.aLaUne)[0].name;
- }
- return post.tags[0].name;
- }
-}
diff --git a/src/app/post/post.module.ts b/src/app/post/post.module.ts
index 80dbdc00b..cacd65b3d 100644
--- a/src/app/post/post.module.ts
+++ b/src/app/post/post.module.ts
@@ -7,7 +7,6 @@ import { PostHeaderComponent } from './components/post-header/post-header.compon
import { PostListComponent } from './components/post-list/post-list.component';
import { PostModalFiltersComponent } from './components/post-modal-filters/post-modal-filters.component';
import { PostPublishComponent } from './components/post-publish/post-publish.component';
-import { PostTagComponent } from './components/post-tag/post-tag.component';
import { NewsComponent } from './news.component';
import { PostRoutingModule } from './post-routing.module';
import { TagResolver } from './resolvers/tags.resolver';
@@ -21,7 +20,6 @@ import { TagResolver } from './resolvers/tags.resolver';
PostCardComponent,
PostModalFiltersComponent,
PostPublishComponent,
- PostTagComponent,
],
imports: [CommonModule, PostRoutingModule, SharedModule],
providers: [TagResolver],
--
GitLab
From 2a6c7a394d12108ac1f26c7b34e8b77ab1412a33 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 12:38:14 +0100
Subject: [PATCH 04/16] adjust post header
---
src/app/post/components/post-header/post-header.component.scss | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/app/post/components/post-header/post-header.component.scss b/src/app/post/components/post-header/post-header.component.scss
index 32e67e62e..986f0329d 100644
--- a/src/app/post/components/post-header/post-header.component.scss
+++ b/src/app/post/components/post-header/post-header.component.scss
@@ -18,13 +18,16 @@ header {
.navigation {
display: flex;
justify-content: space-between;
+ align-items: center;
border-bottom: 1px solid $grey-4;
nav {
display: flex;
+ overflow-x: auto;
.btnTag {
padding: 0 16px;
+ height: 60px;
@include font-regular-14;
display: flex;
align-items: center;
--
GitLab
From 01451984b691253257b400cb1132763fc228e3e7 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 12:38:19 +0100
Subject: [PATCH 05/16] post details
---
.../post-details/post-details.component.html | 50 ++++++++-----------
.../post-details/post-details.component.scss | 42 ++++++++++++++--
.../post-details/post-details.component.ts | 2 +
src/styles.scss | 1 +
4 files changed, 61 insertions(+), 34 deletions(-)
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 3a9a167f4..9744dcdec 100644
--- a/src/app/post/components/post-details/post-details.component.html
+++ b/src/app/post/components/post-details/post-details.component.html
@@ -1,34 +1,26 @@
-<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'" />
- </svg>
- <span>Retour</span>
- </div>
+<div *ngIf="post" class="postContainer">
+ <app-v3-button
+ [label]="'Retour'"
+ [variant]="buttonTypeEnumV3.Tertiary"
+ [iconFolder]="'ico'"
+ [iconName]="'arrowBackV3'"
+ (action)="backToPosts()"
+ />
+
+ <div class="gh-canvas">
+ <div class="inline">
+ <app-v3-tag-item *ngFor="let tag of post.tags" [label]="tag.name" [color]="'red'" />
</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>
- </div>
- </div>
- <div class="description">
- <div [innerHtml]="post.safeHtml"></div>
+ <h1 class="title">{{ post.title }}</h1>
+ <div class="details">
+ <div>Publié par : {{ post.author }}</div>
+ <div>
+ publié le :
+ {{ post.created_at | date : 'd MMM y' }}
</div>
</div>
+ <div class="description">
+ <div [innerHtml]="post.safeHtml"></div>
+ </div>
</div>
</div>
diff --git a/src/app/post/components/post-details/post-details.component.scss b/src/app/post/components/post-details/post-details.component.scss
index de48f4b3f..0219a7810 100644
--- a/src/app/post/components/post-details/post-details.component.scss
+++ b/src/app/post/components/post-details/post-details.component.scss
@@ -5,15 +5,47 @@
@import 'hyperlink';
@import 'ghost';
+h1 {
+ @include font-bold-20;
+}
+
.postContainer {
- .chevronLeft {
- height: 24px;
- width: 24px;
- stroke: $black;
- margin-right: 10px;
+ display: flex;
+ flex-direction: column;
+ gap: 32px;
+ padding-block: 32px;
+
+ max-width: 1080px;
+ margin: auto;
+ width: 80%;
+}
+
+.gh-canvas {
+ display: flex;
+ flex-direction: column;
+ gap: 1rem;
+}
+
+.inline {
+ display: flex;
+ gap: 8px;
+}
+
+.title {
+ @include font-bold-20;
+ @media #{$large-phone} {
+ @include font-bold-18;
}
}
+.details {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ @include font-regular-14;
+ color: $grey-4-text;
+}
+
.informations {
@include font-regular-16;
div:nth-child(2n) {
diff --git a/src/app/post/components/post-details/post-details.component.ts b/src/app/post/components/post-details/post-details.component.ts
index 9a5301245..38502bbe6 100644
--- a/src/app/post/components/post-details/post-details.component.ts
+++ b/src/app/post/components/post-details/post-details.component.ts
@@ -2,6 +2,7 @@ import { Component, ElementRef, OnInit, Renderer2, ViewEncapsulation } from '@an
import { DomSanitizer } from '@angular/platform-browser';
import { ActivatedRoute } from '@angular/router';
import { RouterListenerService } from '../../../services/routerListener.service';
+import { ButtonTypeV3 } from '../../../shared/components/v3/button/button.type';
import { Post } from '../../models/post.model';
import { PostService } from '../../services/post.service';
@@ -13,6 +14,7 @@ import { PostService } from '../../services/post.service';
})
export class PostDetailsComponent implements OnInit {
public post: Post;
+ public buttonTypeEnumV3 = ButtonTypeV3;
constructor(
private activatedRoute: ActivatedRoute,
diff --git a/src/styles.scss b/src/styles.scss
index 3c9065377..397fcec46 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -519,6 +519,7 @@ button {
margin: 0 !important;
}
+// V3REMOVE
.backLink {
cursor: pointer;
color: $grey-2;
--
GitLab
From 00a6475a9ab3202b3e66a109d945c8ea0cd9c61c Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 14:47:02 +0100
Subject: [PATCH 06/16] adjust grid layout
---
.../components/post-list/post-list.component.scss | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 52fa72820..d811e61ce 100644
--- a/src/app/post/components/post-list/post-list.component.scss
+++ b/src/app/post/components/post-list/post-list.component.scss
@@ -46,7 +46,7 @@
}
@mixin twin-container($start) {
- margin-right: 40px;
+ // margin-right: 40px;
grid-column: $start / span 6;
::ng-deep .post .imageContainer .image {
height: 40vw;
@@ -58,7 +58,7 @@
}
@mixin triple-container-first {
- margin-right: 40px;
+ // margin-right: 40px;
grid-column: 1 / span 4;
::ng-deep .post .imageContainer .image {
height: 40vw;
@@ -69,7 +69,7 @@
}
}
@mixin triple-container {
- margin-right: 40px;
+ // margin-right: 40px;
grid-column: span 4;
::ng-deep .post .imageContainer .image {
height: 40vw;
@@ -82,9 +82,9 @@
.posts-container {
display: grid;
- grid-template-columns: repeat(auto-fill, minmax(7%, 1fr));
- grid-column-gap: 1%;
- grid-row-gap: 40px;
+ grid-template-columns: repeat(auto-fill, minmax(5%, 1fr));
+ grid-column-gap: 32px;
+ grid-row-gap: 32px;
max-width: 1080px;
.col:nth-child(6n + 1) {
@include big-container;
--
GitLab
From 434368b64278bd968fcce298823eeab3d8386c24 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 14:54:26 +0100
Subject: [PATCH 07/16] remove unused components
---
.../post-header/post-header.component.html | 3 +-
.../post-header/post-header.component.ts | 46 -------
.../post-modal-filters.component.html | 34 -----
.../post-modal-filters.component.scss | 122 ------------------
.../post-modal-filters.component.ts | 69 ----------
src/app/post/enum/typeModalNews.enum.ts | 4 -
src/app/post/post.module.ts | 2 -
7 files changed, 2 insertions(+), 278 deletions(-)
delete mode 100644 src/app/post/components/post-modal-filters/post-modal-filters.component.html
delete mode 100644 src/app/post/components/post-modal-filters/post-modal-filters.component.scss
delete mode 100644 src/app/post/components/post-modal-filters/post-modal-filters.component.ts
delete mode 100644 src/app/post/enum/typeModalNews.enum.ts
diff --git a/src/app/post/components/post-header/post-header.component.html b/src/app/post/components/post-header/post-header.component.html
index fefd4c2db..ed2b8621e 100644
--- a/src/app/post/components/post-header/post-header.component.html
+++ b/src/app/post/components/post-header/post-header.component.html
@@ -14,8 +14,9 @@
[ngClass]="{ active: tag.slug === mainActiveTag.slug || tag.name === mainActiveTag.slug }"
(click)="activateTag(tag)"
(keydown.enter)="activateTag(tag)"
- >{{ tag.name }}</span
>
+ {{ tag.name }}
+ </span>
</nav>
<app-button class="publish-button hide-on-mobile" [text]="'Publier votre actu'" (action)="togglePublishNews()" />
</div>
diff --git a/src/app/post/components/post-header/post-header.component.ts b/src/app/post/components/post-header/post-header.component.ts
index 4e713fabc..cb6c65205 100644
--- a/src/app/post/components/post-header/post-header.component.ts
+++ b/src/app/post/components/post-header/post-header.component.ts
@@ -1,7 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { TagEnum } from '../../enum/tag.enum';
-import { TypeModalNews } from '../../enum/typeModalNews.enum';
import { Tag } from '../../models/tag.model';
import { TagWithMeta } from '../../models/tagWithMeta.model';
import { parseSlugToTag } from '../utils/NewsUtils';
@@ -11,7 +10,6 @@ import { parseSlugToTag } from '../utils/NewsUtils';
styleUrls: ['./post-header.component.scss'],
})
export class PostHeaderComponent implements OnInit {
- public modalTypeOpened: TypeModalNews;
public tags: TagWithMeta;
public mainActiveTag: Tag = new Tag({ slug: TagEnum.aLaUne });
public tagEnum = TagEnum;
@@ -65,55 +63,11 @@ export class PostHeaderComponent implements OnInit {
return nameTagA.localeCompare(nameTagB);
}
- // Open the modal and display the list according to the right filter button
- public openModal(modalType: TypeModalNews): void {
- // if modal already opened, reset type
- if (this.modalTypeOpened === modalType) {
- this.closeModal();
- } else if (this.modalTypeOpened !== modalType) {
- this.modalTypeOpened = modalType;
- }
- }
-
- public closeModal(): void {
- this.modalTypeOpened = undefined;
- }
-
- // Accessor to template angular.
- public get TypeModal(): typeof TypeModalNews {
- return TypeModalNews;
- }
-
- public getModalData(): Tag[] {
- if (this.modalTypeOpened === this.TypeModal.public) {
- return this.tags.public;
- }
- return this.tags.commune;
- }
-
- public getCheckedModalData(): Tag[] {
- if (this.modalTypeOpened === this.TypeModal.public) {
- return this.checkedPublicTags;
- }
- return this.checkedLocationTags;
- }
-
public activateTag(tag: Tag): void {
this.mainActiveTag = tag;
this.setQueryParam();
}
- public filter(data: Tag[]): void {
- if (this.modalTypeOpened === this.TypeModal.public) {
- this.checkedPublicTags = data;
- } else {
- this.checkedLocationTags = data;
- }
-
- this.setQueryParam();
- this.closeModal();
- }
-
private setQueryParam(): void {
this.router.navigate(['/news'], {
relativeTo: this.route,
diff --git a/src/app/post/components/post-modal-filters/post-modal-filters.component.html b/src/app/post/components/post-modal-filters/post-modal-filters.component.html
deleted file mode 100644
index 9d66bdc0d..000000000
--- a/src/app/post/components/post-modal-filters/post-modal-filters.component.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div *ngIf="modalType" fxLayout="column" fxLayoutAlign="space-between" [ngClass]="['modal', 'modal' + getModalType()]">
- <div class="body-wrap" fxLayout="column" fxLayoutAlign="space-between">
- <div class="titleFilter" fxLayout="row" fxLayoutAlign="space-between">
- <span>Filtres</span>
- <div class="ico-close-details" tabindex="0" (click)="closeModal()" (keyup.enter)="closeModal()"></div>
- </div>
- <div *ngIf="tags.length > 0" class="contentModal" fxLayout="row wrap" fxLayoutAlign="flex-start">
- <div class="blockFiltre">
- <ul class="blockLigne">
- <div *ngFor="let tag of tags" fxLayout="row" class="ligneFiltre">
- <li class="checkbox">
- <div class="checkboxItem">
- <label>
- <input
- type="checkbox"
- [checked]="getIndex(checkedTags, tag.slug) > -1"
- [value]="tag.id"
- (change)="onCheckboxChange($event, tag)"
- />
- <span class="customCheck"></span>
- <div class="label">{{ tag.name }}</div>
- </label>
- </div>
- </li>
- </div>
- </ul>
- </div>
- </div>
- <div class="footer" fxLayout="row" fxLayoutAlign="end center" fxLayoutGap="3vw">
- <a tabindex="0" (click)="clearFilters()" (keyup.enter)="clearFilters()">Effacer</a>
- <app-button [text]="'Appliquer'" (click)="emit(checkedTags)" />
- </div>
- </div>
-</div>
diff --git a/src/app/post/components/post-modal-filters/post-modal-filters.component.scss b/src/app/post/components/post-modal-filters/post-modal-filters.component.scss
deleted file mode 100644
index cdfd4dab7..000000000
--- a/src/app/post/components/post-modal-filters/post-modal-filters.component.scss
+++ /dev/null
@@ -1,122 +0,0 @@
-@import 'icons';
-@import 'color';
-@import 'typography';
-@import 'breakpoint';
-@import 'shapes';
-@import 'hyperlink';
-@import 'z-index';
-
-.modallocation {
- margin-left: -341px;
-}
-.modalpublic {
- @media #{$desktop} {
- margin-left: -446px;
- }
- margin-left: -566px;
-}
-.modal {
- max-width: 341px;
- width: 94%;
- z-index: $modal-z-index !important;
- position: absolute;
- border-radius: 6px;
- margin-top: 24px;
- @media #{$large-phone} {
- height: 100%;
- max-height: auto;
- max-width: auto;
- width: 100%;
- position: fixed;
- top: 0;
- left: 0;
- border: none;
- padding: 0;
- }
- @include background-hash($grey-2);
- border: 1px solid $grey-5;
- .body-wrap {
- @media #{$large-phone} {
- height: 100vh;
- height: -webkit-fill-available;
- }
- .titleFilter {
- display: none !important;
- margin: 27px 25px 0px 25px;
- @include font-bold-26;
- @media #{$large-phone} {
- display: flex !important;
- }
- }
- }
- .contentModal {
- overflow-y: auto;
- max-width: 1100px;
- border-bottom: 1px solid $grey;
- margin-bottom: 16px;
- max-height: 40vh;
- @media #{$large-phone} {
- max-height: none;
- height: 100%;
- }
- .blockFiltre {
- width: 100%;
- margin: 0 32px;
- padding: 40px 0;
- border-bottom: 1px dashed $grey-5;
-
- &:last-child {
- padding-bottom: 32px;
- border-bottom: none;
- }
- @media #{$large-phone} {
- margin: 0 18px;
- padding: 25px 0;
- }
- }
- .blockLigne {
- padding-left: 0;
- -moz-column-count: 1;
- -moz-column-gap: 46px;
- -webkit-column-count: 1;
- -webkit-column-gap: 46px;
- column-count: 1;
- column-gap: 46px;
- margin: 0px;
- @media #{$large-phone} {
- -moz-column-count: 1;
- -webkit-column-count: 1;
- column-count: 1;
- }
- }
- .ligneFiltre {
- padding: 5px 0;
- }
- h4 {
- @include font-bold-16;
- line-height: 17px;
- text-transform: uppercase;
- color: $grey-3;
- display: flex;
- align-items: center;
- margin-top: 0;
- margin-bottom: 9px;
- }
- .nbResult {
- @include font-regular-14;
- line-height: 16px;
- color: $grey-3;
- padding-top: 3px;
- }
- label {
- @include font-regular-14;
- }
- }
- .footer {
- margin: 0px 20px 16px 0;
- height: 32px;
- }
-}
-a {
- @include hyperlink;
-}
diff --git a/src/app/post/components/post-modal-filters/post-modal-filters.component.ts b/src/app/post/components/post-modal-filters/post-modal-filters.component.ts
deleted file mode 100644
index 5b1b37504..000000000
--- a/src/app/post/components/post-modal-filters/post-modal-filters.component.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
-import { Tag } from '../../models/tag.model';
-import { TypeModalNews } from '../../enum/typeModalNews.enum';
-
-@Component({
- selector: 'app-post-modal-filters',
- templateUrl: './post-modal-filters.component.html',
- styleUrls: ['./post-modal-filters.component.scss'],
-})
-export class PostModalFiltersComponent implements OnInit, OnChanges {
- @Input() public modalType: TypeModalNews;
- @Input() public tags: Tag[];
- @Output() searchEvent = new EventEmitter();
- @Output() closeEvent = new EventEmitter();
- // Checkbox variable
- @Input() public inputCheckedTags: Tag[] = [];
- public checkedTags: Tag[] = [];
-
- ngOnChanges(changes: SimpleChanges): void {
- if (changes.inputCheckedTags) {
- this.checkedTags = this.inputCheckedTags;
- }
- }
-
- ngOnInit(): void {
- this.checkedTags = this.inputCheckedTags;
- }
-
- // Management of the checkbox event (Check / Uncheck)
- public onCheckboxChange(event, tag: Tag): void {
- if (event.target.checked) {
- this.checkedTags.push(tag);
- } else {
- // Check if the module is present in the list and remove it
- if (this.getIndex(this.checkedTags, tag.slug) > -1) {
- this.checkedTags.splice(this.getIndex(this.checkedTags, tag.slug), 1);
- }
- }
- }
-
- // Clear only filters in the current modal
- public clearFilters(): void {
- this.checkedTags = [];
- this.searchEvent.emit(this.checkedTags);
- }
-
- public getModalType(): string {
- switch (this.modalType) {
- case TypeModalNews.location:
- return 'location';
- case TypeModalNews.public:
- return 'public';
- default:
- return '';
- }
- }
-
- public emit(data: Tag[]): void {
- this.searchEvent.emit(data);
- }
-
- public getIndex(array: Tag[], slug: string): number {
- return array.findIndex((tag: Tag) => tag.slug === slug);
- }
-
- public closeModal(): void {
- this.closeEvent.emit();
- }
-}
diff --git a/src/app/post/enum/typeModalNews.enum.ts b/src/app/post/enum/typeModalNews.enum.ts
deleted file mode 100644
index d15c4e702..000000000
--- a/src/app/post/enum/typeModalNews.enum.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum TypeModalNews {
- public = 1,
- location,
-}
diff --git a/src/app/post/post.module.ts b/src/app/post/post.module.ts
index cacd65b3d..4cace1f05 100644
--- a/src/app/post/post.module.ts
+++ b/src/app/post/post.module.ts
@@ -5,7 +5,6 @@ import { PostCardComponent } from './components/post-card/post-card.component';
import { PostDetailsComponent } from './components/post-details/post-details.component';
import { PostHeaderComponent } from './components/post-header/post-header.component';
import { PostListComponent } from './components/post-list/post-list.component';
-import { PostModalFiltersComponent } from './components/post-modal-filters/post-modal-filters.component';
import { PostPublishComponent } from './components/post-publish/post-publish.component';
import { NewsComponent } from './news.component';
import { PostRoutingModule } from './post-routing.module';
@@ -18,7 +17,6 @@ import { TagResolver } from './resolvers/tags.resolver';
PostListComponent,
PostDetailsComponent,
PostCardComponent,
- PostModalFiltersComponent,
PostPublishComponent,
],
imports: [CommonModule, PostRoutingModule, SharedModule],
--
GitLab
From 1cb3e87232732685775d7899630a1e74396be06f Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 15:04:04 +0100
Subject: [PATCH 08/16] publish
---
.../post-publish/post-publish.component.html | 74 +++++++++----------
.../post-publish/post-publish.component.scss | 67 ++++++-----------
.../post-publish/post-publish.component.ts | 2 +
3 files changed, 58 insertions(+), 85 deletions(-)
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 dadacd4ca..eb674b2b4 100644
--- a/src/app/post/components/post-publish/post-publish.component.html
+++ b/src/app/post/components/post-publish/post-publish.component.html
@@ -1,46 +1,38 @@
<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'" />
- </svg>
- <span>Retour</span>
- </div>
+ <div class="container">
+ <div class="goBack">
+ <app-v3-button
+ [label]="'Retour'"
+ [variant]="buttonTypeEnumV3.Tertiary"
+ [iconFolder]="'ico'"
+ [iconName]="'arrowBackV3'"
+ (action)="backToPosts()"
+ />
</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'" />
- </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>
+
+ <h2>Publier votre actualité</h2>
+ <div class="image">
+ <svg aria-hidden="true">
+ <use [attr.xlink:href]="'../../../../assets/post/sprite.svg#publishLogo'" />
+ </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>
+ <p>Si votre actualité existe déjà sur un autre site, envoyez-nous simplement son adresse URL.</p>
+ </div>
+ <div>
+ <app-v3-button
+ routerLink="'mailto:inclusionnumerique@grandlyon.com?subject=Nouvelle actualité à intégrer&body=' + bodyMail"
+ [label]="'Envoyer votre actu par mail'"
+ [variant]="buttonTypeEnumV3.Primary"
+ (action)="backToPosts()"
+ />
</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 aca461ef2..53ccd5970 100644
--- a/src/app/post/components/post-publish/post-publish.component.scss
+++ b/src/app/post/components/post-publish/post-publish.component.scss
@@ -2,53 +2,32 @@
@import 'typography';
@import 'layout';
-$margin-post: 20px;
-
-.container {
- margin: $margin-post 0 100px 0;
- min-height: calc(
- var(--vh, 1vh) * 100 - #{$header-height} - #{$footer-height} - #{$header-post-height} - #{$margin-post} * 2
- );
+.goBack {
+ display: flex;
width: 100%;
-}
-.chevronLeft {
- height: 24px;
- width: 24px;
- stroke: $black;
- margin-right: 10px;
+ justify-content: flex-start;
}
-.content {
- color: $grey-1;
- h2 {
- @include font-bold-30;
- margin: 0;
- }
- .image {
- width: 100%;
- text-align: center;
- svg {
- max-width: 300px;
- height: 300px;
- }
- }
- .informations {
- @include font-regular-18;
- ul {
- margin: 0;
- padding: 0;
- list-style: none;
- }
- p {
- margin: 0;
- }
- }
+.container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 1rem;
+ padding-block: 32px;
+}
- a {
- text-decoration: none;
- width: auto;
- padding: 10.5px 24px;
- @include font-regular-16;
- font-size: 16px;
+h2 {
+ @include font-bold-30;
+ margin: 0;
+}
+.image {
+ width: 100%;
+ text-align: center;
+ svg {
+ max-width: 300px;
+ height: 300px;
}
}
+.informations {
+ @include font-regular-18;
+}
diff --git a/src/app/post/components/post-publish/post-publish.component.ts b/src/app/post/components/post-publish/post-publish.component.ts
index 65354cf3e..f263528c4 100644
--- a/src/app/post/components/post-publish/post-publish.component.ts
+++ b/src/app/post/components/post-publish/post-publish.component.ts
@@ -1,5 +1,6 @@
import { Component } from '@angular/core';
import { Router } from '@angular/router';
+import { ButtonTypeV3 } from '../../../shared/components/v3/button/button.type';
@Component({
selector: 'app-post-publish',
@@ -8,6 +9,7 @@ import { Router } from '@angular/router';
})
export class PostPublishComponent {
constructor(private router: Router) {}
+ public buttonTypeEnumV3 = ButtonTypeV3;
public bodyMail =
"Bonjour,%0D Je souhaite ajouter cette publication sur Rés'in :%0D- Titre :%0D- Texte :%0D- Auteur :%0D- Image : à joindre en pièce jointe";
--
GitLab
From 3e016e3dc5aca757c9b4e950470abb42390195ea Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 6 Dec 2023 15:09:15 +0100
Subject: [PATCH 09/16] cleanup
---
src/app/post/components/post-list/post-list.component.scss | 3 ---
1 file changed, 3 deletions(-)
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 d811e61ce..da0c18682 100644
--- a/src/app/post/components/post-list/post-list.component.scss
+++ b/src/app/post/components/post-list/post-list.component.scss
@@ -46,7 +46,6 @@
}
@mixin twin-container($start) {
- // margin-right: 40px;
grid-column: $start / span 6;
::ng-deep .post .imageContainer .image {
height: 40vw;
@@ -58,7 +57,6 @@
}
@mixin triple-container-first {
- // margin-right: 40px;
grid-column: 1 / span 4;
::ng-deep .post .imageContainer .image {
height: 40vw;
@@ -69,7 +67,6 @@
}
}
@mixin triple-container {
- // margin-right: 40px;
grid-column: span 4;
::ng-deep .post .imageContainer .image {
height: 40vw;
--
GitLab
From baf93ab4f8a74a5d1432a9fb073d721a74576aa9 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Thu, 7 Dec 2023 08:58:54 +0100
Subject: [PATCH 10/16] fix conflict
---
.../components/post-details/post-details.component.ts | 2 +-
.../components/post-header/post-header.component.html | 8 +++++++-
.../components/post-header/post-header.component.scss | 4 ----
.../components/post-publish/post-publish.component.ts | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/app/post/components/post-details/post-details.component.ts b/src/app/post/components/post-details/post-details.component.ts
index 38502bbe6..9910ac53a 100644
--- a/src/app/post/components/post-details/post-details.component.ts
+++ b/src/app/post/components/post-details/post-details.component.ts
@@ -2,7 +2,7 @@ import { Component, ElementRef, OnInit, Renderer2, ViewEncapsulation } from '@an
import { DomSanitizer } from '@angular/platform-browser';
import { ActivatedRoute } from '@angular/router';
import { RouterListenerService } from '../../../services/routerListener.service';
-import { ButtonTypeV3 } from '../../../shared/components/v3/button/button.type';
+import { ButtonTypeV3 } from '../../../shared/components/v3/button/button-type.enum';
import { Post } from '../../models/post.model';
import { PostService } from '../../services/post.service';
diff --git a/src/app/post/components/post-header/post-header.component.html b/src/app/post/components/post-header/post-header.component.html
index ed2b8621e..579a9fa6c 100644
--- a/src/app/post/components/post-header/post-header.component.html
+++ b/src/app/post/components/post-header/post-header.component.html
@@ -18,6 +18,12 @@
{{ tag.name }}
</span>
</nav>
- <app-button class="publish-button hide-on-mobile" [text]="'Publier votre actu'" (action)="togglePublishNews()" />
+ <app-v3-button
+ class="publish-button hide-on-mobile"
+ [variant]="buttonTypeEnumV3.PrimaryBlack"
+ [label]="'Publier'"
+ [iconName]="'addV3'"
+ (action)="togglePublishNews()"
+ />
</div>
</div>
diff --git a/src/app/post/components/post-header/post-header.component.scss b/src/app/post/components/post-header/post-header.component.scss
index 986f0329d..4def009a7 100644
--- a/src/app/post/components/post-header/post-header.component.scss
+++ b/src/app/post/components/post-header/post-header.component.scss
@@ -48,8 +48,4 @@ header {
}
}
}
-
- app-button {
- margin-bottom: 4px;
- }
}
diff --git a/src/app/post/components/post-publish/post-publish.component.ts b/src/app/post/components/post-publish/post-publish.component.ts
index f263528c4..54b60c51d 100644
--- a/src/app/post/components/post-publish/post-publish.component.ts
+++ b/src/app/post/components/post-publish/post-publish.component.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { Router } from '@angular/router';
-import { ButtonTypeV3 } from '../../../shared/components/v3/button/button.type';
+import { ButtonTypeV3 } from '../../../shared/components/v3/button/button-type.enum';
@Component({
selector: 'app-post-publish',
--
GitLab
From 7e7f074e0e9c4ae3c68585514b942919dc969c92 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Thu, 7 Dec 2023 09:00:35 +0100
Subject: [PATCH 11/16] =?UTF-8?q?fix=20loading=20les=20+=20r=C3=A9centes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/post/components/post-list/post-list.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/post/components/post-list/post-list.component.ts b/src/app/post/components/post-list/post-list.component.ts
index 8e7142b14..42d2e61a3 100644
--- a/src/app/post/components/post-list/post-list.component.ts
+++ b/src/app/post/components/post-list/post-list.component.ts
@@ -31,9 +31,9 @@ export class PostListComponent implements OnInit {
constructor(private postService: PostService, private route: ActivatedRoute, private router: Router) {}
ngOnInit(): void {
- this.isLoading = true;
// Init APP news list
this.route.queryParams.subscribe((queryParams) => {
+ this.isLoading = true;
this.isPublishMode = false;
this.isInSection = false;
// If main tag is in route, set it
--
GitLab
From f8f26b97c1221fa6b1d9f273432854620f7e6e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Wed, 13 Dec 2023 13:32:03 +0000
Subject: [PATCH 12/16] Apply 1 suggestion(s) to 1 file(s)
---
src/app/post/components/post-card/post-card.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/post/components/post-card/post-card.component.html b/src/app/post/components/post-card/post-card.component.html
index 338dd01db..431b1a7f9 100644
--- a/src/app/post/components/post-card/post-card.component.html
+++ b/src/app/post/components/post-card/post-card.component.html
@@ -25,7 +25,7 @@
<div class="details">
<div>Publié par : {{ post.author }}</div>
<div>
- publié le :
+ Publié le :
{{ post.created_at | date : 'd MMM y' }}
</div>
<!-- TODO description -->
--
GitLab
From 4984fc51e49f915754877c272d093295aa6c88de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Wed, 13 Dec 2023 13:32:10 +0000
Subject: [PATCH 13/16] Apply 1 suggestion(s) to 1 file(s)
---
.../post/components/post-details/post-details.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 9744dcdec..e458c7cbf 100644
--- a/src/app/post/components/post-details/post-details.component.html
+++ b/src/app/post/components/post-details/post-details.component.html
@@ -15,7 +15,7 @@
<div class="details">
<div>Publié par : {{ post.author }}</div>
<div>
- publié le :
+ Publié le :
{{ post.created_at | date : 'd MMM y' }}
</div>
</div>
--
GitLab
From af373b9ce100fb6c9837b390f8347cdd6fdbcbd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Wed, 13 Dec 2023 13:51:24 +0000
Subject: [PATCH 14/16] Apply 1 suggestion(s) to 1 file(s)
---
.../components/post-card/post-card.component.html | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/app/post/components/post-card/post-card.component.html b/src/app/post/components/post-card/post-card.component.html
index 431b1a7f9..7a91951e2 100644
--- a/src/app/post/components/post-card/post-card.component.html
+++ b/src/app/post/components/post-card/post-card.component.html
@@ -8,12 +8,11 @@
>
<div class="imageContainer">
<img *ngIf="post.feature_image" alt="Image du post" [src]="post.feature_image" />
- <ng-container *ngIf="!post.feature_image">
- <img
- alt="image appels a projets"
- [src]="isAppelAProjet() ? '../../../../assets/post/aap.png' : '../../../../assets/post/placeholder.png'"
- />
- </ng-container>
+ <img
+ *ngIf="!post.feature_image"
+ alt="image appels a projets"
+ [src]="isAppelAProjet() ? '../../../../assets/post/aap.png' : '../../../../assets/post/placeholder.png'"
+ />
</div>
<div class="informations">
<div class="inline">
--
GitLab
From 47c21934ede9e2efbb376e1e10440b5141bf1b1c Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 13 Dec 2023 14:53:52 +0100
Subject: [PATCH 15/16] retours
---
.../post-card/post-card.component.html | 2 +-
.../post-publish/post-publish.component.html | 11 +-
.../post-publish/post-publish.component.scss | 33 +++-
src/assets/post/publishLogo.svg | 123 +++++++++++++++
src/assets/post/sprite.svg | 149 ------------------
5 files changed, 157 insertions(+), 161 deletions(-)
create mode 100644 src/assets/post/publishLogo.svg
delete mode 100644 src/assets/post/sprite.svg
diff --git a/src/app/post/components/post-card/post-card.component.html b/src/app/post/components/post-card/post-card.component.html
index 7a91951e2..aaac8e828 100644
--- a/src/app/post/components/post-card/post-card.component.html
+++ b/src/app/post/components/post-card/post-card.component.html
@@ -10,7 +10,7 @@
<img *ngIf="post.feature_image" alt="Image du post" [src]="post.feature_image" />
<img
*ngIf="!post.feature_image"
- alt="image appels a projets"
+ alt=""
[src]="isAppelAProjet() ? '../../../../assets/post/aap.png' : '../../../../assets/post/placeholder.png'"
/>
</div>
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 eb674b2b4..a423c56bc 100644
--- a/src/app/post/components/post-publish/post-publish.component.html
+++ b/src/app/post/components/post-publish/post-publish.component.html
@@ -10,27 +10,24 @@
/>
</div>
+ <img src="../../../../assets/post/publishLogo.svg" alt="" />
<h2>Publier votre actualité</h2>
- <div class="image">
- <svg aria-hidden="true">
- <use [attr.xlink:href]="'../../../../assets/post/sprite.svg#publishLogo'" />
- </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>
+ <li>l’image <span class="optional">(facultatif)</span></li>
</ul>
- <p>Si votre actualité existe déjà sur un autre site, envoyez-nous simplement son adresse URL.</p>
+ <p>Si votre actualité existe déjà sur un autre site, envoyez-nous simplement son adresse URL</p>
</div>
<div>
<app-v3-button
routerLink="'mailto:inclusionnumerique@grandlyon.com?subject=Nouvelle actualité à intégrer&body=' + bodyMail"
[label]="'Envoyer votre actu par mail'"
[variant]="buttonTypeEnumV3.Primary"
+ [wide]="true"
(action)="backToPosts()"
/>
</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 53ccd5970..d99ed2685 100644
--- a/src/app/post/components/post-publish/post-publish.component.scss
+++ b/src/app/post/components/post-publish/post-publish.component.scss
@@ -17,17 +17,42 @@
}
h2 {
- @include font-bold-30;
- margin: 0;
+ @include font-bold-24;
}
+
.image {
width: 100%;
text-align: center;
svg {
- max-width: 300px;
- height: 300px;
+ max-width: 200px;
+ height: 200px;
}
}
.informations {
@include font-regular-18;
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+
+ ul {
+ list-style: none; /* Remove default bullets */
+ margin: 0;
+ padding: 0;
+ }
+
+ ul li::before {
+ content: '\2022'; /* Add content: \2022 is the CSS Code/unicode for a bullet */
+ color: $red; /* Change the color */
+ // font-weight: bold; /* If you want it to be bold */
+ display: inline-block; /* Needed to add space between the bullet and the text */
+ width: 1em; /* Also needed for space (tweak if needed) */
+ }
+
+ p:last-child {
+ margin-top: 16px;
+ }
+
+ span.optional {
+ color: $grey-3;
+ }
}
diff --git a/src/assets/post/publishLogo.svg b/src/assets/post/publishLogo.svg
new file mode 100644
index 000000000..ad671b9fb
--- /dev/null
+++ b/src/assets/post/publishLogo.svg
@@ -0,0 +1,123 @@
+<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M22 102.5H48.5L99 106.5H180.75C183.097 106.5 185 104.597 185 102.25C185 99.9028 183.097 98 180.75 98H176.5C175.119 98 174 96.8807 174 95.5C174 94.1193 175.119 93 176.5 93H184.75C190.687 93 195.5 88.1871 195.5 82.25V78.5C195.5 74.3579 192.142 71 188 71C183.858 71 180.5 67.6421 180.5 63.5V61C180.5 57.9624 178.038 55.5 175 55.5C171.962 55.5 169.5 53.0376 169.5 50V46.25C169.5 41.1414 173.641 37 178.75 37H186.25C189.426 37 192 34.4256 192 31.25C192 28.0744 189.426 25.5 186.25 25.5H170.5C167.186 25.5 164.5 22.8137 164.5 19.5C164.5 16.1863 161.814 13.5 158.5 13.5H150.312C147.137 13.5 144.562 10.9256 144.562 7.75C144.562 4.57436 141.988 2 138.812 2H90.5C87.3244 2 84.75 4.57436 84.75 7.75C84.75 10.9256 82.1756 13.5 79 13.5H67.75C65.9551 13.5 64.5 12.0449 64.5 10.25C64.5 8.45507 63.0449 7 61.25 7H24.25C22.4551 7 21 8.45507 21 10.25C21 12.0449 19.5449 13.5 17.75 13.5H11C7.68629 13.5 5 16.1863 5 19.5C5 22.8137 7.68629 25.5 11 25.5H16C20.1421 25.5 23.5 28.8579 23.5 33V35C23.5 38.0376 21.0376 40.5 18 40.5C14.9624 40.5 12.5 42.9624 12.5 46V47C12.5 50.5899 15.4101 53.5 19 53.5H25C29.1421 53.5 32.5 56.8579 32.5 61C32.5 65.1421 29.1421 68.5 25 68.5H18.75C11.1561 68.5 5 74.6561 5 82.25V85.5C5 94.8888 12.6112 102.5 22 102.5Z"
+ fill="#FFDDDD" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M149.554 44.806C149.539 44.806 149.525 44.806 149.51 44.806C149.496 44.806 149.481 44.806 149.467 44.806H135.821C135.799 44.8062 135.776 44.8063 135.754 44.8063C135.732 44.8063 135.709 44.8062 135.687 44.806H135.403V44.7973C131.865 44.6148 129.052 41.6883 129.052 38.1048C129.052 34.4036 132.053 31.4033 135.754 31.4033C135.872 31.4033 135.99 31.4063 136.107 31.4124L136.107 31.403C136.107 24.0007 142.108 18 149.51 18C154.631 18 159.081 20.8714 161.337 25.0918C161.624 25.0668 161.914 25.054 162.208 25.054C167.662 25.054 172.083 29.4756 172.083 34.9299C172.083 35.171 172.075 35.4101 172.058 35.6469C174.437 35.8148 176.316 37.7984 176.316 40.2206C176.316 42.753 174.263 44.8059 171.73 44.8059C171.612 44.8059 171.495 44.8014 171.38 44.7927V44.806H149.554Z"
+ fill="white" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M24 46.9825C23.8347 46.9941 23.668 47 23.5 47C19.3579 47 16 43.4183 16 39C16 34.5817 19.3579 31 23.5 31C25.2006 31 26.769 31.6037 28.0271 32.6212C28.4631 25.575 34.1046 20 41 20C42.7774 20 44.4714 20.3704 46.0145 21.0409C48.7381 17.9455 52.6804 16 57.0658 16C65.2847 16 71.9474 22.8335 71.9474 31.2632C71.9474 32.6076 71.7779 33.9114 71.4596 35.1534C73.542 36.0488 75.0002 38.1187 75.0002 40.5292C75.0002 43.7595 72.3815 46.3782 69.1512 46.3782C69.1006 46.3782 69.0502 46.3775 69 46.3763V47H41H24V46.9825Z"
+ fill="white" />
+ <rect width="109.134" height="109.134" transform="matrix(0.866025 0.5 -0.866025 0.5 99.7188 90.8662)"
+ fill="#A0C7F0" />
+ <path
+ d="M99.7216 74.0342L194.231 126.054L194.234 128.601L99.7216 183.168L5.20884 128.601L5.20904 126.053L99.7216 74.0342Z"
+ fill="#4277AF" />
+ <rect width="109.134" height="109.134" transform="matrix(0.866025 0.5 -0.866025 0.5 99.7188 71.4873)"
+ fill="url(#paint0_linear_14622_27034)" />
+ <rect width="96.8723" height="64.765" rx="3" transform="matrix(0.866025 0.5 -0.866025 0.5 82.9138 86.6905)"
+ fill="#769FCB" />
+ <path
+ d="M35.9131 112.14C34.6549 111.417 34.0345 110.46 34.0345 109.512L34 115.036C34 115.984 34.6205 116.94 35.8786 117.664L108.939 159.848L108.973 154.324L35.9131 112.14Z"
+ fill="#4277AF" />
+ <path
+ d="M158.681 129.161C158.681 129.377 158.638 129.601 158.569 129.816C158.56 129.842 158.56 129.86 158.552 129.885C158.483 130.084 158.379 130.282 158.25 130.48C158.224 130.514 158.207 130.549 158.181 130.583C158.043 130.773 157.871 130.963 157.673 131.144C157.543 131.264 157.38 131.368 157.225 131.48C157.095 131.574 156.983 131.669 156.828 131.755L117.988 154.325C117.609 154.549 117.178 154.721 116.739 154.877C116.584 154.928 116.42 154.98 116.256 155.023C116.049 155.083 115.834 155.135 115.619 155.178C115.36 155.23 115.11 155.282 114.843 155.307C114.783 155.316 114.714 155.325 114.653 155.333C114.3 155.368 113.938 155.394 113.585 155.394C113.525 155.394 113.473 155.394 113.412 155.394C113.059 155.394 112.706 155.368 112.353 155.333C112.301 155.325 112.249 155.325 112.197 155.316C111.853 155.273 111.508 155.213 111.172 155.144C111.112 155.126 111.051 155.118 110.991 155.101C110.689 155.023 110.388 154.937 110.103 154.833C110.052 154.816 110 154.799 109.948 154.782C109.604 154.652 109.276 154.497 108.974 154.325L108.94 159.849C109.224 160.013 109.535 160.159 109.853 160.288C109.871 160.297 109.888 160.297 109.905 160.306C109.957 160.323 110.009 160.34 110.06 160.357C110.241 160.426 110.431 160.495 110.62 160.547C110.724 160.581 110.836 160.599 110.939 160.624C111 160.642 111.06 160.659 111.12 160.668C111.172 160.676 111.224 160.693 111.284 160.711C111.491 160.754 111.706 160.788 111.913 160.823C111.991 160.831 112.068 160.84 112.146 160.849C112.197 160.857 112.249 160.857 112.301 160.866C112.378 160.874 112.456 160.883 112.534 160.892C112.74 160.909 112.956 160.917 113.163 160.926C113.232 160.926 113.3 160.926 113.361 160.926C113.421 160.926 113.473 160.926 113.533 160.926C113.628 160.926 113.723 160.926 113.818 160.926C114.059 160.917 114.291 160.9 114.524 160.883C114.55 160.883 114.576 160.874 114.602 160.874C114.662 160.866 114.731 160.857 114.791 160.849C114.972 160.823 115.153 160.805 115.334 160.771C115.412 160.754 115.489 160.728 115.567 160.711C115.782 160.668 115.998 160.607 116.205 160.556C116.317 160.521 116.437 160.504 116.541 160.469C116.592 160.452 116.635 160.426 116.679 160.409C117.118 160.254 117.549 160.082 117.928 159.858L156.768 137.288C156.794 137.271 156.82 137.253 156.845 137.245C156.966 137.176 157.052 137.09 157.164 137.012C157.319 136.9 157.483 136.797 157.612 136.676C157.621 136.667 157.647 136.659 157.655 136.642C157.802 136.504 157.94 136.366 158.052 136.219C158.078 136.185 158.095 136.15 158.121 136.116C158.147 136.081 158.164 136.047 158.19 136.013C158.233 135.952 158.276 135.9 158.31 135.84C158.379 135.72 158.431 135.599 158.483 135.478C158.491 135.461 158.491 135.444 158.5 135.427C158.509 135.401 158.509 135.383 158.517 135.358C158.543 135.28 158.569 135.202 158.586 135.125C158.612 135.004 158.621 134.884 158.629 134.763C158.629 134.746 158.629 134.728 158.629 134.711L158.681 129.161Z"
+ fill="#A0C7F1" />
+ <path
+ d="M156.793 126.532C159.292 127.971 159.301 130.307 156.819 131.746L117.979 154.315C115.506 155.755 111.473 155.755 108.974 154.315L35.9137 112.141C33.4146 110.702 33.4146 108.358 35.8879 106.927L74.7275 84.3488C77.2094 82.9097 81.2339 82.9097 83.733 84.3488L156.793 126.532Z"
+ fill="#EDF7FF" />
+ <path d="M77.4526 83.4275L96.3597 120.397L158.553 129.885V128.412L96.8251 119.337L78.0042 83.2723L77.4526 83.4275Z"
+ fill="#A0C7F1" />
+ <path
+ d="M40.7609 114.21C40.6575 114.167 40.5627 114.124 40.4679 114.081C40.3731 114.038 40.2783 114.003 40.1835 113.952C40.0801 113.9 39.9939 113.84 39.8905 113.788C39.8216 113.745 39.744 113.71 39.6751 113.667C39.5803 113.607 39.4941 113.538 39.4079 113.469C39.3562 113.426 39.2959 113.391 39.2442 113.348C39.158 113.279 39.0891 113.202 39.0201 113.124C38.977 113.081 38.9339 113.047 38.8909 113.004C38.8391 112.943 38.7961 112.874 38.7444 112.814C38.7013 112.754 38.6496 112.702 38.6065 112.642C38.5634 112.581 38.5375 112.521 38.5117 112.452C38.4772 112.392 38.4341 112.323 38.4083 112.263C38.3049 112.004 38.2445 111.745 38.2445 111.478L38.2273 116.899C38.2273 117.097 38.2704 117.304 38.3307 117.502C38.3479 117.562 38.3652 117.623 38.391 117.683C38.4083 117.717 38.4341 117.761 38.4514 117.795C38.4944 117.881 38.5375 117.976 38.5892 118.062C38.6151 118.097 38.6409 118.131 38.6668 118.157C38.7271 118.243 38.7961 118.338 38.8736 118.424C38.9253 118.484 38.9856 118.536 39.046 118.588C39.1063 118.648 39.158 118.709 39.2269 118.769C39.2873 118.821 39.3648 118.872 39.4338 118.924C39.5113 118.976 39.5803 119.036 39.6578 119.088C39.7268 119.131 39.8043 119.165 39.8733 119.208C39.9681 119.269 40.0629 119.32 40.1663 119.372C40.2524 119.415 40.3559 119.458 40.4506 119.501C40.5454 119.544 40.6402 119.588 40.7436 119.631L120.672 151.025L120.689 145.604L40.7609 114.21Z"
+ fill="#4277AF" />
+ <path
+ d="M157.032 119.743C157.023 119.777 157.014 119.812 157.006 119.838C156.971 119.95 156.928 120.07 156.876 120.182C156.859 120.217 156.851 120.243 156.833 120.277C156.756 120.415 156.67 120.544 156.566 120.682C156.532 120.725 156.489 120.768 156.446 120.811C156.351 120.923 156.247 121.036 156.127 121.139L128.559 144.751C128.352 144.924 128.119 145.087 127.869 145.225C127.809 145.26 127.74 145.294 127.68 145.329C127.49 145.432 127.292 145.518 127.085 145.604C126.999 145.639 126.913 145.673 126.827 145.699C126.663 145.759 126.499 145.803 126.327 145.846C126.146 145.897 125.956 145.949 125.767 145.984C125.534 146.027 125.301 146.07 125.06 146.104C125.008 146.113 124.957 146.121 124.905 146.13C124.586 146.165 124.267 146.182 123.948 146.182C123.897 146.182 123.845 146.182 123.802 146.182C123.483 146.182 123.164 146.165 122.854 146.13C122.811 146.121 122.768 146.121 122.716 146.113C122.406 146.078 122.096 146.018 121.794 145.949C121.734 145.932 121.682 145.923 121.622 145.906C121.303 145.828 120.993 145.734 120.7 145.613L120.682 151.033C120.906 151.12 121.13 151.197 121.363 151.266C121.441 151.292 121.527 151.301 121.604 151.326C121.665 151.344 121.716 151.352 121.777 151.37C121.837 151.387 121.897 151.404 121.966 151.413C122.147 151.447 122.337 151.482 122.527 151.507C122.587 151.516 122.639 151.516 122.699 151.525C122.742 151.533 122.785 151.533 122.837 151.542C122.914 151.551 122.992 151.559 123.078 151.568C123.259 151.585 123.449 151.594 123.63 151.594C123.681 151.594 123.733 151.594 123.785 151.594C123.836 151.594 123.888 151.594 123.931 151.594C124.026 151.594 124.112 151.594 124.207 151.594C124.414 151.585 124.629 151.576 124.836 151.551C124.853 151.551 124.871 151.542 124.896 151.542C124.948 151.533 125 151.525 125.052 151.516C125.224 151.499 125.396 151.473 125.569 151.447C125.638 151.439 125.689 151.413 125.758 151.404C125.948 151.361 126.137 151.318 126.318 151.266C126.422 151.24 126.525 151.223 126.629 151.189C126.697 151.171 126.758 151.137 126.818 151.111C126.904 151.077 126.99 151.051 127.077 151.016C127.283 150.93 127.482 150.844 127.671 150.74C127.732 150.706 127.801 150.68 127.861 150.637C127.887 150.62 127.913 150.611 127.938 150.594C128.162 150.465 128.361 150.318 128.55 150.154L156.118 126.542C156.153 126.508 156.187 126.482 156.222 126.447C156.308 126.37 156.368 126.292 156.437 126.215C156.471 126.172 156.523 126.129 156.558 126.085C156.566 126.077 156.575 126.068 156.583 126.06C156.67 125.948 156.747 125.836 156.808 125.723C156.816 125.706 156.816 125.698 156.825 125.68C156.842 125.646 156.851 125.62 156.868 125.586C156.894 125.525 156.928 125.465 156.954 125.405C156.971 125.353 156.98 125.301 156.997 125.25C157.006 125.215 157.014 125.189 157.023 125.155C157.032 125.137 157.04 125.112 157.04 125.094C157.066 124.982 157.075 124.879 157.075 124.767C157.075 124.75 157.075 124.732 157.075 124.715L157.092 119.295C157.083 119.45 157.066 119.596 157.032 119.743Z"
+ fill="#A0C7F1" />
+ <path
+ d="M154.592 116.572C157.185 117.589 157.866 119.631 156.117 121.131L128.549 144.743C126.791 146.242 123.275 146.63 120.69 145.613L40.7612 114.211C38.1673 113.194 37.4778 111.16 39.2358 109.652L66.8037 86.0395C68.553 84.5401 72.0776 84.1523 74.6629 85.1692L154.592 116.572Z"
+ fill="#EDF7FF" />
+ <path
+ d="M66.8057 86.048L99.6647 113.452L156.834 120.269L157.093 119.303L99.6647 112.116L67.3658 85.643L66.8057 86.048Z"
+ fill="#A0C7F1" />
+ <path
+ d="M67.8948 51.5913C67.8948 51.5913 67.8083 47.5699 74.1985 49.9544C80.5808 52.3389 137.683 86.7688 137.683 86.7688C137.683 86.7688 135.173 96.4171 134.37 96.3935C133.575 96.3699 93.0464 98.6914 93.0464 98.6914L67.8948 51.5913Z"
+ fill="#823332" />
+ <path
+ d="M75.2245 49.294C75.1931 49.2783 75.1616 49.2547 75.1301 49.2389C75.075 49.2075 75.0121 49.176 74.957 49.1524C74.894 49.1209 74.8389 49.0973 74.776 49.0737C74.7681 49.0737 74.7602 49.0658 74.7524 49.0658C74.7445 49.0658 74.7366 49.0579 74.7287 49.0579C74.6815 49.0422 74.6422 49.0265 74.595 49.0107C74.532 48.9871 74.469 48.9714 74.4061 48.9556C74.3589 48.9399 74.3117 48.932 74.2723 48.9242C74.2644 48.9242 74.2566 48.9163 74.2408 48.9163C74.233 48.9163 74.2172 48.9084 74.2093 48.9084C74.1385 48.8927 74.0756 48.8848 74.0047 48.8769C73.926 48.8691 73.8552 48.8612 73.7765 48.8533H73.7686C73.7608 48.8533 73.7529 48.8533 73.7529 48.8533C73.6821 48.8533 73.6034 48.8455 73.5326 48.8455C73.446 48.8455 73.3673 48.8533 73.2807 48.8612L69.3223 49.2862C69.4797 49.2704 69.6292 49.2626 69.7866 49.2783C69.7944 49.2783 69.8023 49.2783 69.8102 49.2783C69.9676 49.2862 70.125 49.3098 70.2824 49.3413C70.2902 49.3413 70.306 49.3491 70.3138 49.3491C70.4634 49.3806 70.6208 49.4278 70.7703 49.4908C70.7782 49.4908 70.786 49.4986 70.7939 49.4986C70.9513 49.5616 71.1166 49.6403 71.274 49.7269L133.736 85.7858L137.694 85.3609L75.2245 49.294Z"
+ fill="#FF5D5C" />
+ <path
+ d="M140.22 90.1994C140.22 90.1916 140.22 90.1916 140.22 90.1837V90.1758C140.22 90.0735 140.212 89.9633 140.204 89.861C140.197 89.7273 140.181 89.6013 140.165 89.4676C140.157 89.3967 140.142 89.3338 140.126 89.2629C140.118 89.2157 140.11 89.1685 140.102 89.1213C140.094 89.0583 140.086 89.0032 140.071 88.9403C140.039 88.7908 139.984 88.6491 139.945 88.4996C139.913 88.3894 139.89 88.2792 139.85 88.169C139.772 87.9487 139.677 87.7362 139.583 87.5316C139.551 87.4608 139.528 87.3899 139.488 87.327C139.48 87.3191 139.48 87.3113 139.48 87.3034C139.394 87.146 139.307 86.9886 139.213 86.8469C139.15 86.7525 139.079 86.6581 139.016 86.5636L139.008 86.5558L139 86.5479C138.937 86.4692 138.874 86.3826 138.812 86.3118C138.756 86.241 138.693 86.178 138.631 86.1151C138.575 86.0521 138.512 85.997 138.457 85.9419C138.442 85.9262 138.426 85.9183 138.41 85.9026C138.402 85.8947 138.394 85.8947 138.394 85.8868C138.355 85.8554 138.324 85.816 138.284 85.7845C138.229 85.7373 138.174 85.6901 138.119 85.6507C138.064 85.6114 138.009 85.5642 137.946 85.5248C137.891 85.4855 137.836 85.4461 137.773 85.4147C137.749 85.3989 137.718 85.3832 137.694 85.3674L133.736 85.7924C133.987 85.9341 134.224 86.1072 134.436 86.3118C134.444 86.3197 134.452 86.3197 134.452 86.3275C134.672 86.5243 134.869 86.7446 135.05 86.9886L135.058 86.9965C135.239 87.2326 135.396 87.4923 135.538 87.7677C135.569 87.8306 135.593 87.9093 135.632 87.9723C135.727 88.1769 135.821 88.3894 135.9 88.6097C135.939 88.7199 135.963 88.8301 135.994 88.9403C136.049 89.1449 136.112 89.3495 136.152 89.562C136.159 89.6092 136.167 89.6564 136.175 89.7036C136.222 90.0027 136.262 90.3096 136.27 90.6165C136.27 90.6244 136.27 90.6244 136.27 90.6323C136.277 90.9628 136.262 91.2933 136.222 91.616C136.222 91.6238 136.222 91.6317 136.222 91.6475C136.183 91.978 136.112 92.3085 136.018 92.6233L124.072 132.94C124.009 133.16 123.93 133.365 123.851 133.561C123.851 133.569 123.843 133.577 123.843 133.585C123.765 133.774 123.67 133.955 123.568 134.12C123.56 134.136 123.552 134.152 123.536 134.167C123.442 134.325 123.348 134.466 123.237 134.6C123.222 134.624 123.198 134.647 123.182 134.671C123.072 134.805 122.954 134.939 122.836 135.057C122.757 135.128 122.679 135.19 122.592 135.261C122.529 135.309 122.474 135.364 122.403 135.411C122.317 135.474 122.222 135.521 122.128 135.576C122.065 135.608 122.002 135.655 121.939 135.686C121.837 135.734 121.726 135.773 121.624 135.812C121.569 135.836 121.514 135.859 121.451 135.875C121.286 135.922 121.113 135.954 120.939 135.977L124.898 135.552C125.071 135.537 125.244 135.497 125.409 135.45C125.465 135.434 125.527 135.403 125.583 135.387C125.693 135.348 125.795 135.316 125.897 135.261C125.96 135.23 126.023 135.19 126.086 135.151C126.181 135.096 126.267 135.049 126.362 134.986C126.425 134.939 126.488 134.884 126.551 134.836C126.629 134.773 126.716 134.71 126.795 134.632L126.802 134.624C126.897 134.529 126.991 134.435 127.078 134.333C127.101 134.309 127.125 134.278 127.141 134.246C127.157 134.223 127.172 134.199 127.196 134.175C127.219 134.144 127.251 134.112 127.275 134.073C127.33 133.994 127.385 133.916 127.432 133.837C127.456 133.805 127.471 133.774 127.487 133.735C127.495 133.719 127.503 133.703 127.519 133.687C127.534 133.664 127.55 133.632 127.566 133.609C127.605 133.538 127.644 133.467 127.676 133.396C127.707 133.325 127.747 133.255 127.778 133.176C127.778 133.168 127.786 133.16 127.786 133.152C127.786 133.144 127.794 133.137 127.794 133.129C127.818 133.074 127.841 133.018 127.865 132.963C127.896 132.893 127.92 132.822 127.943 132.743C127.967 132.672 127.991 132.593 128.014 132.523C128.014 132.515 128.014 132.515 128.014 132.507L139.961 92.1905C139.984 92.1196 140 92.0488 140.016 91.978C140.031 91.8993 140.055 91.8285 140.071 91.7498C140.086 91.6711 140.102 91.5924 140.118 91.5215C140.134 91.4428 140.142 91.3641 140.157 91.2854C140.157 91.2618 140.165 91.2382 140.165 91.2146C140.165 91.2067 140.165 91.1989 140.165 91.191C140.173 91.1438 140.181 91.0966 140.181 91.0494C140.189 90.9628 140.197 90.8762 140.204 90.7897C140.212 90.6952 140.212 90.6087 140.212 90.5142C140.22 90.3962 140.22 90.2939 140.22 90.1994Z"
+ fill="#FF5D5C" />
+ <path d="M110.081 117.626L59.0538 89.8621L58.7783 89.2404L109.805 117.005L110.081 117.626Z" fill="#767676" />
+ <mask id="path-20-inside-1_14622_27034" fill="white">
+ <path
+ d="M130.927 87.6656C131.186 86.8629 131.43 86.0681 131.659 85.2654C131.674 85.2103 131.69 85.1631 131.706 85.108C131.926 84.3367 132.131 83.5655 132.327 82.7943C132.359 82.6526 132.398 82.5188 132.438 82.3772C132.634 81.5981 132.815 80.8269 132.981 80.0478C133.012 79.8904 133.051 79.7408 133.083 79.5834C133.256 78.7965 133.414 78.0095 133.563 77.2304C133.571 77.1989 133.571 77.1753 133.579 77.1438C133.72 76.3805 133.854 75.625 133.972 74.8695C133.996 74.7278 134.019 74.5862 134.043 74.4445C134.161 73.7048 134.271 72.9729 134.366 72.2489C134.389 72.1072 134.405 71.9656 134.421 71.8239C134.523 71.0763 134.61 70.3444 134.696 69.6204C136.609 52.6612 134.366 38.118 134.342 37.9685L83.2993 10.212C83.3229 10.3537 85.5657 24.9048 83.6534 41.864C83.5747 42.588 83.4803 43.3277 83.378 44.0675C83.3622 44.2091 83.3386 44.3508 83.3229 44.4924C83.2206 45.2165 83.1183 45.9483 83.0002 46.6881C82.9766 46.8297 82.953 46.9714 82.9294 47.1131C82.8035 47.8607 82.6776 48.6162 82.5359 49.3874C82.528 49.4189 82.528 49.4425 82.5202 49.474C82.3706 50.2531 82.2132 51.0322 82.0401 51.827C82.0086 51.9844 81.9771 52.1339 81.9378 52.2913C81.7647 53.0625 81.5837 53.8416 81.3948 54.6129C81.3633 54.7545 81.324 54.8962 81.2846 55.03C81.0879 55.8012 80.8833 56.5724 80.6629 57.3437C80.6472 57.3988 80.6314 57.446 80.6157 57.5011C80.3875 58.2959 80.1435 59.0986 79.8838 59.8934C79.8287 60.0508 79.7815 60.2161 79.7264 60.3735C79.4667 61.1605 79.1991 61.9396 78.9158 62.7265C78.8529 62.8997 78.7899 63.0728 78.727 63.2381C78.5538 63.7103 78.365 64.1824 78.184 64.6546C78.1053 64.8592 78.0187 65.0638 77.94 65.2685C77.7354 65.7721 77.515 66.2836 77.2947 66.7873C77.2317 66.9211 77.1766 67.0627 77.1215 67.1965C76.8382 67.8261 76.5471 68.4478 76.248 69.0695C76.1693 69.2269 76.0906 69.3764 76.0119 69.5338C75.7758 70.006 75.5319 70.4782 75.2879 70.9504C75.162 71.1943 75.0282 71.4383 74.8944 71.6744C74.7764 71.8869 74.6583 72.1072 74.5403 72.3197C74.3829 72.603 74.2176 72.8863 74.0524 73.1696C73.9264 73.3742 73.8084 73.5867 73.6825 73.7913C73.5094 74.0746 73.3283 74.3658 73.1552 74.6491C73.0293 74.8459 72.9034 75.0426 72.7775 75.2394C72.5807 75.5384 72.384 75.8296 72.1872 76.1286C72.0692 76.3096 71.9511 76.4828 71.8252 76.6638C71.7465 76.7739 71.6678 76.8763 71.5891 76.9864C71.1799 77.5609 70.7628 78.1197 70.33 78.6784C70.2198 78.8279 70.1018 78.9775 69.9837 79.1191C69.4879 79.7408 68.9843 80.3547 68.4491 80.9606C68.3468 81.0708 68.2445 81.181 68.1422 81.299C67.7251 81.7633 67.2923 82.2277 66.8516 82.6762C66.7021 82.8258 66.5604 82.9753 66.4109 83.1248C65.8679 83.6678 65.3091 84.2029 64.7346 84.7302C64.7189 84.746 64.6953 84.7617 64.6795 84.7774C64.0972 85.3047 63.4834 85.8084 62.8616 86.312C62.6964 86.4458 62.5311 86.5717 62.3659 86.7055C61.7205 87.2092 61.0674 87.6971 60.3906 88.1693C60.3827 88.1771 60.3669 88.185 60.3591 88.1929C59.8397 88.5549 59.3045 88.909 58.7537 89.2474L109.781 117.004C110.324 116.665 110.859 116.311 111.386 115.949C111.386 115.949 111.394 115.949 111.394 115.941C111.402 115.934 111.41 115.926 111.418 115.926C112.094 115.454 112.748 114.966 113.393 114.47C113.558 114.344 113.724 114.21 113.889 114.076C114.51 113.581 115.116 113.069 115.707 112.542C115.722 112.526 115.738 112.518 115.754 112.502L115.762 112.495C116.336 111.975 116.895 111.44 117.438 110.889C117.588 110.74 117.737 110.59 117.879 110.441C118.319 109.984 118.752 109.528 119.169 109.063C119.24 108.985 119.319 108.906 119.398 108.819C119.421 108.788 119.445 108.756 119.476 108.725C120.004 108.127 120.515 107.513 121.011 106.883C121.129 106.734 121.239 106.592 121.357 106.443C121.79 105.884 122.207 105.325 122.608 104.751C122.663 104.68 122.719 104.609 122.766 104.538C122.789 104.499 122.813 104.46 122.845 104.428C122.97 104.255 123.081 104.074 123.207 103.893C123.403 103.602 123.608 103.303 123.797 103.004C123.923 102.807 124.049 102.602 124.174 102.406C124.355 102.122 124.529 101.839 124.702 101.556C124.828 101.351 124.954 101.139 125.072 100.934C125.237 100.651 125.402 100.367 125.56 100.084C125.678 99.8715 125.796 99.659 125.914 99.4466C125.992 99.3049 126.071 99.1632 126.15 99.0137C126.205 98.9114 126.252 98.8091 126.307 98.7147C126.551 98.2504 126.795 97.7782 127.031 97.306C127.11 97.1486 127.189 96.9991 127.267 96.8417C127.566 96.22 127.857 95.5983 128.141 94.9687C128.204 94.8349 128.259 94.6933 128.322 94.5595C128.542 94.0558 128.755 93.5521 128.959 93.0485C129.046 92.8439 129.125 92.6393 129.211 92.4347C129.4 91.9625 129.581 91.4903 129.754 91.0181C129.801 90.8922 129.849 90.7741 129.896 90.6482C129.911 90.601 129.927 90.5538 129.943 90.4987C130.226 89.7196 130.494 88.9326 130.754 88.1457C130.824 87.9883 130.872 87.823 130.927 87.6656Z" />
+ </mask>
+ <path
+ d="M130.927 87.6656C131.186 86.8629 131.43 86.0681 131.659 85.2654C131.674 85.2103 131.69 85.1631 131.706 85.108C131.926 84.3367 132.131 83.5655 132.327 82.7943C132.359 82.6526 132.398 82.5188 132.438 82.3772C132.634 81.5981 132.815 80.8269 132.981 80.0478C133.012 79.8904 133.051 79.7408 133.083 79.5834C133.256 78.7965 133.414 78.0095 133.563 77.2304C133.571 77.1989 133.571 77.1753 133.579 77.1438C133.72 76.3805 133.854 75.625 133.972 74.8695C133.996 74.7278 134.019 74.5862 134.043 74.4445C134.161 73.7048 134.271 72.9729 134.366 72.2489C134.389 72.1072 134.405 71.9656 134.421 71.8239C134.523 71.0763 134.61 70.3444 134.696 69.6204C136.609 52.6612 134.366 38.118 134.342 37.9685L83.2993 10.212C83.3229 10.3537 85.5657 24.9048 83.6534 41.864C83.5747 42.588 83.4803 43.3277 83.378 44.0675C83.3622 44.2091 83.3386 44.3508 83.3229 44.4924C83.2206 45.2165 83.1183 45.9483 83.0002 46.6881C82.9766 46.8297 82.953 46.9714 82.9294 47.1131C82.8035 47.8607 82.6776 48.6162 82.5359 49.3874C82.528 49.4189 82.528 49.4425 82.5202 49.474C82.3706 50.2531 82.2132 51.0322 82.0401 51.827C82.0086 51.9844 81.9771 52.1339 81.9378 52.2913C81.7647 53.0625 81.5837 53.8416 81.3948 54.6129C81.3633 54.7545 81.324 54.8962 81.2846 55.03C81.0879 55.8012 80.8833 56.5724 80.6629 57.3437C80.6472 57.3988 80.6314 57.446 80.6157 57.5011C80.3875 58.2959 80.1435 59.0986 79.8838 59.8934C79.8287 60.0508 79.7815 60.2161 79.7264 60.3735C79.4667 61.1605 79.1991 61.9396 78.9158 62.7265C78.8529 62.8997 78.7899 63.0728 78.727 63.2381C78.5538 63.7103 78.365 64.1824 78.184 64.6546C78.1053 64.8592 78.0187 65.0638 77.94 65.2685C77.7354 65.7721 77.515 66.2836 77.2947 66.7873C77.2317 66.9211 77.1766 67.0627 77.1215 67.1965C76.8382 67.8261 76.5471 68.4478 76.248 69.0695C76.1693 69.2269 76.0906 69.3764 76.0119 69.5338C75.7758 70.006 75.5319 70.4782 75.2879 70.9504C75.162 71.1943 75.0282 71.4383 74.8944 71.6744C74.7764 71.8869 74.6583 72.1072 74.5403 72.3197C74.3829 72.603 74.2176 72.8863 74.0524 73.1696C73.9264 73.3742 73.8084 73.5867 73.6825 73.7913C73.5094 74.0746 73.3283 74.3658 73.1552 74.6491C73.0293 74.8459 72.9034 75.0426 72.7775 75.2394C72.5807 75.5384 72.384 75.8296 72.1872 76.1286C72.0692 76.3096 71.9511 76.4828 71.8252 76.6638C71.7465 76.7739 71.6678 76.8763 71.5891 76.9864C71.1799 77.5609 70.7628 78.1197 70.33 78.6784C70.2198 78.8279 70.1018 78.9775 69.9837 79.1191C69.4879 79.7408 68.9843 80.3547 68.4491 80.9606C68.3468 81.0708 68.2445 81.181 68.1422 81.299C67.7251 81.7633 67.2923 82.2277 66.8516 82.6762C66.7021 82.8258 66.5604 82.9753 66.4109 83.1248C65.8679 83.6678 65.3091 84.2029 64.7346 84.7302C64.7189 84.746 64.6953 84.7617 64.6795 84.7774C64.0972 85.3047 63.4834 85.8084 62.8616 86.312C62.6964 86.4458 62.5311 86.5717 62.3659 86.7055C61.7205 87.2092 61.0674 87.6971 60.3906 88.1693C60.3827 88.1771 60.3669 88.185 60.3591 88.1929C59.8397 88.5549 59.3045 88.909 58.7537 89.2474L109.781 117.004C110.324 116.665 110.859 116.311 111.386 115.949C111.386 115.949 111.394 115.949 111.394 115.941C111.402 115.934 111.41 115.926 111.418 115.926C112.094 115.454 112.748 114.966 113.393 114.47C113.558 114.344 113.724 114.21 113.889 114.076C114.51 113.581 115.116 113.069 115.707 112.542C115.722 112.526 115.738 112.518 115.754 112.502L115.762 112.495C116.336 111.975 116.895 111.44 117.438 110.889C117.588 110.74 117.737 110.59 117.879 110.441C118.319 109.984 118.752 109.528 119.169 109.063C119.24 108.985 119.319 108.906 119.398 108.819C119.421 108.788 119.445 108.756 119.476 108.725C120.004 108.127 120.515 107.513 121.011 106.883C121.129 106.734 121.239 106.592 121.357 106.443C121.79 105.884 122.207 105.325 122.608 104.751C122.663 104.68 122.719 104.609 122.766 104.538C122.789 104.499 122.813 104.46 122.845 104.428C122.97 104.255 123.081 104.074 123.207 103.893C123.403 103.602 123.608 103.303 123.797 103.004C123.923 102.807 124.049 102.602 124.174 102.406C124.355 102.122 124.529 101.839 124.702 101.556C124.828 101.351 124.954 101.139 125.072 100.934C125.237 100.651 125.402 100.367 125.56 100.084C125.678 99.8715 125.796 99.659 125.914 99.4466C125.992 99.3049 126.071 99.1632 126.15 99.0137C126.205 98.9114 126.252 98.8091 126.307 98.7147C126.551 98.2504 126.795 97.7782 127.031 97.306C127.11 97.1486 127.189 96.9991 127.267 96.8417C127.566 96.22 127.857 95.5983 128.141 94.9687C128.204 94.8349 128.259 94.6933 128.322 94.5595C128.542 94.0558 128.755 93.5521 128.959 93.0485C129.046 92.8439 129.125 92.6393 129.211 92.4347C129.4 91.9625 129.581 91.4903 129.754 91.0181C129.801 90.8922 129.849 90.7741 129.896 90.6482C129.911 90.601 129.927 90.5538 129.943 90.4987C130.226 89.7196 130.494 88.9326 130.754 88.1457C130.824 87.9883 130.872 87.823 130.927 87.6656Z"
+ fill="white" stroke="#A0C7F1" stroke-width="2" mask="url(#path-20-inside-1_14622_27034)" />
+ <path d="M134.335 37.9768L83.3 10.2125L83.9611 10L134.988 37.7564L134.335 37.9768Z" fill="#769FCB" />
+ <path
+ d="M134.988 37.7563C135.012 37.898 137.27 52.5593 135.35 69.6129C133.564 85.3995 127.74 106.545 110.081 117.618L109.805 116.996C127.181 106.113 132.926 85.2264 134.681 69.6208C136.594 52.6616 134.351 38.1184 134.327 37.9688L134.988 37.7563Z"
+ fill="#769FCB" />
+ <path
+ d="M115.258 36.5116C115.573 36.6926 115.817 37.1254 115.817 37.4796V38.1249C115.817 38.479 115.565 38.6207 115.25 38.4397L89.5714 23.6132C89.2645 23.44 89.0127 22.9993 89.0127 22.6531V22.0077C89.0127 21.6536 89.2645 21.512 89.5714 21.6851L115.258 36.5116Z"
+ fill="#5B5B5B" />
+ <path
+ d="M125.803 54.6995C125.977 54.8018 126.118 55.0457 126.118 55.2425C126.118 55.4471 125.977 55.5258 125.803 55.4235L88.4696 33.8763C88.2964 33.774 88.1548 33.53 88.1548 33.3332C88.1548 33.1286 88.2964 33.0499 88.4696 33.1522L125.803 54.6995Z"
+ fill="#5B5B5B" />
+ <path
+ d="M109.999 51.1355C110.172 51.2379 110.314 51.4818 110.314 51.6786C110.314 51.8832 110.172 51.9619 109.999 51.8596L87.7435 39.0162C87.5704 38.9139 87.4287 38.6699 87.4287 38.4732C87.4287 38.2686 87.5704 38.1899 87.7435 38.2922L109.999 51.1355Z"
+ fill="#5B5B5B" />
+ <path
+ d="M111.901 56.5013C112.075 56.6036 112.216 56.8476 112.216 57.0443C112.216 57.2489 112.075 57.3276 111.901 57.2253L87.411 43.0835C87.2378 42.9812 87.0962 42.7372 87.0962 42.5405C87.0962 42.3358 87.2378 42.2572 87.411 42.3595L111.901 56.5013Z"
+ fill="#5B5B5B" />
+ <path
+ d="M101.185 54.4087C101.359 54.511 101.5 54.755 101.5 54.9517C101.5 55.1563 101.359 55.235 101.185 55.1327L86.6659 46.7515C86.4927 46.6492 86.3511 46.4052 86.3511 46.2085C86.3511 46.0039 86.4927 45.9252 86.6659 46.0275L101.185 54.4087Z"
+ fill="#5B5B5B" />
+ <path
+ d="M121.864 77.5216C122.037 77.6239 122.179 77.8679 122.179 78.0646C122.179 78.2692 122.037 78.3479 121.864 78.2456L84.5301 56.6984C84.357 56.5961 84.2153 56.3521 84.2153 56.1554C84.2153 55.9508 84.357 55.8721 84.5301 55.9744L121.864 77.5216Z"
+ fill="#5B5B5B" />
+ <path
+ d="M105.276 72.3833C105.449 72.4857 105.591 72.7296 105.591 72.9264C105.591 73.131 105.449 73.2097 105.276 73.1074L83.0208 60.264C82.8477 60.1617 82.7061 59.9177 82.7061 59.721C82.7061 59.5164 82.8477 59.4377 83.0208 59.54L105.276 72.3833Z"
+ fill="#5B5B5B" />
+ <path
+ d="M106.398 77.7499C106.571 77.8522 106.713 78.0962 106.713 78.2929C106.713 78.4975 106.571 78.5762 106.398 78.4739L81.9078 64.3321C81.7347 64.2298 81.593 63.9858 81.593 63.7891C81.593 63.5844 81.7347 63.5057 81.9078 63.6081L106.398 77.7499Z"
+ fill="#5B5B5B" />
+ <path
+ d="M95.6673 75.656C95.8405 75.7583 95.9821 76.0022 95.9821 76.199C95.9821 76.4036 95.8405 76.4823 95.6673 76.38L81.1556 67.9987C80.9825 67.8964 80.8408 67.6525 80.8408 67.4557C80.8408 67.259 80.9903 67.1724 81.1556 67.2747L95.6673 75.656Z"
+ fill="#5B5B5B" />
+ <path
+ d="M133.726 85.7774L95.1333 92.6082L70.2808 49.3328C68.5494 48.955 66.8496 50.1197 66.2043 52.2996L54.2581 92.6161C53.4868 95.2131 54.502 98.2666 56.5324 99.4391L118.994 135.498C121.025 136.671 123.299 135.514 124.062 132.917L136.009 92.6004C136.78 90.0034 135.757 86.9499 133.726 85.7774Z"
+ fill="#DA3635" />
+ <path
+ d="M142.676 68.3538C143.069 68.3236 143.402 68.2177 143.689 68.0514L146.956 66.1613C146.668 66.3276 146.336 66.4334 145.942 66.4788L142.676 68.3538Z"
+ fill="#FF5D5C" />
+ <path
+ d="M149.753 70.1376L153.019 68.2475C153.835 67.7636 154.501 66.8412 154.849 65.2383L151.582 67.1285C151.25 68.7313 150.584 69.6537 149.753 70.1376Z"
+ fill="#FF5D5C" />
+ <path
+ d="M167.474 51.5539L146.184 39.2604C145.654 38.958 145.186 38.9277 144.838 39.1243L141.572 41.0145C141.92 40.8179 142.388 40.8481 142.918 41.1505L164.208 53.4441C165.252 54.0489 166.083 55.5005 166.083 56.6951L166.038 73.2982C166.038 73.8879 165.826 74.3113 165.493 74.5079L168.76 72.6177C169.092 72.4211 169.304 71.9977 169.304 71.408L169.349 54.805C169.364 53.6104 168.518 52.1436 167.474 51.5539Z"
+ fill="#FF5D5C" />
+ <mask id="path-36-inside-2_14622_27034" fill="white">
+ <path
+ d="M164.211 53.4437C165.254 54.0485 166.086 55.5002 166.086 56.6947L166.041 73.2978C166.041 74.4924 165.194 74.9762 164.151 74.3714L151.585 67.1132C150.496 72.2091 146.187 70.4853 143.994 69.2151C143.193 68.7614 142.709 68.3834 142.678 68.3532C144.901 68.1566 145.31 65.6011 145.249 63.4539L142.875 62.0779C141.832 61.473 141 60.0214 141 58.8268L141.045 42.2238C141.045 41.0292 141.892 40.5453 142.936 41.1502L164.211 53.4437Z" />
+ </mask>
+ <path
+ d="M164.211 53.4437C165.254 54.0485 166.086 55.5002 166.086 56.6947L166.041 73.2978C166.041 74.4924 165.194 74.9762 164.151 74.3714L151.585 67.1132C150.496 72.2091 146.187 70.4853 143.994 69.2151C143.193 68.7614 142.709 68.3834 142.678 68.3532C144.901 68.1566 145.31 65.6011 145.249 63.4539L142.875 62.0779C141.832 61.473 141 60.0214 141 58.8268L141.045 42.2238C141.045 41.0292 141.892 40.5453 142.936 41.1502L164.211 53.4437Z"
+ fill="white" />
+ <path
+ d="M164.211 53.4437L164.462 53.0111L164.461 53.0108L164.211 53.4437ZM166.086 56.6947L166.586 56.6961V56.6947H166.086ZM166.041 73.2978L165.541 73.2964V73.2978H166.041ZM164.151 74.3714L164.401 73.9388L164.401 73.9384L164.151 74.3714ZM151.585 67.1132L151.835 66.6803L151.24 66.3364L151.096 67.0088L151.585 67.1132ZM143.994 69.2151L144.245 68.7824L144.24 68.7799L143.994 69.2151ZM142.678 68.3532L142.634 67.8551L141.568 67.9494L142.325 68.7067L142.678 68.3532ZM145.249 63.4539L145.749 63.4398L145.741 63.1611L145.5 63.0213L145.249 63.4539ZM142.875 62.0779L142.624 62.5105L142.624 62.5105L142.875 62.0779ZM141 58.8268L140.5 58.8255V58.8268H141ZM141.045 42.2238L141.545 42.2251V42.2238H141.045ZM142.936 41.1502L142.685 41.5827L142.685 41.5831L142.936 41.1502ZM163.96 53.8763C164.389 54.1246 164.801 54.5661 165.106 55.0975C165.412 55.629 165.586 56.2051 165.586 56.6947H166.586C166.586 55.9898 166.344 55.2428 165.973 54.5986C165.602 53.9544 165.077 53.3676 164.462 53.0111L163.96 53.8763ZM165.586 56.6934L165.541 73.2964L166.541 73.2992L166.586 56.6961L165.586 56.6934ZM165.541 73.2978C165.541 73.7882 165.371 74 165.24 74.0748C165.107 74.1504 164.833 74.1889 164.401 73.9388L163.9 74.804C164.512 75.1588 165.183 75.2577 165.734 74.9439C166.287 74.6294 166.541 74.002 166.541 73.2978H165.541ZM164.401 73.9384L151.835 66.6803L151.335 67.5462L163.9 74.8044L164.401 73.9384ZM151.096 67.0088C150.838 68.2138 150.404 68.9547 149.912 69.3993C149.426 69.8395 148.838 70.031 148.187 70.0517C146.849 70.0942 145.328 69.4098 144.245 68.7824L143.743 69.6477C144.853 70.2905 146.583 71.1031 148.219 71.0512C149.056 71.0246 149.887 70.7709 150.583 70.1408C151.275 69.5151 151.787 68.5606 152.074 67.2177L151.096 67.0088ZM144.24 68.7799C143.854 68.5611 143.545 68.3611 143.331 68.2136C143.224 68.1399 143.141 68.0797 143.085 68.0374C143.012 67.9828 143.009 67.9768 143.032 67.9996L142.325 68.7067C142.363 68.7447 142.432 68.7973 142.483 68.8363C142.551 68.8875 142.645 68.9558 142.763 69.0371C142.999 69.1996 143.333 69.4154 143.748 69.6502L144.24 68.7799ZM142.722 68.8512C144.074 68.7317 144.864 67.8733 145.284 66.8206C145.695 65.7937 145.78 64.5366 145.749 63.4398L144.749 63.468C144.779 64.5184 144.69 65.6126 144.356 66.4495C144.032 67.2605 143.506 67.778 142.634 67.8551L142.722 68.8512ZM145.5 63.0213L143.126 61.6453L142.624 62.5105L144.998 63.8865L145.5 63.0213ZM143.126 61.6453C142.697 61.397 142.285 60.9555 141.98 60.4241C141.674 59.8925 141.5 59.3165 141.5 58.8268H140.5C140.5 59.5318 140.742 60.2788 141.113 60.9229C141.484 61.5672 142.009 62.1539 142.624 62.5105L143.126 61.6453ZM141.5 58.8282L141.545 42.2251L140.545 42.2224L140.5 58.8255L141.5 58.8282ZM141.545 42.2238C141.545 41.7334 141.715 41.5216 141.846 41.4468C141.979 41.3711 142.253 41.3327 142.685 41.5827L143.186 40.7176C142.574 40.3628 141.903 40.2639 141.352 40.5776C140.799 40.8922 140.545 41.5196 140.545 42.2238H141.545ZM142.685 41.5831L163.961 53.8766L164.461 53.0108L143.186 40.7173L142.685 41.5831Z"
+ fill="#FF5D5C" mask="url(#path-36-inside-2_14622_27034)" />
+ <path
+ d="M158.844 58.8272C158.844 57.1336 157.65 55.0772 156.183 54.2304C154.852 53.4592 153.748 53.9431 153.552 55.304C153.355 53.7314 152.251 51.9622 150.921 51.191C149.454 50.3442 148.259 51.0247 148.259 52.7031C148.259 53.4592 148.501 54.2909 148.909 55.062L153.521 63.4241L158.118 60.5057C158.557 60.2184 158.844 59.6438 158.844 58.8272Z"
+ fill="#DA3635" />
+ <defs>
+ <linearGradient id="paint0_linear_14622_27034" x1="86.6776" y1="54.5845" x2="23.1101" y2="137.189"
+ gradientUnits="userSpaceOnUse">
+ <stop stop-color="white" />
+ <stop offset="1" stop-color="#D9EDFF" />
+ </linearGradient>
+ </defs>
+</svg>
\ No newline at end of file
diff --git a/src/assets/post/sprite.svg b/src/assets/post/sprite.svg
deleted file mode 100644
index bbaa197c5..000000000
--- a/src/assets/post/sprite.svg
+++ /dev/null
@@ -1,149 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-
-
-<symbol id="aap" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 322 180"><path fill="#fff" d="M0 0h322v180H0z"/><path d="m0 0 83.5.5L108 84l7-12.5L147.5 180H0V0Z" fill="#348899"/><path d="M29.5 107.8c2.9-.8 6.4-2.5 10.3-4.6A154.8 154.8 0 0 0 77 74.5v.1l.1.1V75l.1.1V75.5l.1.1V75.9l.1.1V76.2l.1.1v.4h.1v.4l.1.1v.2l.1.2V78l.1.1V78.3l.1.1v.2l.1.2v.4h.1v.4h.1V80l.1.1V80.3l.1.1v.4l.1.1V81.2l.1.1V81.6l.1.1V82l.1.2v.2l.1.2v.2h.1v.4l.1.1V83.6l.1.1v.4h.1v.4h.1v.4l.1.1v.2l.1.2v.2l.1.2V86.1l.1.1v.2l.1.2V87l.1.1V87.3l.1.2v.2l.1.1v.4h.1v.4l.1.1V89h.1v.4l.1.1v.2l.1.2V90.2l.1.2v.2l.1.1v.4h.1V91.5l.1.1v.4l.1.1v.2l.1.2V92.8l.1.1v.2l.1.2v.2l.1.2V94l.1.1v.2l.1.2v.4h.1V95.2l.1.2v.2l.1.1V96l.1.2v.2l.1.2V96.9l.1.2v.2l.1.1V97.6h.1v.5h.1V98.5l.1.1v.2l.1.2V99.2l.1.2v.2l.1.2v.2l.1.1v.4l.1.1v.2l.1.2v.2l.1.2V101.8l.1.2v.2l.1.1V102.5h.1v.5h.1V103.4l.1.2v.2l.1.1V104.1l.1.2V104.6h.1V105l.1.1v.4l.1.1v.2l.1.2v.4h.1V106.7l.1.1v.2l.1.2v.4h.1V107.9l.1.2V108.4l.1.1v.2l.1.2v.2l.1.2V109.6l.1.1V110h.1v.4l.1.2v.2l.1.1v.4h.1V111.6l.1.1v.4l.1.1v.2l.1.2V112.9l.1.1v.2l.1.2V113.7l.1.1V114l.1.2v.2l.1.1v.4h.1V115.3l.1.1V115.6l.1.2v.2l.1.2v.2l.1.1V116.8l.1.2V117.4l.1.1V117.7l.1.1V118.1l.1.2v.2h.1v.4l.1.1V119.3l.1.1V119.7l.1.1v.4h.1v.4h.1v.4h.1v.4h.1v.4l.1.2v.2l.1.1V122.6l.1.1V123l.1.1V123.4l.1.2v.2l.1.2V124.3l.1.1V124.7h.1v.4l.1.1V125.5a179.1 179.1 0 0 0-56.6-4l-3.3-13.7Z" stroke="#fff" stroke-width="2"/><path fill-rule="evenodd" clip-rule="evenodd" d="M77.6 72.4C66.3 85.4 40 104.2 28.3 107l3.8 15.6c2.4-.6 7.4-1 11.3-1.1L41 136a5.4 5.4 0 1 0 10.9-.8l-.5-14-.6-1.5-.2-.4 14-34.3 3.9-1-15.3 37.5c13.1.6 28.2 2.6 37.6 5.3l-6.6-27-9.1 22.2-4 1 10.6-26 2.4 2.7-4-16.5-15.6 36.5-3.9 1 17.3-41 2 2.3-2.4-9.7ZM51.4 97.2l-4 1-5.3 14.7 1.4 5.8 7.9-21.5Z" fill="#fff"/><path d="m157.3 77.1-1.5-3.8-7 1.7-1.3 4.5-3.6 1 7-22.7 1.2-.3 8.8 18.8-3.6.8ZM152 63.8l-2.2 8.3 5-1.3-2.8-7Zm13.7 3.8.5 7.4-3.6.9-1-20.3 4.1-1.4c5.2-1.2 8.2 0 9.1 4 .6 2.1.2 4-1 5.7a9.7 9.7 0 0 1-5.7 3.3l-2.4.4Zm-.6-9.8.4 6.7c.5 0 1.1 0 1.8-.3 1.5-.3 2.6-1 3.4-1.8.7-.9 1-1.9.6-3.1-.5-2-1.9-2.8-4.2-2.2-.6.1-1.3.4-2 .7Zm16.5 5.9.4 7.5-3.5.8-1-20.3a45 45 0 0 1 4.1-1.3c5.1-1.3 8.2 0 9.1 3.9.6 2.2.2 4-1 5.7a9.7 9.7 0 0 1-5.7 3.3c-.8.2-1.6.4-2.4.4Zm-.6-9.8.4 6.7c.5 0 1.1 0 1.8-.2 1.5-.4 2.6-1 3.4-1.9.7-.8.9-1.9.6-3-.5-2.1-1.9-2.9-4.2-2.3-.6.1-1.3.4-2 .7Zm24.8-6-9 2.2.3 4.7 6.5-1.6.1 3-6.4 1.6.4 6.3 8.8-2.1.2 3.2-12.4 3-1.2-20.4 12.6-3 .1 3.1Zm17 13.3-12.2 3-1.2-20.3 3.5-.9 1 17.2 8.7-2.2.2 3.2Zm-58 46-1.6-3.7-7 1.7-1.3 4.5-3.6.8 7-22.6 1.3-.3 8.8 18.8-3.6.9ZM159.2 94l-2.2 8.2 5.1-1.2-2.9-7Zm-2-7.2-3.2-4 3.8-.8 1.5 4.3-2.2.5Zm24 8.9.4 7.4-3.5 1-1.1-20.4a45 45 0 0 1 4.2-1.3c5.1-1.3 8.2 0 9 3.9.6 2.2.3 4-1 5.7a9.7 9.7 0 0 1-5.6 3.3l-2.4.4Zm-.6-9.8.4 6.7c.5 0 1 0 1.8-.2 1.5-.4 2.6-1 3.3-1.9.7-.8 1-1.9.7-3.1-.5-2-2-2.8-4.3-2.2-.6.1-1.2.4-2 .7Zm21.8 3 6.5 7.6-4 1-5.6-7.2-2.2.4.4 8.6-3.5.8-1.2-20.3a132 132 0 0 1 5-1.4 9 9 0 0 1 5.3 0 4 4 0 0 1 2.7 3c.4 1.6.3 3-.4 4.4a6.3 6.3 0 0 1-3 3.1Zm-5.9-6.8.4 5.6 1.4-.2c3.3-.8 4.7-2.3 4.2-4.4-.2-1-.7-1.5-1.4-1.7-.7-.2-1.8-.1-3.3.2l-1.3.5Zm13.3 6.5c-.8-3.5-.6-6.7.7-9.6 1.3-2.9 3.5-4.7 6.5-5.5 2.3-.5 4.3-.3 5.8.6 1.6 1 2.6 2.5 3.2 4.9 1 3.8.7 7.2-.6 10a10 10 0 0 1-7 5.5c-2.1.5-4 .3-5.5-.8a8.4 8.4 0 0 1-3-5.1Zm3.5-1.2c.4 1.5 1 2.6 1.8 3.3a3 3 0 0 0 3 .7 5.8 5.8 0 0 0 4.2-4c.8-2.2.8-4.7.2-7.3-.7-3-2.4-4.1-5-3.5-1.9.5-3.2 1.8-3.9 4a12 12 0 0 0-.3 6.8Zm15-.4 3-.7c.3 1.1.9 1.6 1.8 1.4.8-.2 1.4-.5 1.8-.9.4-.3.7-.8.8-1.3.2-.6.2-1.7 0-3.3l-.7-12.7 3.5-.8.7 12.7c.2 3.2-.2 5.4-1.1 6.7a7.6 7.6 0 0 1-4.6 2.7c-1.3.3-2.4.2-3.3-.3-1-.5-1.5-1.3-1.8-2.5l-.1-1ZM255 67.8l-9 2.2.4 4.7 6.4-1.6.2 3-6.5 1.6.4 6.3 8.8-2.1.2 3.1-12.4 3-1.1-20.3 12.5-3 .1 3.1Zm18.6-4.5-6.2 1.5 1 17.2-3.4.8-1-17.1-6.2 1.5-.2-3.2 15.8-3.8.2 3.1Zm12.8-2.3a5.4 5.4 0 0 0-3.4-.3c-2.1.5-3 1.6-2.6 3.2.2.7 1 1.3 2.3 2l2.4 1.2 1.6.9 1 .8 1 1.2.5 1.3a5 5 0 0 1-1 4.6 8.6 8.6 0 0 1-4.9 2.8c-1.7.4-3.4.5-5.2 0l.3-3.6c1.4.6 3 .7 4.5.3 1-.2 1.7-.6 2.2-1.1a2 2 0 0 0 .5-2c-.2-.7-1-1.4-2.3-2l-2.5-1.2-1.6-.8a5.7 5.7 0 0 1-1.5-7.9 7 7 0 0 1 4.3-2.7 17.4 17.4 0 0 1 4.7-.4l-.3 3.7Z" fill="#348899"/></symbol>
-
-<symbol id="appels" viewBox="0 0 80 60" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.66016 23.2006C4.67429 23.0597 8.52282 22.3132 12.7892 21.1547C17.5608 19.8591 22.9197 18.0302 28.3314 15.8906C38.369 11.9223 48.6614 6.85659 55.7703 2.08884V2.14843V2.22928V2.31051V2.39211V2.47407V2.5564V2.6391V2.72216V2.80559V2.88938V2.97352V3.05802V3.14288V3.2281V3.31367V3.39959V3.48586V3.57248V3.65944V3.74676V3.83441V3.92241V4.01075V4.09943V4.18845V4.27781V4.3675V4.45752V4.54788V4.63856V4.72958V4.82092V4.91259V5.00458V5.0969V5.18954V5.2825V5.37577V5.46937V5.56327V5.6575V5.75203V5.84688V5.94203V6.03749V6.13326V6.22933V6.32571V6.42239V6.51937V6.61664V6.71422V6.81209V6.91025V7.0087V7.10745V7.20649V7.30581V7.40542V7.50532V7.6055V7.70596V7.8067V7.90772V8.00901V8.11059V8.21243V8.31455V8.41694V8.5196V8.62253V8.72573V8.82918V8.93291V9.03689V9.14114V9.24565V9.35041V9.45543V9.5607V9.66622V9.772V9.87803V9.9843V10.0908V10.1976V10.3046V10.4119V10.5194V10.6271V10.7351V10.8433V10.9517V11.0604V11.1693V11.2784V11.3878V11.4974V11.6072V11.7172V11.8275V11.938V12.0487V12.1596V12.2708V12.3821V12.4937V12.6054V12.7174V12.8296V12.942V13.0546V13.1675V13.2805V13.3937V13.5071V13.6207V13.7345V13.8485V13.9628V14.0771V14.1917V14.3065V14.4215V14.5366V14.6519V14.7674V14.8831V14.999V15.1151V15.2313V15.3477V15.4643V15.581V15.6979V15.815V15.9323V16.0497V16.1673V16.2851V16.403V16.521V16.6393V16.7577V16.8762V16.9949V17.1137V17.2327V17.3519V17.4712V17.5906V17.7102V17.83V17.9498V18.0698V18.19V18.3103V18.4307V18.5513V18.672V18.7928V18.9137V19.0348V19.156V19.2774V19.3988V19.5204V19.6421V19.7639V19.8858V20.0079V20.1301V20.2523V20.3747V20.4972V20.6198V20.7425V20.8654V20.9883V21.1113V21.2344V21.3576V21.481V21.6044V21.7279V21.8515V21.9752V22.099V22.2229V22.3468V22.4709V22.595V22.7192V22.8435V22.9679V23.0923V23.2169V23.3415V23.4661V23.5909V23.7157V23.8406V23.9655V24.0905V24.2156V24.3408V24.466V24.5912V24.7166V24.8419V24.9674V25.0929V25.2184V25.344V25.4696V25.5953V25.7211V25.8468V25.9726V26.0985V26.2244V26.3503V26.4763V26.6023V26.7284V26.8544V26.9806V27.1067V27.2328V27.359V27.4852V27.6115V27.7377V27.864V27.9903V28.1166V28.243V28.3693V28.4956V28.622V28.7484V28.8748V29.0012V29.1275V29.2539V29.3803V29.5067V29.6331V29.7595V29.8859V30.0123V30.1387V30.265V30.3914V30.5177V30.6441V30.7704V30.8967V31.023V31.1492V31.2754V31.4017V31.5279V31.654V31.7802V31.9063V32.0323V32.1584V32.2844V32.4104V32.5363V32.6622V32.7881V32.9139V33.0397V33.1654V33.2911V33.4168V33.5424V33.6679V33.7934V33.9188V34.0442V34.1696V34.2948V34.42V34.5452V34.6703V34.7953V34.9203V35.0452V35.17V35.2947V35.4194V35.544V35.6686V35.793V35.9174V36.0417V36.1659V36.2901V36.4141V36.5381V36.662V36.7858V36.9095V37.0331V37.1566V37.2801V37.4034V37.5266V37.6498V37.7728V37.8957V38.0186V38.1413V38.2639V38.3864V38.5088V38.6311V38.7533V38.8754V38.9973V39.1191V39.2408V39.3624V39.4839V39.6053V39.7265V39.8476V39.9685V40.0894V40.2101V40.3307V40.4511V40.5714V40.6916V40.8116V40.9315V41.0512V41.1708V41.2903V41.4096V41.5288V41.6478V41.7667V41.8854V42.004V42.1224V42.2406V42.3587V42.4766V42.5944V42.712V42.8294V42.9467V43.0638V43.1808V43.2975V43.4141V43.5306V43.6468V43.7629V43.8788V43.9945V44.11V44.2254V44.3406V44.4555V44.5703V44.6849V44.7993V44.9136V45.0276V45.1414V45.2551V45.3685V45.4818V45.5948V45.7076V45.8203V45.9327V46.0449V46.1569V46.2687V46.3803V46.4917V46.6029V46.7138V46.8245V46.9351V47.0453V47.1554V47.2653V47.3749V47.4843V47.5934V47.7024V47.8111V47.9195V48.0278V48.1358V48.2435V48.3511V48.4583V48.5654V48.6722V48.7787V48.885V48.9911V49.0969V49.2024V49.3078V49.4128V49.5176V49.6221V49.7264V49.8304V49.9342V50.0377V50.1409V50.2439V50.3465V50.449V50.5511V50.653V50.7546V50.8559V50.957V51.0578V51.1582V51.2585V51.3584V51.458V51.5574V51.6565V51.7552V51.8537V51.9519V52.0498V52.1474V52.2448V52.3418V52.4385V52.5349V52.631V52.7268V52.8223V52.9175V53.0124V53.1069V53.2012V53.2952V53.3888V53.4821V53.5751V53.6678V53.7601V53.8521V53.9439V54.0352V54.1263V54.217V54.3074V54.3975V54.4872V54.5766V54.5932C48.6675 50.7584 38.3441 46.5962 28.2733 43.3173C18.0609 39.9923 7.95384 37.5244 1.66016 37.2769V23.2006Z" fill="none" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M56.7703 0.181641C42.7428 10.2013 12.6838 22.2249 0.660156 22.2249V38.2564C3.19182 38.2564 8.06936 39.0833 11.8822 39.8595L6.27117 53.4863C5.78047 56.4517 7.78661 59.2534 10.752 59.7441C13.7174 60.2349 16.5192 58.2287 17.0099 55.2633L19.8979 41.4627L19.6442 39.9086L19.5098 39.51L41.2658 9.45105H45.2737L21.5122 42.2809C34.1261 45.936 48.342 51.4756 56.7703 56.2918V28.5373L42.6898 47.8979H38.682L55.0188 25.106L56.7703 28.386V11.4099L32.9349 43.1831H28.9271L55.4659 7.44562L56.7703 10.1451V0.181641ZM25.4388 18.068H21.4309L12.6838 31.1271V37.1106L25.4388 18.068Z" stroke="none"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M64.9531 28.002C64.9531 29.1368 65.919 30.0566 67.1105 30.0566L77.178 30.0566C78.3695 30.0566 79.3353 29.1368 79.3353 28.002C79.3353 26.8673 78.3695 25.9474 77.178 25.9474L67.1105 25.9474C65.919 25.9474 64.9531 26.8673 64.9531 28.002Z" stroke="none"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M63.6036 16.1736C64.0749 17.2789 65.353 17.7927 66.4582 17.3214L75.7969 13.3389C76.9021 12.8675 77.416 11.5895 76.9447 10.4843C76.4734 9.37908 75.1953 8.86521 74.0901 9.33653L64.7514 13.3191C63.6462 13.7904 63.1323 15.0684 63.6036 16.1736Z" stroke="none"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M63.6036 39.4919C64.0749 38.3867 65.353 37.8728 66.4582 38.3441L75.7969 42.3267C76.9021 42.798 77.416 44.076 76.9447 45.1812C76.4734 46.2864 75.1953 46.8003 74.0901 46.329L64.7514 42.3464C63.6462 41.8751 63.1323 40.5971 63.6036 39.4919Z" stroke="none"/>
-</symbol>
-
-<symbol id="projets" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<mask id="path-1-inside-1" fill="white">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 7C4 5.34315 5.34315 4 7 4C8.65685 4 10 5.34315 10 7V24C10 25.6569 8.65685 27 7 27C5.34315 27 4 25.6569 4 24V7ZM7 26C8.10457 26 9 25.1046 9 24C9 22.8954 8.10457 22 7 22C5.89543 22 5 22.8954 5 24C5 25.1046 5.89543 26 7 26Z"/>
-</mask>
-<path d="M7 3C4.79086 3 3 4.79086 3 7H5C5 5.89543 5.89543 5 7 5V3ZM11 7C11 4.79086 9.20914 3 7 3V5C8.10457 5 9 5.89543 9 7H11ZM11 24V7H9V24H11ZM7 28C9.20914 28 11 26.2091 11 24H9C9 25.1046 8.10457 26 7 26V28ZM3 24C3 26.2091 4.79086 28 7 28V26C5.89543 26 5 25.1046 5 24H3ZM3 7V24H5V7H3ZM8 24C8 24.5523 7.55228 25 7 25V27C8.65685 27 10 25.6569 10 24H8ZM7 23C7.55228 23 8 23.4477 8 24H10C10 22.3431 8.65685 21 7 21V23ZM6 24C6 23.4477 6.44771 23 7 23V21C5.34315 21 4 22.3431 4 24H6ZM7 25C6.44772 25 6 24.5523 6 24H4C4 25.6569 5.34315 27 7 27V25Z" stroke="none" mask="url(#path-1-inside-1)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 27H10L24 7H25.5L11.5 27H14L27.5 8L28 9.5L15.5 27H18L27.5 14L28 15.5L19.5 27H22L27.5 19.5L28 21L23.5 27H28V21V15.5V9.5V6H9.82929C9.93985 6.31278 10 6.64936 10 7V9L11.5 7H13L10 11.0909V14.4412L15.5 7H17L10 16.5789V21.0909L20 7H21.5L10 23.56V24C10 25.6569 8.65685 27 7 27Z" stroke="none"/>
-<path d="M7 27H28V6.5H9.95852C9.9858 6.6626 10 6.82964 10 7V7.5H27V26H9.23611C8.68679 26.6137 7.8885 27 7 27Z" stroke="none"/>
-<path d="M9 24C9 25.1046 8.10457 26 7 26C5.89543 26 5 25.1046 5 24C5 22.8954 5.89543 22 7 22C8.10457 22 9 22.8954 9 24Z" stroke="none"/>
-</symbol>
-
-<symbol id="ressources" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.5 25V13.0495C7.32281 13.9728 11.7651 14.5 16.5 14.5C20.828 14.5 24.9112 14.0595 28.5 13.2789V25C28.5 25.2761 28.2761 25.5 28 25.5H4C3.72386 25.5 3.5 25.2761 3.5 25Z" fill="none"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M20 6H13V8H20V6ZM13 4C11.8954 4 11 4.89543 11 6V9H22V6C22 4.89543 21.1046 4 20 4H13Z" stroke="none"/>
-<path d="M28.5 13.2602C27.6168 13.4803 26.8068 13.7326 26.0024 13.9831L25.9955 13.9852C24.3831 14.4874 22.7659 14.9905 20.5 15.2722V15C20.5 14.1716 19.8284 13.5 19 13.5H14C13.1716 13.5 12.5 14.1716 12.5 15V15.2709C9.84798 14.949 7.85358 14.3349 5.87723 13.7256L5.87212 13.724C5.09326 13.4839 4.31292 13.2433 3.5 13.0242V9C3.5 8.72386 3.72386 8.5 4 8.5H28C28.2761 8.5 28.5 8.72386 28.5 9V13.2602Z"/>
-<path d="M3 13.4095C3.7817 13.6107 4.59178 13.795 5.42722 13.9611L3 17.4286V13.4095Z" stroke="none"/>
-<path d="M29 13.6541V16L22 26L18.5 26L26.8278 14.1031C27.5713 13.9674 28.296 13.8174 29 13.6541Z" stroke="none"/>
-<path d="M29 18.1429V23.1429L27 26H23.5L29 18.1429Z" stroke="none"/>
-<path d="M28.7003 25.7138C28.788 25.6278 28.8598 25.5259 28.9112 25.4126L28.7003 25.7138Z" stroke="none"/>
-<path d="M21.3318 14.8118C22.6365 14.7087 23.9059 14.5647 25.1318 14.3832L17 26H13.5L19.1037 17.9947C19.6073 17.9428 20 17.5173 20 17V16.7143L21.3318 14.8118Z" stroke="none"/>
-<path d="M17.6 18L12 26H8.50001L14.1 18H17.6Z" stroke="none"/>
-<path d="M13.0602 17.3426L7.00001 26H4C3.84543 26 3.69905 25.9649 3.56839 25.9023L11.35 14.7858C11.8954 14.8318 12.4472 14.8707 13.0047 14.9022C13.0016 14.9344 13 14.967 13 15V17C13 17.1203 13.0213 17.2357 13.0602 17.3426Z" stroke="none"/>
-<path d="M6.75572 14.2061C7.78653 14.3818 8.8514 14.5304 9.94511 14.6498L3 24.5714V19.5714L6.75572 14.2061Z" stroke="none"/>
-<rect x="13.5" y="14.5" width="6" height="3" rx="0.5" fill="none"/>
-</symbol>
-
-<symbol id="infos" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<path d="M23 25.5H9.44949C10.0978 24.8647 10.5 23.9793 10.5 23V5.5H25.5V23C25.5 24.3807 24.3807 25.5 23 25.5Z" fill="none"/>
-<rect x="12" y="16" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="19" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="22" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="8" width="12" height="6" rx="1" stroke="none"/>
-<path d="M11 12V13.5L5.00001 20.5V17.2273L9.60001 12H11Z" stroke="none"/>
-<path d="M5.00001 22.5V22.2273L11 15.4091L11 18.5L6 24.5C5.48214 24.0507 5.00001 23.1722 5.00001 22.5Z" stroke="none"/>
-<path d="M7.06819 24.8771C7.36151 24.9569 7.67471 25 8.00001 25C9.65686 25 11 23.8807 11 22.5V20.4091L7.06819 24.8771Z" stroke="none"/>
-<path d="M8 12H5.00001L5 15.5L8 12Z" stroke="none"/>
-<path d="M5.5 12.5H10.5V23C10.5 24.3807 9.38071 25.5 8 25.5C6.61929 25.5 5.5 24.3807 5.5 23V12.5Z" fill="none"/>
-</symbol>
-
-<symbol id="formations" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3 28V24.4C3 22.1088 4.1007 20.0762 5.79995 18.7998C4.80938 17.7598 4.2 16.3513 4.2 14.8C4.2 11.5967 6.79675 9 10 9C13.2033 9 15.8 11.5967 15.8 14.8C15.8 16.3513 15.1906 17.7598 14.2001 18.7998C15.8993 20.0762 17 22.1088 17 24.4V28H3ZM13.4307 19.4769C13.1256 19.2639 12.7998 19.0785 12.4568 18.9244C12.7774 18.7331 13.0738 18.5054 13.3403 18.2471C14.2405 17.3746 14.8 16.1527 14.8 14.8C14.8 12.149 12.651 10 10 10C7.34903 10 5.2 12.149 5.2 14.8C5.2 16.1527 5.75951 17.3746 6.65971 18.2471C6.92623 18.5054 7.2226 18.7331 7.54316 18.9244C7.20024 19.0785 6.87441 19.2639 6.56931 19.4769C5.01609 20.5613 4 22.362 4 24.4V27H16V24.4C16 22.362 14.9839 20.5613 13.4307 19.4769Z" stroke="none"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 6H30V22H16.5777C16.3879 21.4799 16.1381 20.9887 15.8369 20.5348L25.6379 7H24.1379L15.0488 19.5516C14.7868 19.2788 14.503 19.0273 14.2001 18.7998C15.1906 17.7598 15.8 16.3513 15.8 14.8C15.8 14.4589 15.7705 14.1246 15.7141 13.7996L20.6379 7H19.1379L15.2607 12.3543C14.8403 11.4515 14.1943 10.675 13.3952 10.0971L15.6379 7H14.1379L12.3353 9.48933C11.6208 9.17468 10.8308 9 10 9C9.70926 9 9.42352 9.02139 9.14426 9.06269L10.6379 7H9.13793L7.14742 9.74881C5.70291 10.5663 4.64387 11.9856 4.3108 13.666L3 15.4762V17.5476L4.28201 15.7772C4.46929 16.8805 4.96816 17.8775 5.68402 18.6744L5.28319 19.228C4.45784 19.9811 3.81311 20.9293 3.4223 22H2V6ZM29 7.19048V9.2619L20.5 21H19L29 7.19048ZM25.5 21H24L29 14.0952V16.1667L25.5 21ZM5.63793 7L3 10.6429V8.57143L4.13793 7H5.63793Z" stroke="none"/>
-</symbol>
-
-<symbol id="etudes" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<path d="M27.722 26.2329L22.4916 21.0959C24.0154 19.2877 24.9215 16.9452 24.9215 14.4384C24.8803 8.68493 20.2265 4 14.4607 4C8.69498 4 4 8.68493 4 14.4384C4 20.1918 8.69498 24.8767 14.4607 24.8767C16.9318 24.8767 19.2381 24.0137 21.009 22.5753L26.2394 27.7123C26.4453 27.9178 26.6924 28 26.9807 28C27.2278 28 27.5161 27.9178 27.722 27.7123C28.0927 27.3014 28.0927 26.6438 27.722 26.2329ZM6.0592 14.4384C6.0592 9.79452 9.80695 6.05479 14.4607 6.05479C19.1145 6.05479 22.8623 9.79452 22.8623 14.4384C22.8623 19.0822 19.1145 22.8219 14.4607 22.8219C9.80695 22.8219 6.0592 19.0411 6.0592 14.4384Z" stroke="none"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.7457 5.3282C14.0022 5.11446 13.2157 5 12.4015 5C12.2296 5 12.0588 5.00511 11.8895 5.01518L10.4509 6.97689C11.5862 6.37483 12.878 6.02499 14.2521 6.00129L14.7457 5.3282ZM13.0585 7.62894C9.87909 8.24863 7.5 11.0292 7.5 14.3836C7.5 14.6426 7.51448 14.8985 7.5427 15.1504L13.0585 7.62894ZM7.97683 16.8961L14.8566 7.51456C15.8686 7.57953 16.8194 7.85975 17.6638 8.30994L9.59266 19.316C8.89414 18.6378 8.33923 17.8141 7.97683 16.8961ZM6.34942 16.7776C6.12204 16.018 6 15.2141 6 14.3836C6 13.8626 6.04717 13.353 6.13749 12.8588L4.25314 15.4284C4.49144 16.3727 4.89089 17.2551 5.42099 18.0437L6.34942 16.7776ZM6.96335 18.2781C7.41071 19.1257 7.99942 19.8888 8.69862 20.5352L8.49887 20.8076C7.68288 20.3787 6.94656 19.8199 6.31708 19.1594L6.96335 18.2781ZM17.141 6.45253C16.8055 6.22416 16.4523 6.01946 16.084 5.84081L15.874 6.12727C16.3089 6.20341 16.7322 6.31273 17.141 6.45253ZM13.3275 21.1841C12.3621 21.0332 11.464 20.6823 10.6762 20.1762L18.8131 9.08041C19.5054 9.65324 20.0826 10.359 20.5064 11.159C20.5221 11.2167 20.5373 11.2746 20.5518 11.3328L13.3275 21.1841ZM21.157 12.9614C21.2528 13.4201 21.3031 13.8957 21.3031 14.3836C21.3031 17.9947 18.5458 20.9409 15.0011 21.2418L21.157 12.9614ZM9.9145 5.37067C6.48201 6.42403 4 9.60441 4 13.3836L4.00016 13.4357L9.9145 5.37067Z" stroke="none"/>
-</symbol>
-
-<symbol id="dossiers" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 9C2 7.89543 2.89543 7 4 7H8C9.10457 7 10 7.89543 10 9V10H27C27.5523 10 28 10.4477 28 11V13H6.32973C5.84861 13 5.43568 13.3426 5.34691 13.8155L3.28171 24.8155C3.16616 25.431 3.63831 26 4.26454 26H3C2.44772 26 2 25.5523 2 25V9Z" stroke="none"/>
-<path d="M5.72708 13.8721C5.78513 13.6528 5.98357 13.5 6.21044 13.5H29.1416C29.4697 13.5 29.7089 13.8107 29.6249 14.1279L26.7136 25.1279C26.6555 25.3472 26.4571 25.5 26.2302 25.5H3.2991C2.97097 25.5 2.73179 25.1893 2.81574 24.8721L5.72708 13.8721Z" fill="none"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M29.2607 17.2341L30.049 14.2559C30.1737 13.7846 29.9418 13.3205 29.5453 13.113L20.8378 26H23.3378L29.2607 17.2341ZM24.8378 26H26.1709C26.6247 26 27.0215 25.6945 27.1376 25.2559L28.2948 20.8837L24.8378 26ZM25.6216 13H28.1216L19.3378 26H16.8378L25.6216 13ZM24.1216 13H21.6216L12.8378 26H15.3378L24.1216 13ZM17.6216 13H20.1216L11.3378 26H8.83784L17.6216 13ZM16.1216 13H13.6216L4.83784 26H7.33784L16.1216 13ZM9.62162 13H12.1216L3.33784 26H3.20521C2.57898 26 2.10683 25.431 2.22239 24.8155L2.44717 23.6182L9.62162 13ZM8.12162 13H5.27041C5.26124 13 5.2521 13.0001 5.24299 13.0004L4.13187 14.6448L3.02434 20.544L8.12162 13Z" stroke="none"/>
-</symbol>
-
-<symbol id="publishLogo" viewBox="0 0 310 273" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.35" filter="url(#filter0_f)">
-<path d="M12 76.7061L181.621 30.7062L283.777 208.44L114.155 254.44L12 76.7061Z" fill="#348899"/>
-</g>
-<path d="M114.638 253.273L13.5131 77.3318L181.138 31.8732L282.263 207.814L114.638 253.273Z" fill="#EAF8FB" stroke="#79ACB6" stroke-width="2"/>
-<path d="M56.0084 117.902C54.7257 115.671 55.8543 112.826 58.3181 112.08L188.148 72.8014C189.929 72.2624 191.847 73.0232 192.774 74.6367L215.093 113.467C216.376 115.699 215.247 118.544 212.783 119.289L82.9533 158.568C81.172 159.107 79.2544 158.346 78.327 156.733L56.0084 117.902Z" fill="#ABE6F2"/>
-<path d="M72.5 81.3037L150.685 57.8712L154.671 64.8072L76.4866 88.2397L72.5 81.3037Z" fill="#117083"/>
-<path d="M86.5 167.953L139.359 152.241L142.5 157.706L89.6408 173.418L86.5 167.953Z" fill="#117083"/>
-<path d="M91.5 176.445L144.359 160.733L147.5 166.198L94.6408 181.91L91.5 176.445Z" fill="#117083"/>
-<path d="M96.5 185.445L149.359 169.733L152.5 175.198L99.6408 190.91L96.5 185.445Z" fill="#117083"/>
-<path d="M102.5 193.444L155.359 177.732L158.5 183.197L105.641 198.909L102.5 193.444Z" fill="#117083"/>
-<path d="M107.5 202.444L160.359 186.732L163.5 192.197L110.641 207.909L107.5 202.444Z" fill="#117083"/>
-<path d="M112.5 211.444L165.359 195.732L168.5 201.197L115.641 216.909L112.5 211.444Z" fill="#117083"/>
-<path d="M116.5 221.444L169.359 205.732L172.5 211.197L119.641 226.909L116.5 221.444Z" fill="#117083"/>
-<path d="M145.5 150.444L198.359 134.732L201.5 140.197L148.641 155.909L145.5 150.444Z" fill="#117083"/>
-<path d="M151.5 158.444L204.359 142.732L207.5 148.197L154.641 163.909L151.5 158.444Z" fill="#117083"/>
-<path d="M156.5 167.444L178.359 161.241L181.5 166.706L159.641 172.909L156.5 167.444Z" fill="#117083"/>
-<path d="M100 84.6553L139.091 72.7225L143.078 79.6584L103.987 91.5912L100 84.6553Z" fill="#117083"/>
-<g opacity="0.35" filter="url(#filter1_f)">
-<path d="M252.112 73.7334C249.503 71.652 246.024 71.6753 244.34 73.7856L235.054 85.4249L235.088 85.4519L190.698 141.075L205.252 152.855L190.571 141.242L189.299 142.837C188.606 143.704 188.299 144.837 188.429 146.05L186.205 161.648L185.788 163.604C185.445 165.216 187.089 166.528 188.585 165.835L189.273 165.516C189.436 165.526 189.6 165.521 189.763 165.502L205.18 159.287C206.391 159.144 207.427 158.594 208.12 157.726L209.393 156.131L209.391 156.129L253.778 100.509L253.779 100.51L263.064 88.8704C264.748 86.7602 263.999 83.3622 261.391 81.2807L252.112 73.7334Z" fill="#DC2A59"/>
-</g>
-<path d="M252.739 72.9577L252.739 72.9576L252.732 72.9518C249.854 70.6558 245.7 70.4733 243.554 73.1618L243.554 73.1619L234.269 84.8012L233.648 85.5792L233.682 85.6061L189.913 140.452L189.293 141.228L189.297 141.231L188.513 142.213C187.666 143.275 187.298 144.626 187.418 146.026L185.216 161.473L184.806 163.395C184.291 165.813 186.758 167.781 189.001 166.743L189.48 166.521C189.612 166.519 189.744 166.511 189.876 166.495L190.009 166.48L190.133 166.43L205.432 160.262C206.819 160.067 208.052 159.409 208.898 158.35L210.17 156.755L210.798 155.969L210.796 155.967L253.929 101.918L253.93 101.918L254.557 101.133L263.842 89.4942C265.986 86.807 264.889 82.7988 262.014 80.5023C262.013 80.5013 262.012 80.5002 262.01 80.4991L252.739 72.9577Z" fill="#E04971" stroke="#E0718E" stroke-width="2"/>
-<path d="M244.336 73.7856C246.02 71.6754 249.499 71.652 252.108 73.7335L261.386 81.2808C263.995 83.3622 264.744 86.7602 263.06 88.8705L253.775 100.51L235.05 85.4249L244.336 73.7856Z" fill="#E04971"/>
-<path d="M254.161 100.03L235.505 84.9298L190.698 141.076L209.354 156.176L254.161 100.03Z" fill="#E0718E"/>
-<path d="M209.393 156.131L190.571 141.242L189.298 142.837C188.606 143.705 188.299 144.838 188.429 146.05L186.075 162.56C186.257 164.27 188.054 165.704 189.762 165.503L205.18 159.288C206.391 159.145 207.427 158.594 208.12 157.727L209.393 156.131Z" fill="#FDECF0"/>
-<path d="M185.399 164.08C185.176 165.596 186.672 166.789 188.101 166.236L194.734 163.665C194.734 163.665 194.763 161.501 191.65 159.018C188.537 156.534 186.434 157.041 186.434 157.041L185.399 164.08Z" fill="#E04971"/>
-<rect x="190.742" y="140.706" width="24.0099" height="2" transform="rotate(38.3738 190.742 140.706)" fill="white"/>
-<rect x="236.152" y="84.0303" width="24.0422" height="2" transform="rotate(38.3738 236.152 84.0303)" fill="white"/>
-<defs>
-<filter id="filter0_f" x="0" y="18.7061" width="295.777" height="247.734" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="6" result="effect1_foregroundBlur"/>
-</filter>
-<filter id="filter1_f" x="173.742" y="60.1875" width="102.221" height="117.837" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="6" result="effect1_foregroundBlur"/>
-</filter>
-</defs>
-</symbol>
-
-<symbol id="a-la-une" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<path d="M23 25.5H9.44949C10.0978 24.8647 10.5 23.9793 10.5 23V5.5H25.5V23C25.5 24.3807 24.3807 25.5 23 25.5Z" fill="none"/>
-<rect x="12" y="16" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="19" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="22" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="8" width="12" height="6" rx="1" stroke="none"/>
-<path d="M11 12V13.5L5.00001 20.5V17.2273L9.60001 12H11Z" stroke="none"/>
-<path d="M5.00001 22.5V22.2273L11 15.4091L11 18.5L6 24.5C5.48214 24.0507 5.00001 23.1722 5.00001 22.5Z" stroke="none"/>
-<path d="M7.06819 24.8771C7.36151 24.9569 7.67471 25 8.00001 25C9.65686 25 11 23.8807 11 22.5V20.4091L7.06819 24.8771Z" stroke="none"/>
-<path d="M8 12H5.00001L5 15.5L8 12Z" stroke="none"/>
-<path d="M5.5 12.5H10.5V23C10.5 24.3807 9.38071 25.5 8 25.5C6.61929 25.5 5.5 24.3807 5.5 23V12.5Z" fill="none"/>
-</symbol>
-
-<symbol id="allophones" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<path d="M23 25.5H9.44949C10.0978 24.8647 10.5 23.9793 10.5 23V5.5H25.5V23C25.5 24.3807 24.3807 25.5 23 25.5Z" fill="none"/>
-<rect x="12" y="16" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="19" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="22" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="8" width="12" height="6" rx="1" stroke="none"/>
-<path d="M11 12V13.5L5.00001 20.5V17.2273L9.60001 12H11Z" stroke="none"/>
-<path d="M5.00001 22.5V22.2273L11 15.4091L11 18.5L6 24.5C5.48214 24.0507 5.00001 23.1722 5.00001 22.5Z" stroke="none"/>
-<path d="M7.06819 24.8771C7.36151 24.9569 7.67471 25 8.00001 25C9.65686 25 11 23.8807 11 22.5V20.4091L7.06819 24.8771Z" stroke="none"/>
-<path d="M8 12H5.00001L5 15.5L8 12Z" stroke="none"/>
-<path d="M5.5 12.5H10.5V23C10.5 24.3807 9.38071 25.5 8 25.5C6.61929 25.5 5.5 24.3807 5.5 23V12.5Z" fill="none"/>
-</symbol>
-
-<symbol id="tout-public" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-<path d="M23 25.5H9.44949C10.0978 24.8647 10.5 23.9793 10.5 23V5.5H25.5V23C25.5 24.3807 24.3807 25.5 23 25.5Z" fill="none"/>
-<rect x="12" y="16" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="19" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="22" width="12" height="1" rx="0.5" stroke="none"/>
-<rect x="12" y="8" width="12" height="6" rx="1" stroke="none"/>
-<path d="M11 12V13.5L5.00001 20.5V17.2273L9.60001 12H11Z" stroke="none"/>
-<path d="M5.00001 22.5V22.2273L11 15.4091L11 18.5L6 24.5C5.48214 24.0507 5.00001 23.1722 5.00001 22.5Z" stroke="none"/>
-<path d="M7.06819 24.8771C7.36151 24.9569 7.67471 25 8.00001 25C9.65686 25 11 23.8807 11 22.5V20.4091L7.06819 24.8771Z" stroke="none"/>
-<path d="M8 12H5.00001L5 15.5L8 12Z" stroke="none"/>
-<path d="M5.5 12.5H10.5V23C10.5 24.3807 9.38071 25.5 8 25.5C6.61929 25.5 5.5 24.3807 5.5 23V12.5Z" fill="none"/>
-</symbol>
-
-</svg>
--
GitLab
From bea5861d4205f5069dde3e24efe60e99a8bbf6bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com>
Date: Wed, 13 Dec 2023 15:19:58 +0000
Subject: [PATCH 16/16] Apply 1 suggestion(s) to 1 file(s)
---
.../post-publish/post-publish.component.scss | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
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 d99ed2685..0d5c32f86 100644
--- a/src/app/post/components/post-publish/post-publish.component.scss
+++ b/src/app/post/components/post-publish/post-publish.component.scss
@@ -35,17 +35,11 @@ h2 {
gap: 8px;
ul {
- list-style: none; /* Remove default bullets */
margin: 0;
- padding: 0;
- }
-
- ul li::before {
- content: '\2022'; /* Add content: \2022 is the CSS Code/unicode for a bullet */
- color: $red; /* Change the color */
- // font-weight: bold; /* If you want it to be bold */
- display: inline-block; /* Needed to add space between the bullet and the text */
- width: 1em; /* Also needed for space (tweak if needed) */
+ padding-left: 24px;
+ li::marker {
+ color: $red;
+ }
}
p:last-child {
--
GitLab