From 7b174e7085070162b8144c9e605d3519fe1bd067 Mon Sep 17 00:00:00 2001 From: ORDONNEAU Antoine Date: Thu, 26 Mar 2026 12:16:56 +0100 Subject: [PATCH] mise en commun des scrollbar,et padding des glassBorder --- src/components/Header/Header.module.css | 5 ++-- .../NotificationCard/NotificationCard.jsx | 2 +- src/components/ToolBar/ToolBar.module.css | 2 +- src/index.css | 16 ++++++----- .../PendingMembers/PendingMembers.module.css | 1 + .../AssignUserBtn/AssignUserBtn.module.css | 1 - .../components/EventTask/EventTask.module.css | 10 ------- .../components/EventTask/EventTask.tsx | 2 +- .../Events/components/Event/Event.module.css | 1 - .../components/Calendar/Calendar.module.css | 16 +---------- .../components/EventList/EventList.module.css | 3 +-- .../DeleteMember/DeleteMemberBtn.tsx | 2 +- .../ManageMember/ManageMember.module.css | 8 +----- .../components/ManageMember/ManageMember.tsx | 27 ++++++++++--------- .../ManageMember/ModifyRole/ModifyRole.jsx | 2 +- .../SettingsModal/SettingsModal.module.css | 1 - src/pages/RGPD/RGPDPage.jsx | 2 +- src/pages/RGPD/RGPDPage.module.css | 2 +- 18 files changed, 37 insertions(+), 66 deletions(-) diff --git a/src/components/Header/Header.module.css b/src/components/Header/Header.module.css index 952529d..af325b9 100644 --- a/src/components/Header/Header.module.css +++ b/src/components/Header/Header.module.css @@ -150,7 +150,7 @@ .notificationDiv { position: absolute; - width: 300px; + width: auto; top: 105%; right: 2rem; opacity: 0; @@ -159,7 +159,8 @@ z-index: 0; max-height: 60vh; overflow: scroll; - scrollbar-width: none; + overflow-x: hidden; + backdrop-filter: blur(10px); } .activeNotificationDiv { diff --git a/src/components/NotificationCard/NotificationCard.jsx b/src/components/NotificationCard/NotificationCard.jsx index 50774b4..7eb6464 100644 --- a/src/components/NotificationCard/NotificationCard.jsx +++ b/src/components/NotificationCard/NotificationCard.jsx @@ -7,7 +7,7 @@ import styles from "./NotificationCard.module.css" function NotificationCard({notifications, deleteNotification}) { return ( notifications.map((notification, index) => ( -
+
Le {formatDate(notification.created_at)} à {formatTime(notification.created_at)} diff --git a/src/components/ToolBar/ToolBar.module.css b/src/components/ToolBar/ToolBar.module.css index 270fb99..19b0334 100644 --- a/src/components/ToolBar/ToolBar.module.css +++ b/src/components/ToolBar/ToolBar.module.css @@ -83,7 +83,7 @@ right: 0; align-items: flex-start; width: 100%; - margin-top: 16px; + margin: 6px 0 16px 0; } .filterContainer{ diff --git a/src/index.css b/src/index.css index 601e888..35d63d6 100644 --- a/src/index.css +++ b/src/index.css @@ -2,6 +2,7 @@ margin: 0; padding: 0; box-sizing: border-box; + scrollbar-color: #b5b5b5 transparent; } html { @@ -26,13 +27,6 @@ html { inset 0 0 8px 4px rgba(255, 255, 255, 0.2); } -@media screen and (max-width: 768px) { - .content{ - padding: 0.7rem; - } -} - - .content { padding: 1.5rem; z-index: 1; @@ -78,6 +72,7 @@ body.dark { } .glassBorder{ + padding: 10px 20px 10px 20px; border-radius: 20px; border: none; background: rgb(255, 255, 255, 0.25); @@ -101,3 +96,10 @@ button:focus, button:focus-visible { outline: 4px auto -webkit-focus-ring-color; } + +@media screen and (max-width: 768px) { + .content{ + padding: 0.7rem; + } +} + diff --git a/src/pages/Admin/components/PendingMembers/PendingMembers.module.css b/src/pages/Admin/components/PendingMembers/PendingMembers.module.css index 33639c4..92bac52 100644 --- a/src/pages/Admin/components/PendingMembers/PendingMembers.module.css +++ b/src/pages/Admin/components/PendingMembers/PendingMembers.module.css @@ -2,6 +2,7 @@ width: 100%; } + .rightBlock > h2 { font-size: 29px; } diff --git a/src/pages/EventDetail/components/AssignUserBtn/AssignUserBtn.module.css b/src/pages/EventDetail/components/AssignUserBtn/AssignUserBtn.module.css index dc40708..896e07b 100644 --- a/src/pages/EventDetail/components/AssignUserBtn/AssignUserBtn.module.css +++ b/src/pages/EventDetail/components/AssignUserBtn/AssignUserBtn.module.css @@ -9,7 +9,6 @@ display: flex; align-items: center; justify-content: space-between; - padding: 10px 20px 10px 20px; } .userName { diff --git a/src/pages/EventDetail/components/EventTask/EventTask.module.css b/src/pages/EventDetail/components/EventTask/EventTask.module.css index 6e70f39..6cec4e9 100644 --- a/src/pages/EventDetail/components/EventTask/EventTask.module.css +++ b/src/pages/EventDetail/components/EventTask/EventTask.module.css @@ -17,16 +17,6 @@ .content { margin: 16px 0 16px 0; - padding: 10px 20px 10px 20px; - border-radius: 20px; - border: none; - background: transparent; - box-shadow: - inset 1.25px 1.25px 1px rgba(255, 255, 255, 1), - inset -1.25px -1.25px 1px rgba(255, 255, 255, 1), - inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2), - inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2); - opacity: 0; animation: fadeInUp 0.6s ease-out forwards; animation-delay: calc(var(--i) * 0.1s); } diff --git a/src/pages/EventDetail/components/EventTask/EventTask.tsx b/src/pages/EventDetail/components/EventTask/EventTask.tsx index 4a1188b..bcd3bd0 100644 --- a/src/pages/EventDetail/components/EventTask/EventTask.tsx +++ b/src/pages/EventDetail/components/EventTask/EventTask.tsx @@ -81,7 +81,7 @@ export default function EventTask({ task, index, eventId }: EventTaskProps) { }; return ( -
+
diff --git a/src/pages/Events/components/Event/Event.module.css b/src/pages/Events/components/Event/Event.module.css index 1f8b48a..32f059c 100644 --- a/src/pages/Events/components/Event/Event.module.css +++ b/src/pages/Events/components/Event/Event.module.css @@ -2,7 +2,6 @@ display: flex; flex-direction: column; width: 80%; - padding: 10px 20px 10px 20px; } .eventContainer:hover { diff --git a/src/pages/Home/components/Calendar/Calendar.module.css b/src/pages/Home/components/Calendar/Calendar.module.css index 5ce66c3..c95a96e 100644 --- a/src/pages/Home/components/Calendar/Calendar.module.css +++ b/src/pages/Home/components/Calendar/Calendar.module.css @@ -114,27 +114,13 @@ list-style: none; } -.eventGroup{ - border-radius: 20px; - padding: 15px; - margin-top: 16px; - border: none; - background: rgb(255, 255, 255, 0.25); - box-shadow: - inset 1.25px 1.25px 1px rgba(255, 255, 255, 1), - inset -1.25px -1.25px 1px rgba(255, 255, 255, 1), - inset -0.25px 0.25px 1px rgba(0, 0, 0, 0.2), - inset 0.25px -0.25px 1px rgba(0, 0, 0, 0.2); -} - .glassCard { width: 45%; max-height: 90vh; margin: 16px 0 16px 0; - padding: 10px 20px 10px 20px; height: fit-content; overflow: scroll; - + overflow-x: hidden; } .glassCard::-webkit-scrollbar{ diff --git a/src/pages/Home/components/EventList/EventList.module.css b/src/pages/Home/components/EventList/EventList.module.css index 00f0210..dca387c 100644 --- a/src/pages/Home/components/EventList/EventList.module.css +++ b/src/pages/Home/components/EventList/EventList.module.css @@ -2,9 +2,9 @@ width: 45%; max-height: 90vh; margin: 16px 0 16px 0; - padding: 10px 20px 10px 20px; height: fit-content; overflow: scroll; + overflow-x: hidden; } .glassCard::-webkit-scrollbar{ @@ -41,7 +41,6 @@ h2{ .eventGroup{ margin: 16px 0 16px 0; - padding: 10px 20px 10px 20px; } .eventGroup:hover{ diff --git a/src/pages/Profile/components/ManageMember/DeleteMember/DeleteMemberBtn.tsx b/src/pages/Profile/components/ManageMember/DeleteMember/DeleteMemberBtn.tsx index fd9e6eb..774b515 100644 --- a/src/pages/Profile/components/ManageMember/DeleteMember/DeleteMemberBtn.tsx +++ b/src/pages/Profile/components/ManageMember/DeleteMember/DeleteMemberBtn.tsx @@ -19,7 +19,7 @@ export default function DeleteMemberBtn({name, id, className}: { name: string, i } return
- + setOpen(false)} title={"Supprimer"}>
diff --git a/src/pages/Profile/components/ManageMember/ManageMember.module.css b/src/pages/Profile/components/ManageMember/ManageMember.module.css index fc250ad..a1b642e 100644 --- a/src/pages/Profile/components/ManageMember/ManageMember.module.css +++ b/src/pages/Profile/components/ManageMember/ManageMember.module.css @@ -27,16 +27,10 @@ .select { width: 70%; - padding: 10px 14px; - font-size: 14px; font-weight: 500; color: #1d1d1f; - - background-color: #ffffff; - border: 1px solid #d2d2d7; - border-radius: 10px; - + background: rgb(255, 255, 255, 0.75); appearance: none; -webkit-appearance: none; -moz-appearance: none; diff --git a/src/pages/Profile/components/ManageMember/ManageMember.tsx b/src/pages/Profile/components/ManageMember/ManageMember.tsx index 5eafdb7..114f6bb 100644 --- a/src/pages/Profile/components/ManageMember/ManageMember.tsx +++ b/src/pages/Profile/components/ManageMember/ManageMember.tsx @@ -4,38 +4,39 @@ import {useContext, useState} from "react"; import styles from "./ManageMember.module.css" import DeactivateMemberBtn from "./DeactivateMember/DeactivateMemberBtn.jsx"; import ModifyRole from "./ModifyRole/ModifyRole.jsx"; -import { AuthContext, AuthContextType } from "../../../../contexts/Auth/AuthContext.js"; +import {AuthContext, AuthContextType} from "../../../../contexts/Auth/AuthContext.js"; import DeleteMemberBtn from "./DeleteMember/DeleteMemberBtn"; -import User from "../../../../interfaces/user.interface"; +import User from "../../../../interfaces/user.interface"; -export default function ManageMember({ userToManage }: { userToManage: User }) { +export default function ManageMember({userToManage}: { userToManage: User }) { - const { user } = useContext(AuthContext) as AuthContextType; + const {user} = useContext(AuthContext) as AuthContextType; const [open, setOpen] = useState(false); return <> setOpen(false)} title={`Gestion de l'utilisateur ${userToManage.name}`}> {(user?.id != userToManage.id) ? ( -
-

Désactiver le compte

- - -

Supprimer le compte

- +
+

Désactiver le compte

+ +

Supprimer le compte

+
) : null} -
+

Modifier le rôle

- +
diff --git a/src/pages/Profile/components/ManageMember/ModifyRole/ModifyRole.jsx b/src/pages/Profile/components/ManageMember/ModifyRole/ModifyRole.jsx index 027d17c..769ef6c 100644 --- a/src/pages/Profile/components/ManageMember/ModifyRole/ModifyRole.jsx +++ b/src/pages/Profile/components/ManageMember/ModifyRole/ModifyRole.jsx @@ -40,7 +40,7 @@ export default function ModifyRole({ user }) {