From 7be4dc8e3f111d62bdd8741db03681c6ad3be0fd Mon Sep 17 00:00:00 2001 From: Matthieu Fesselier Date: Mon, 6 Jan 2025 16:10:19 +0100 Subject: [PATCH] style(client): :lipstick: section mon action --- .../__snapshots__/index.test.tsx.snap | 282 ++++---- .../__snapshots__/publier.test.tsx.snap | 670 ++++++------------ .../__snapshots__/traduire.test.tsx.snap | 348 +++++---- .../staticPages/publier/icon-calendar.svg | 14 + .../assets/staticPages/publier/icon-hands.svg | 15 + .../assets/staticPages/publier/icon-money.svg | 13 + .../staticPages/publier/required-icon-1.png | Bin 2599 -> 0 bytes .../staticPages/publier/required-icon-2.png | Bin 7960 -> 0 bytes .../staticPages/publier/required-icon-3.png | Bin 4871 -> 0 bytes .../Pages/homepage/Sections/HelpUs/HelpUs.tsx | 3 - .../staticPages/common/Card/Card.module.scss | 63 -- .../Pages/staticPages/common/Card/Card.tsx | 16 +- .../staticPages/common/Section/Section.tsx | 2 +- .../CardExample/CardExample.module.scss | 39 - .../publier/CardExample/CardExample.tsx | 14 +- apps/client/src/pages/publier.tsx | 118 +-- apps/client/src/pages/traduire.tsx | 9 +- apps/client/src/scss/index.css | 5 + apps/client/src/scss/mixins/_text.scss | 4 + 19 files changed, 633 insertions(+), 982 deletions(-) create mode 100644 apps/client/src/assets/staticPages/publier/icon-calendar.svg create mode 100644 apps/client/src/assets/staticPages/publier/icon-hands.svg create mode 100644 apps/client/src/assets/staticPages/publier/icon-money.svg delete mode 100644 apps/client/src/assets/staticPages/publier/required-icon-1.png delete mode 100644 apps/client/src/assets/staticPages/publier/required-icon-2.png delete mode 100644 apps/client/src/assets/staticPages/publier/required-icon-3.png delete mode 100644 apps/client/src/components/Pages/staticPages/common/Card/Card.module.scss delete mode 100644 apps/client/src/components/Pages/staticPages/publier/CardExample/CardExample.module.scss diff --git a/apps/client/src/__tests__/__snapshots__/index.test.tsx.snap b/apps/client/src/__tests__/__snapshots__/index.test.tsx.snap index 846aa6a3ef..0249a9c21e 100644 --- a/apps/client/src/__tests__/__snapshots__/index.test.tsx.snap +++ b/apps/client/src/__tests__/__snapshots__/index.test.tsx.snap @@ -5692,47 +5692,43 @@ exports[`homepage renders homepage 1`] = ` title="Homepage.helpUsCardTitle1" >
+ +
+

+ Homepage.helpUsCardTitle1 +

+
- -
-

- Homepage.helpUsCardTitle1 -

-
-
-

- Homepage.helpUsCardHelp1 -

-

- Homepage.helpUsCardText1 + Homepage.helpUsCardHelp1

+

+ Homepage.helpUsCardText1 +

-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+ +
+
+
-

- Homepage.helpUsCardTitle2 -

+ +
+ +
+
+ +
+
+ +
+
+ +
+
+

+ Homepage.helpUsCardTitle2 +

+
+
-
-

- Homepage.helpUsCardHelp2 -

-

- Homepage.helpUsCardText2 + Homepage.helpUsCardHelp2

+

+ Homepage.helpUsCardText2 +

+ +
+

+ Homepage.helpUsCardTitle3 +

+
- -
-

- Homepage.helpUsCardTitle3 -

-
-
-

- Homepage.helpUsCardHelp3 -

-

- Homepage.helpUsCardText3 + Homepage.helpUsCardHelp3

+

+ Homepage.helpUsCardText3 +

Publish.requiredTitle

+
+ +
+

+ Publish.requiredSubtitle1 +

-
-
+ Publish.requiredText1 +

+
+
+
+

- -

-

- Publish.requiredSubtitle1 -

-
+

-

- Publish.requiredText1 -

-
-
-
-
-

- - - - - - - - - - - - - Publish.requiredTextExample1Ko -

-

- - - - - - - - - - - - - Publish.requiredTextExample1Ok -

-
+ + Publish.requiredTextExample1Ok +

+
+ +
+

+ Publish.requiredSubtitle2 +

-
-
+ Publish.requiredText2 +

+
+
+
+

- -

-

- Publish.requiredSubtitle2 -

-
+

-

- Publish.requiredText2 -

-
-
-
-
-

- - - - - - - - - - - - - Publish.requiredTextExample2Ko -

-

- - - - - - - - - - - - - Publish.requiredTextExample2Ok -

-
+ + Publish.requiredTextExample2Ok +

+
+ +
+

+ Publish.requiredSubtitle3 +

-
-
+ Publish.requiredText3 +

+
+
+
+

- -

-

+

- Publish.requiredSubtitle3 -

-
-

- Publish.requiredText3 -

-
-
-
-
-

- - - - - - - - - - - - - Publish.requiredTextExample3Ko -

-

- - - - - - - - - - - - - Publish.requiredTextExample3Ok -

-
+ + Publish.requiredTextExample3Ok +

- - Publish.requiredCTA - - - - - - - - - - - - - + Publish.requiredCTA
@@ -1363,36 +1125,32 @@ exports[`publier renders publier 1`] = ` class="lg:mb-0 mb-5 col-sm-12 col-lg-4" >
-
- -
-

