diff --git a/src/app/styles.module.scss b/src/app/styles.module.scss
index 0ecd07e..7f6366e 100755
--- a/src/app/styles.module.scss
+++ b/src/app/styles.module.scss
@@ -57,10 +57,17 @@
.menuWrapper {
position: absolute;
- bottom: 5px;
- left: 420px;
- right: 10px;
- text-align: center;
+ top: 0;
+ right: 0;
+ bottom: 0;
+
+ @include desktop {
+ top: auto;
+ bottom: 5px;
+ left: 420px;
+ right: 10px;
+ text-align: center;
+ }
}
.logoutWrapper {
diff --git a/src/components/ForgotForm/ForgotForm.tsx b/src/components/ForgotForm/ForgotForm.tsx
index b0fd47b..72ad494 100644
--- a/src/components/ForgotForm/ForgotForm.tsx
+++ b/src/components/ForgotForm/ForgotForm.tsx
@@ -3,6 +3,7 @@ import { Link } from "react-router-dom"
import { AppDispatch } from "../../store"
import { fetchVolunteerForgot } from "../../store/volunteerForgot"
import styles from "./styles.module.scss"
+import FormSubmit from "../Form/FormSubmit/FormSubmit"
interface Props {
dispatch: AppDispatch
@@ -34,7 +35,7 @@ const ForgotForm = ({ dispatch, error, message }: Props): JSX.Element => {
-
+ Envoyer
{error}
{message}
diff --git a/src/components/Form/FormButton/FormButton.tsx b/src/components/Form/FormButton/FormButton.tsx
new file mode 100644
index 0000000..0fbc2df
--- /dev/null
+++ b/src/components/Form/FormButton/FormButton.tsx
@@ -0,0 +1,19 @@
+import { FC, ReactNode } from "react"
+import styles from "./styles.module.scss"
+
+type Props = {
+ children: ReactNode
+ onClick?: () => void | undefined
+}
+
+const FormButton: FC = ({ children, onClick }): JSX.Element => (
+
+)
+
+FormButton.defaultProps = {
+ onClick: undefined,
+}
+
+export default FormButton
diff --git a/src/components/Form/FormButton/styles.module.scss b/src/components/Form/FormButton/styles.module.scss
new file mode 100644
index 0000000..70bec07
--- /dev/null
+++ b/src/components/Form/FormButton/styles.module.scss
@@ -0,0 +1,5 @@
+@import "../../../theme/mixins";
+
+.button {
+ @include form-button;
+}
diff --git a/src/components/Form/FormSubmit/FormSubmit.tsx b/src/components/Form/FormSubmit/FormSubmit.tsx
new file mode 100644
index 0000000..06d1823
--- /dev/null
+++ b/src/components/Form/FormSubmit/FormSubmit.tsx
@@ -0,0 +1,14 @@
+import { FC, ReactNode } from "react"
+import styles from "./styles.module.scss"
+
+type Props = {
+ children: ReactNode
+}
+
+const FormSubmit: FC = ({ children }): JSX.Element => (
+
+)
+
+export default FormSubmit
diff --git a/src/components/Form/FormSubmit/styles.module.scss b/src/components/Form/FormSubmit/styles.module.scss
new file mode 100644
index 0000000..70bec07
--- /dev/null
+++ b/src/components/Form/FormSubmit/styles.module.scss
@@ -0,0 +1,5 @@
+@import "../../../theme/mixins";
+
+.button {
+ @include form-button;
+}
diff --git a/src/components/LoginForm/index.tsx b/src/components/LoginForm/index.tsx
index 772a071..e06906c 100644
--- a/src/components/LoginForm/index.tsx
+++ b/src/components/LoginForm/index.tsx
@@ -4,6 +4,7 @@ import { shallowEqual, useDispatch, useSelector } from "react-redux"
import { AppState } from "../../store"
import { fetchVolunteerLogin } from "../../store/volunteerLogin"
import styles from "./styles.module.scss"
+import FormSubmit from "../Form/FormSubmit/FormSubmit"
const LoginForm = (): JSX.Element => {
const dispatch = useDispatch()
@@ -38,7 +39,7 @@ const LoginForm = (): JSX.Element => {
-
+ Connexion
{loginError && {loginError}
}
diff --git a/src/components/LogoutButton/styles.module.scss b/src/components/LogoutButton/styles.module.scss
index c4e4b24..ef244cc 100644
--- a/src/components/LogoutButton/styles.module.scss
+++ b/src/components/LogoutButton/styles.module.scss
@@ -1,3 +1,5 @@
+@import "../../theme/variables";
+
.logoutButton {
text-align: center;
@@ -6,5 +8,6 @@
background: none;
font-weight: normal;
font-size: 0.9em;
+ color: $color-white;
}
}
diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
index f5ef499..b7cf082 100644
--- a/src/components/Modal/Modal.tsx
+++ b/src/components/Modal/Modal.tsx
@@ -27,7 +27,7 @@ const Modal: FC
= ({ modalId, children }): JSX.Element => {
overlayClassName={styles.modalOverlay}
onRequestClose={onClose}
>
-
-
- Enregistrer
-
+ Enregistrer
)
diff --git a/src/components/VolunteerBoard/ParticipationDetails/styles.module.scss b/src/components/VolunteerBoard/ParticipationDetails/styles.module.scss
index 2b922ae..33a700a 100755
--- a/src/components/VolunteerBoard/ParticipationDetails/styles.module.scss
+++ b/src/components/VolunteerBoard/ParticipationDetails/styles.module.scss
@@ -21,4 +21,10 @@
position: absolute;
right: 20px;
+
+ button {
+ color: $color-green;
+ font-weight: bold;
+ cursor: pointer;
+ }
}
diff --git a/src/components/VolunteerBoard/ParticipationDetailsForm/ParticipationDetailsForm.tsx b/src/components/VolunteerBoard/ParticipationDetailsForm/ParticipationDetailsForm.tsx
index 64a753b..ae85ddd 100644
--- a/src/components/VolunteerBoard/ParticipationDetailsForm/ParticipationDetailsForm.tsx
+++ b/src/components/VolunteerBoard/ParticipationDetailsForm/ParticipationDetailsForm.tsx
@@ -7,6 +7,7 @@ import {
tShirtSizes,
useUserParticipationDetails,
} from "../participationDetails.utils"
+import FormButton from "../../Form/FormButton/FormButton"
type Props = {
afterSubmit?: () => void | undefined
@@ -96,9 +97,7 @@ const ParticipationDetailsForm: FC = ({ afterSubmit }): JSX.Element | nul
/>
-
- Enregistrer
-
+ Enregistrer
)
diff --git a/src/components/VolunteerBoard/TeamWishes/styles.module.scss b/src/components/VolunteerBoard/TeamWishes/styles.module.scss
index 979460e..5fe7878 100755
--- a/src/components/VolunteerBoard/TeamWishes/styles.module.scss
+++ b/src/components/VolunteerBoard/TeamWishes/styles.module.scss
@@ -41,4 +41,10 @@
position: absolute;
right: 20px;
+
+ button {
+ color: $color-green;
+ font-weight: bold;
+ cursor: pointer;
+ }
}
diff --git a/src/components/VolunteerBoard/TeamWishesForm/TeamWishesForm.tsx b/src/components/VolunteerBoard/TeamWishesForm/TeamWishesForm.tsx
index ab23b8c..3c4e39a 100644
--- a/src/components/VolunteerBoard/TeamWishesForm/TeamWishesForm.tsx
+++ b/src/components/VolunteerBoard/TeamWishesForm/TeamWishesForm.tsx
@@ -8,6 +8,7 @@ import { useUserTeamWishes } from "../teamWishes.utils"
import { fetchTeamListIfNeed, selectTeamList } from "../../../store/teamList"
import useSelection from "../useSelection"
import { fetchVolunteerTeamWishesSetIfNeed } from "../../../store/volunteerTeamWishesSet"
+import FormButton from "../../Form/FormButton/FormButton"
type Props = {
afterSubmit?: () => void | undefined
@@ -74,9 +75,7 @@ const TeamWishesForm: FC = ({ afterSubmit }): JSX.Element | null => {
-
- Enregistrer
-
+ Enregistrer
)
diff --git a/src/routes/index.ts b/src/routes/index.ts
index f3ef576..edf66ed 100755
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -47,7 +47,7 @@ export default [
component: Forgot,
},
{
- path: "/teams",
+ path: "/equipes",
component: AsyncTeams,
loadData: loadTeamsData,
},
diff --git a/src/theme/form.scss b/src/theme/form.scss
index 01d3279..5ac4111 100644
--- a/src/theme/form.scss
+++ b/src/theme/form.scss
@@ -1,12 +1,8 @@
@import "./variables";
button {
- padding: 7px 20px;
- background-color: $color-orange;
+ background: none;
border: 0;
- color: $color-white;
- border-radius: 16px;
- font-weight: bold;
cursor: pointer;
}
diff --git a/src/theme/main.scss b/src/theme/main.scss
index 0754f19..571d6e6 100644
--- a/src/theme/main.scss
+++ b/src/theme/main.scss
@@ -11,10 +11,5 @@ body {
a {
color: $color-green;
- text-decoration: none;
- font-weight: bold;
-
- &:hover {
- text-decoration: underline;
- }
+ text-decoration: underline;
}
diff --git a/src/theme/mixins.scss b/src/theme/mixins.scss
index b62bc28..bafa4e0 100644
--- a/src/theme/mixins.scss
+++ b/src/theme/mixins.scss
@@ -6,6 +6,12 @@
}
}
+@mixin mobile {
+ @media (max-width: 799px) {
+ @content;
+ }
+}
+
@mixin flex-center {
display: flex;
justify-content: center;
@@ -82,3 +88,12 @@
left: 50%;
transform: translate(-50%, -50%);
}
+
+@mixin form-button {
+ padding: 7px 20px;
+ background-color: $color-orange;
+ border: 0;
+ color: $color-white;
+ border-radius: 16px;
+ font-weight: bold;
+}