From ee43bbeb842a7a959e0438451034acdcd9998205 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Mon, 18 Sep 2023 14:25:11 +0200
Subject: [PATCH] replace titles
---
src/components/Newsletter/MailSubject/mailSubject.scss | 5 -----
src/components/Newsletter/MailSubject/mailSubject.tsx | 4 +---
src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx | 5 ++---
src/components/Newsletter/MonthlyInfo/monthlyInfo.scss | 9 ---------
src/components/Newsletter/MonthlyNews/MonthlyNews.tsx | 5 ++---
src/components/Newsletter/MonthlyNews/monthlyNews.scss | 6 ------
src/components/Newsletter/Poll/Poll.tsx | 5 ++---
src/components/Newsletter/Poll/poll.scss | 6 ------
src/components/Newsletter/newsletter.scss | 3 ++-
src/components/Popups/Popups.tsx | 4 ++--
src/components/Popups/popups.scss | 2 +-
11 files changed, 12 insertions(+), 42 deletions(-)
delete mode 100644 src/components/Newsletter/MailSubject/mailSubject.scss
delete mode 100644 src/components/Newsletter/MonthlyInfo/monthlyInfo.scss
delete mode 100644 src/components/Newsletter/MonthlyNews/monthlyNews.scss
delete mode 100644 src/components/Newsletter/Poll/poll.scss
diff --git a/src/components/Newsletter/MailSubject/mailSubject.scss b/src/components/Newsletter/MailSubject/mailSubject.scss
deleted file mode 100644
index 07f73342..00000000
--- a/src/components/Newsletter/MailSubject/mailSubject.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.mailSubject {
- .title {
- margin: 1rem 0;
- }
-}
diff --git a/src/components/Newsletter/MailSubject/mailSubject.tsx b/src/components/Newsletter/MailSubject/mailSubject.tsx
index 33006f95..47baa378 100644
--- a/src/components/Newsletter/MailSubject/mailSubject.tsx
+++ b/src/components/Newsletter/MailSubject/mailSubject.tsx
@@ -2,7 +2,6 @@ import { Button, TextField } from '@mui/material'
import React, { ChangeEvent } from 'react'
import { EditorType } from '../CustomEditor'
import { ContentItems } from '../Newsletter'
-import './mailSubject.scss'
interface MailSubjectProps {
onSave: () => Promise<void>
@@ -24,8 +23,7 @@ const MailSubject: React.FC<MailSubjectProps> = ({
return (
<div className="mailSubject">
<h2>Objet de la newsletter (Optionnel)</h2>
- {/* rename to subtitle */}
- <p className="title">Objet</p>
+ <h3>Objet</h3>
<TextField
type="text"
placeholder="Par défaut : [Ecolyo] Votre bilan..."
diff --git a/src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx b/src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx
index f2065f16..7b45e657 100644
--- a/src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx
+++ b/src/components/Newsletter/MonthlyInfo/MonthlyInfo.tsx
@@ -5,7 +5,6 @@ import { convertStringToEditorState } from '../../../utils/editorStateManagement
import CustomEditor, { EditorType } from '../CustomEditor'
import ImagePicker from '../ImagePicker/ImagePicker'
import { ContentItems } from '../Newsletter'
-import './monthlyInfo.scss'
interface MonthlyInfoProps {
handleChange: (value: string, type: EditorType) => void
@@ -27,9 +26,9 @@ const MonthlyInfo: React.FC<MonthlyInfoProps> = ({
<div className="monthlyInfo">
<h2>Informations du mois (Optionnel)</h2>
<div>
- <p className="title">Image</p>
+ <h3>Image</h3>
<ImagePicker imageURL={imageURL} handleChange={handleChange} />
- <p className="title">Info</p>
+ <h3>Info</h3>
<CustomEditor
baseState={convertStringToEditorState(info)}
handleChange={handleChange}
diff --git a/src/components/Newsletter/MonthlyInfo/monthlyInfo.scss b/src/components/Newsletter/MonthlyInfo/monthlyInfo.scss
deleted file mode 100644
index 90aaf617..00000000
--- a/src/components/Newsletter/MonthlyInfo/monthlyInfo.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.monthlyInfo {
- margin: 2rem 0;
- .title {
- margin: 1rem 0;
- }
- h2 {
- margin-bottom: 1rem;
- }
-}
diff --git a/src/components/Newsletter/MonthlyNews/MonthlyNews.tsx b/src/components/Newsletter/MonthlyNews/MonthlyNews.tsx
index b49bf1af..19c05bad 100644
--- a/src/components/Newsletter/MonthlyNews/MonthlyNews.tsx
+++ b/src/components/Newsletter/MonthlyNews/MonthlyNews.tsx
@@ -4,7 +4,6 @@ import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
import { convertStringToEditorState } from '../../../utils/editorStateManagement'
import CustomEditor, { EditorType } from '../CustomEditor'
import { ContentItems } from '../Newsletter'
-import './monthlyNews.scss'
interface MonthlyNewsProps {
onSave: () => Promise<void>
@@ -28,7 +27,7 @@ const MonthlyNews: React.FC<MonthlyNewsProps> = ({
return (
<div className="monthlyNews">
<h2>Nouveautés du mois (Optionnel)</h2>
- <p className="title">Titre</p>
+ <h3>Titre</h3>
<TextField
type="text"
placeholder="Par défaut : Les nouveautés du service"
@@ -36,7 +35,7 @@ const MonthlyNews: React.FC<MonthlyNewsProps> = ({
onChange={handleChangeTitle}
/>
<div>
- <p className="title">Contenu</p>
+ <h3>Contenu</h3>
<div>
<CustomEditor
baseState={convertStringToEditorState(content)}
diff --git a/src/components/Newsletter/MonthlyNews/monthlyNews.scss b/src/components/Newsletter/MonthlyNews/monthlyNews.scss
deleted file mode 100644
index 260ef5f6..00000000
--- a/src/components/Newsletter/MonthlyNews/monthlyNews.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.monthlyNews {
- margin: 2rem 0;
- .title {
- margin: 1rem 0;
- }
-}
diff --git a/src/components/Newsletter/Poll/Poll.tsx b/src/components/Newsletter/Poll/Poll.tsx
index de0417d2..614a1603 100644
--- a/src/components/Newsletter/Poll/Poll.tsx
+++ b/src/components/Newsletter/Poll/Poll.tsx
@@ -4,7 +4,6 @@ import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
import { convertStringToEditorState } from '../../../utils/editorStateManagement'
import CustomEditor, { EditorType } from '../CustomEditor'
import { ContentItems } from '../Newsletter'
-import './poll.scss'
interface PollProps {
question: string
@@ -30,10 +29,10 @@ const Poll: React.FC<PollProps> = ({
return (
<div className="poll">
<h2>Ajouter un sondage (Optionnel)</h2>
- <p className="title">Lien</p>
+ <h3>Lien</h3>
<TextField type="text" value={link} onChange={handleChangeLink} />
<div>
- <p className="title">Question</p>
+ <h3>Question</h3>
<div>
<CustomEditor
baseState={convertStringToEditorState(question)}
diff --git a/src/components/Newsletter/Poll/poll.scss b/src/components/Newsletter/Poll/poll.scss
deleted file mode 100644
index 9b225047..00000000
--- a/src/components/Newsletter/Poll/poll.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.poll {
- margin: 2rem 0;
- .title {
- margin: 1rem 0;
- }
-}
diff --git a/src/components/Newsletter/newsletter.scss b/src/components/Newsletter/newsletter.scss
index a516b33b..e6904427 100644
--- a/src/components/Newsletter/newsletter.scss
+++ b/src/components/Newsletter/newsletter.scss
@@ -17,8 +17,9 @@
.content {
padding: 1rem;
}
-.subtitle {
+h3 {
margin: 1rem 0;
+ color: $gold;
}
hr {
margin: 2rem 0rem;
diff --git a/src/components/Popups/Popups.tsx b/src/components/Popups/Popups.tsx
index 33d92ba6..7fb71e1d 100644
--- a/src/components/Popups/Popups.tsx
+++ b/src/components/Popups/Popups.tsx
@@ -244,7 +244,7 @@ const Popups: React.FC = () => {
{!isLoading && (
<>
<div className="partnersInfo">
- <h2 className="title">Affichage des pop-up de panne</h2>
+ <h3>Affichage des pop-up de panne</h3>
<div>
<p>Services concernés</p>
<FormGroup style={{ flexDirection: 'row' }}>
@@ -301,7 +301,7 @@ const Popups: React.FC = () => {
</div>
<div className="customPopup">
- <h2 className="title">Affichage de pop-up personnalisée</h2>
+ <h3>Affichage de pop-up personnalisée</h3>
<div className="customPopup">
<FormGroup style={{ flexDirection: 'row' }}>
<FormControlLabel
diff --git a/src/components/Popups/popups.scss b/src/components/Popups/popups.scss
index f63542af..d58dc2ed 100644
--- a/src/components/Popups/popups.scss
+++ b/src/components/Popups/popups.scss
@@ -9,7 +9,7 @@
}
.partnersInfo {
- margin: 2rem 0;
+ margin-bottom: 2rem;
h1 {
margin-bottom: 1rem;
}
--
GitLab