- Publish.helpTileTitle1 -

-
-

- Publish.helpTileText1 -

-
+ +
+

+ Publish.helpTileTitle1 +

+
+

+ Publish.helpTileText1 +

-
- -
-

- Publish.helpTileTitle2 -

-
-

- Publish.helpTileText2 -

-
+ +
+

+ Publish.helpTileTitle2 +

+
+

+ Publish.helpTileText2 +

-
- -
-

- StaticPages.helpTileTitle3 -

-
-

- StaticPages.helpTileText3 -

-
+ +
+

+ StaticPages.helpTileTitle3 +

+
+

+ StaticPages.helpTileText3 +

diff --git a/apps/client/src/__tests__/__snapshots__/traduire.test.tsx.snap b/apps/client/src/__tests__/__snapshots__/traduire.test.tsx.snap index 290ff78fc7..9cd18ba1c8 100644 --- a/apps/client/src/__tests__/__snapshots__/traduire.test.tsx.snap +++ b/apps/client/src/__tests__/__snapshots__/traduire.test.tsx.snap @@ -195,91 +195,87 @@ exports[`traduire renders traduire 1`] = ` class="lg:mb-0 mb-5 col-sm-12 col-lg-4" >
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+ +
+
+
-

- Translate.whoCardTitle1 -

+ +
-

- Translate.whoCardText1 -

+ +
+
+ +
+
+ +
+
+
+

+ Translate.whoCardTitle1 +

+
+

+ Translate.whoCardText1 +

+
@@ -287,36 +283,32 @@ exports[`traduire renders traduire 1`] = ` class="lg:mb-0 mb-5 col-sm-12 col-lg-4" >
-
- -
+
-

- Translate.whoCardTitle2 -

-
+

+ Translate.whoCardTitle2 +

+
+

-

- Translate.whoCardText2 -

-
+ Translate.whoCardText2 +

@@ -325,38 +317,34 @@ exports[`traduire renders traduire 1`] = ` class="lg:mb-0 mb-5 col-sm-12 col-lg-4" >
-
- -
-

- Translate.whoCardTitle3 -

-
+
+

+ Translate.whoCardTitle3 +

+
+

-

- Translate.whoCardText3 -

-
+ Translate.whoCardText3 +

@@ -801,36 +789,32 @@ exports[`traduire renders traduire 1`] = ` class="lg:mb-0 mb-5 col-sm-12 col-lg-4" >
-
- -
-

- Translate.helpTileTitle1 -

-
-

- Translate.helpTileText1 -

-
+ +
+

+ Translate.helpTileTitle1 +

+
+

+ Translate.helpTileText1 +

-
- -
-

- StaticPages.helpTileTitle3 -

-
-

- StaticPages.helpTileText3 -

-
+ +
+

+ StaticPages.helpTileTitle3 +

+
+

+ StaticPages.helpTileText3 +

+
+
+
diff --git a/apps/client/src/pages/traduire.tsx b/apps/client/src/pages/traduire.tsx index 2d7bf5d419..36965b1d4c 100644 --- a/apps/client/src/pages/traduire.tsx +++ b/apps/client/src/pages/traduire.tsx @@ -148,22 +148,17 @@ const RecensezVotreAction = (props: Props) => { } title={t("Translate.whoCardTitle1")} - greyBackground >

{t("Translate.whoCardText1")}

- } - title={t("Translate.whoCardTitle2")} - greyBackground - > + } title={t("Translate.whoCardTitle2")}>

{t("Translate.whoCardText2")}

 - +

{t("Translate.whoCardText3")}

 diff --git a/apps/client/src/scss/index.css b/apps/client/src/scss/index.css index 7b7b0eea2c..c135f9cfdd 100644 --- a/apps/client/src/scss/index.css +++ b/apps/client/src/scss/index.css @@ -16,6 +16,9 @@ --color-primary: #0421b1; --color-blue-france: #000091; --color-light-alt-blue: #f5f5fe; + --color-border: #ddd; + --color-success: #18753c; + --color-error: #ce0500; /* Fonts */ --font-sans: "Marianne", "Arial", "sans-serif"; @@ -31,6 +34,8 @@ --text-large--line-height: 28px; --text-chapo: 20px; --text-chapo--line-height: 32px; + --text-h5: 22px; + --text-h5--line-height: 28px; --text-h6: 20px; --text-h6--line-height: 28px; --text-h4: 24px; diff --git a/apps/client/src/scss/mixins/_text.scss b/apps/client/src/scss/mixins/_text.scss index 9b10da12df..eb039458de 100644 --- a/apps/client/src/scss/mixins/_text.scss +++ b/apps/client/src/scss/mixins/_text.scss @@ -91,6 +91,10 @@ $dsfr-texts: ( 20px, 28px, ), + "h5": ( + 22px, + 28px, + ), "h4": ( 24px, 32px,