diff --git a/src/components/ProfileDropdown/ProfileDropdown.module.css b/src/components/ProfileDropdown/ProfileDropdown.module.css index 46af582126..2138a82cb7 100644 --- a/src/components/ProfileDropdown/ProfileDropdown.module.css +++ b/src/components/ProfileDropdown/ProfileDropdown.module.css @@ -2,13 +2,18 @@ border: none; padding: 2.1rem 0.5rem; height: 52px; + width: 15vw; border-radius: 8px 0px 0px 8px; display: flex; + position: absolute; align-items: center; + top: 5vh; + right: 5vw; background-color: white !important; box-shadow: 0 4px 4px 0 rgba(177, 177, 177, 0.2), 0 6px 44px 0 rgba(246, 246, 246, 0.19); + z-index: 1000; } .profileContainer:focus { outline: none; @@ -60,10 +65,18 @@ background-color: transparent !important; } .dropdownToggle { + height: 7.7vh; + position: absolute; + top: 5vh; + right: 2.7vw; + box-shadow: + 0 4px 4px 0 rgba(177, 177, 177, 0.2), + 0 6px 44px 0 rgba(246, 246, 246, 0.19); background-image: url(/public/images/svg/angleDown.svg); background-repeat: no-repeat; background-position: center; - background-color: azure; + background-color: white !important; + z-index: 1000; } .dropdownToggle::after { diff --git a/src/screens/UserPortal/Chat/Chat.test.tsx b/src/screens/UserPortal/Chat/Chat.test.tsx index 66e6115ce7..62f0917ac8 100644 --- a/src/screens/UserPortal/Chat/Chat.test.tsx +++ b/src/screens/UserPortal/Chat/Chat.test.tsx @@ -2160,6 +2160,7 @@ describe('Testing Chat Screen [User Portal]', () => { }); test('create new direct chat', async () => { + const mock = [ ...USER_JOINED_ORG_MOCK, ...GROUP_CHAT_BY_ID_QUERY_MOCK, diff --git a/src/screens/UserPortal/Events/Events.module.css b/src/screens/UserPortal/Events/Events.module.css index db80124201..2236e274d9 100644 --- a/src/screens/UserPortal/Events/Events.module.css +++ b/src/screens/UserPortal/Events/Events.module.css @@ -14,14 +14,9 @@ max-width: 800px; } -.colorLight { - background-color: #f1f3f6; -} - .mainContainer { width: 50%; flex-grow: 3; - padding: 20px; max-height: 100%; overflow: auto; } diff --git a/src/screens/UserPortal/Events/Events.tsx b/src/screens/UserPortal/Events/Events.tsx index 627df83539..d1e833a858 100644 --- a/src/screens/UserPortal/Events/Events.tsx +++ b/src/screens/UserPortal/Events/Events.tsx @@ -220,7 +220,9 @@ export default function events(): JSX.Element { <>
-

Events

+
+

Events

+