diff --git a/src/components/EventManagement/Dashboard/EventDashboard.module.css b/src/components/EventManagement/Dashboard/EventDashboard.module.css deleted file mode 100644 index 37336002bb..0000000000 --- a/src/components/EventManagement/Dashboard/EventDashboard.module.css +++ /dev/null @@ -1,101 +0,0 @@ -.eventContainer { - display: flex; - align-items: start; -} - -.eventDetailsBox { - position: relative; - box-sizing: border-box; - background: #ffffff; - width: 66%; - padding: 0.3rem; - box-shadow: 0 3px 8px rgba(0, 0, 0, 0.1); - border-radius: 20px; - margin-bottom: 0; - margin-top: 20px; -} -.ctacards { - padding: 20px; - width: 100%; - display: flex; - background-color: #ffffff; - margin: 0 4px; - justify-content: space-between; - box-shadow: 0 3px 8px rgba(0, 0, 0, 0.1); - align-items: center; - border-radius: 20px; -} -.ctacards span { - color: rgb(181, 181, 181); - font-size: small; -} -/* .eventDetailsBox::before { - content: ''; - position: absolute; - top: 0; - height: 100%; - width: 6px; - background-color: #31bb6b; - border-radius: 20px; -} */ - -.time { - display: flex; - justify-content: space-between; - padding: 15px; - padding-bottom: 0px; - width: 33%; - - box-sizing: border-box; - background: #ffffff; - box-shadow: 0 3px 8px rgba(0, 0, 0, 0.1); - border-radius: 20px; - margin-bottom: 0; - margin-top: 20px; - margin-left: 10px; -} - -.startTime, -.endTime { - display: flex; - font-size: 20px; -} - -.to { - padding-right: 10px; -} - -.startDate, -.endDate { - color: #808080; - font-size: 14px; -} - -.titlename { - font-weight: 600; - font-size: 25px; - padding: 15px; - padding-bottom: 0px; - width: 50%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.description { - color: #737373; - font-weight: 300; - font-size: 14px; - word-wrap: break-word; - padding: 15px; - padding-bottom: 0px; -} - -.toporgloc { - font-size: 16px; - padding: 0.5rem; -} - -.toporgloc span { - color: #737373; -} diff --git a/src/components/EventManagement/Dashboard/EventDashboard.tsx b/src/components/EventManagement/Dashboard/EventDashboard.tsx index d3552702c6..1995a640c9 100644 --- a/src/components/EventManagement/Dashboard/EventDashboard.tsx +++ b/src/components/EventManagement/Dashboard/EventDashboard.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { Col, Row } from 'react-bootstrap'; -import styles from './EventDashboard.module.css'; +import styles from '../../../style/app.module.css'; import { useTranslation } from 'react-i18next'; import { EVENT_DETAILS } from 'GraphQl/Queries/Queries'; import { useQuery } from '@apollo/client'; diff --git a/src/components/EventManagement/EventAgendaItems/EventAgendaItems.module.css b/src/components/EventManagement/EventAgendaItems/EventAgendaItems.module.css deleted file mode 100644 index 9d1c32b766..0000000000 --- a/src/components/EventManagement/EventAgendaItems/EventAgendaItems.module.css +++ /dev/null @@ -1,22 +0,0 @@ -.eventAgendaItemContainer h2 { - margin: 0.6rem 0; -} - -.btnsContainer { - display: flex; - gap: 10px; -} - -@media (max-width: 768px) { - .btnsContainer { - margin-bottom: 0; - display: flex; - flex-direction: column; - } - - .createAgendaItemButton { - position: absolute; - top: 1rem; - right: 2rem; - } -} diff --git a/src/components/EventManagement/EventAgendaItems/EventAgendaItems.tsx b/src/components/EventManagement/EventAgendaItems/EventAgendaItems.tsx index b49ade4626..f02ec4e2ca 100644 --- a/src/components/EventManagement/EventAgendaItems/EventAgendaItems.tsx +++ b/src/components/EventManagement/EventAgendaItems/EventAgendaItems.tsx @@ -20,7 +20,7 @@ import type { import AgendaItemsContainer from 'components/AgendaItems/AgendaItemsContainer'; import AgendaItemsCreateModal from 'components/AgendaItems/AgendaItemsCreateModal'; -import styles from './EventAgendaItems.module.css'; +import styles from '../../../style/app.module.css'; import Loader from 'components/Loader/Loader'; /** @@ -177,7 +177,7 @@ function EventAgendaItems(props: { eventId: string }): JSX.Element {
-
+
{/* .table-row { - background-color: #fff !important; -} - -.table-body > .table-row:nth-child(2n) { - background: #afffe8 !important; -} diff --git a/src/components/OrganizationScreen/OrganizationScreen.spec.tsx b/src/components/OrganizationScreen/OrganizationScreen.spec.tsx index e6a75c46d8..f4ff28f6f9 100644 --- a/src/components/OrganizationScreen/OrganizationScreen.spec.tsx +++ b/src/components/OrganizationScreen/OrganizationScreen.spec.tsx @@ -79,6 +79,7 @@ describe('Testing OrganizationScreen', () => { const closeButton = screen.getByTestId('closeMenu'); fireEvent.click(closeButton); + // Check for contract class after closing expect(screen.getByTestId('mainpageright')).toHaveClass(styles.expand); const openButton = screen.getByTestId('openMenu'); diff --git a/src/screens/Leaderboard/Leaderboard.tsx b/src/screens/Leaderboard/Leaderboard.tsx index c5ad7a2efe..5ccfc1887e 100644 --- a/src/screens/Leaderboard/Leaderboard.tsx +++ b/src/screens/Leaderboard/Leaderboard.tsx @@ -14,7 +14,7 @@ import silver from 'assets/images/silver.png'; import bronze from 'assets/images/bronze.png'; import type { InterfaceVolunteerRank } from 'utils/interfaces'; -import styles from '../OrganizationActionItems/OrganizationActionItems.module.css'; +import styles from '../../style/app.module.css'; import Loader from 'components/Loader/Loader'; import { DataGrid, diff --git a/src/screens/OrganizationActionItems/ItemDeleteModal.tsx b/src/screens/OrganizationActionItems/ItemDeleteModal.tsx index 2526486993..499601e4fd 100644 --- a/src/screens/OrganizationActionItems/ItemDeleteModal.tsx +++ b/src/screens/OrganizationActionItems/ItemDeleteModal.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Modal, Button } from 'react-bootstrap'; -import styles from './OrganizationActionItems.module.css'; +import styles from '../../style/app.module.css'; import { useMutation } from '@apollo/client'; import { DELETE_ACTION_ITEM_MUTATION } from 'GraphQl/Mutations/ActionItemMutations'; import { toast } from 'react-toastify'; diff --git a/src/screens/OrganizationActionItems/ItemViewModal.tsx b/src/screens/OrganizationActionItems/ItemViewModal.tsx index 5a78ac8a91..98f2f6fd7f 100644 --- a/src/screens/OrganizationActionItems/ItemViewModal.tsx +++ b/src/screens/OrganizationActionItems/ItemViewModal.tsx @@ -4,7 +4,7 @@ import dayjs from 'dayjs'; import type { FC } from 'react'; import { Button, Form, Modal } from 'react-bootstrap'; import type { InterfaceActionItemInfo } from 'utils/interfaces'; -import styles from './OrganizationActionItems.module.css'; +import styles from '../../style/app.module.css'; import { useTranslation } from 'react-i18next'; import { FormControl, TextField } from '@mui/material'; import { TaskAlt, HistoryToggleOff } from '@mui/icons-material'; diff --git a/src/screens/OrganizationActionItems/OrganizationActionItems.module.css b/src/screens/OrganizationActionItems/OrganizationActionItems.module.css deleted file mode 100644 index ac86e19f3f..0000000000 --- a/src/screens/OrganizationActionItems/OrganizationActionItems.module.css +++ /dev/null @@ -1,291 +0,0 @@ -actionItemsContainer { - height: 90vh; -} - -.actionItemModal { - max-width: 80vw; - margin-top: 2vh; - margin-left: 13vw; -} - -.datediv { - display: flex; - flex-direction: row; -} - -.datebox { - width: 90%; - border-radius: 7px; - outline: none; - box-shadow: none; - padding-top: 2px; - padding-bottom: 2px; - padding-right: 5px; - padding-left: 5px; - margin-right: 5px; - margin-left: 5px; -} - -.dropdownToggle { - margin-bottom: 0; - display: flex; -} - -.dropdownModalToggle { - width: 50%; -} - -.errorIcon { - transform: scale(1.5); - color: var(--bs-danger); - margin-bottom: 1rem; -} - -.greenregbtn { - margin: 1rem 0 0; - margin-top: 15px; - border: 1px solid var(--bs-gray-300); - box-shadow: 0 2px 2px var(--bs-gray-300); - padding: 10px 10px; - border-radius: 5px; - background-color: var(--bs-primary); - width: 100%; - font-size: 16px; - color: var(--bs-white); - outline: none; - font-weight: 600; - cursor: pointer; - transition: - transform 0.2s, - box-shadow 0.2s; - width: 100%; -} - -hr { - border: none; - height: 1px; - background-color: var(--bs-gray-500); - margin: 1rem; -} - -.iconContainer { - display: flex; - justify-content: flex-end; -} -.icon { - margin: 1px; -} - -.message { - margin-top: 25%; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; -} - -.preview { - display: flex; - flex-direction: row; - font-weight: 900; - font-size: 16px; - color: rgb(80, 80, 80); -} - -.removeFilterIcon { - cursor: pointer; -} - -.searchForm { - display: inline; -} - -.view { - margin-left: 2%; - font-weight: 600; - font-size: 16px; - color: var(--bs-gray-600); -} - -/* header (search, filter, dropdown) */ -.btnsContainer { - display: flex; - margin: 0.5rem 0 1.5rem 0; -} - -.btnsContainer .input { - flex: 1; - min-width: 18rem; - position: relative; -} - -.btnsContainer input { - outline: 1px solid var(--bs-gray-400); -} - -.btnsContainer .input button { - width: 52px; -} - -.noOutline input { - outline: none; -} - -.noOutline input:disabled { - -webkit-text-fill-color: black !important; -} - -.noOutline textarea:disabled { - -webkit-text-fill-color: black !important; -} - -.inputField { - margin-top: 10px; - margin-bottom: 10px; - background-color: white; - box-shadow: 0 1px 1px #31bb6b; -} - -.inputField > button { - padding-top: 10px; - padding-bottom: 10px; -} - -.dropdown { - background-color: white; - border: 1px solid #31bb6b; - position: relative; - display: inline-block; - color: #31bb6b; -} - -/* Action Items Data Grid */ -.rowBackground { - background-color: var(--bs-white); - max-height: 120px; -} - -.tableHeader { - background-color: var(--bs-primary); - color: var(--bs-white); - font-size: 1rem; -} - -.chipIcon { - height: 0.9rem !important; -} - -.chip { - height: 1.5rem !important; -} - -.active { - background-color: #31bb6a50 !important; -} - -.pending { - background-color: #ffd76950 !important; - color: #bb952bd0 !important; - border-color: #bb952bd0 !important; -} - -/* Modals */ -.itemModal { - max-width: 80vw; - margin-top: 2vh; - margin-left: 13vw; -} - -.titlemodal { - color: #707070; - font-weight: 600; - font-size: 32px; - width: 65%; - margin-bottom: 0px; -} - -.modalCloseBtn { - width: 40px; - height: 40px; - padding: 1rem; - display: flex; - justify-content: center; - align-items: center; -} - -.imageContainer { - display: flex; - align-items: center; - justify-content: center; - margin-right: 0.5rem; -} - -.TableImage { - object-fit: cover; - width: 25px !important; - height: 25px !important; - border-radius: 100% !important; -} - -.avatarContainer { - width: 28px; - height: 26px; -} - -/* Toggle Btn */ -.toggleGroup { - width: 50%; - min-width: 20rem; - margin: 0.5rem 0rem; -} - -.toggleBtn { - padding: 0rem; - height: 2rem; - display: flex; - justify-content: center; - align-items: center; -} - -.toggleBtn:hover { - color: #31bb6b !important; -} - -input[type='radio']:checked + label { - background-color: #31bb6a50 !important; -} - -input[type='radio']:checked + label:hover { - color: black !important; -} /* Toggle Btn */ -.toggleGroup { - width: 50%; - min-width: 20rem; - margin: 0.5rem 0rem; -} - -.toggleBtn { - padding: 0rem; - height: 2rem; - display: flex; - justify-content: center; - align-items: center; -} - -.toggleBtn:hover { - color: #31bb6b !important; -} - -input[type='radio']:checked + label { - background-color: #31bb6a50 !important; -} - -input[type='radio']:checked + label:hover { - color: black !important; -} - -.rankings { - aspect-ratio: 1; - border-radius: 50%; - width: 50px; -} diff --git a/src/screens/OrganizationActionItems/OrganizationActionItems.tsx b/src/screens/OrganizationActionItems/OrganizationActionItems.tsx index 3fde2911b1..442d490827 100644 --- a/src/screens/OrganizationActionItems/OrganizationActionItems.tsx +++ b/src/screens/OrganizationActionItems/OrganizationActionItems.tsx @@ -366,8 +366,8 @@ function organizationActionItems(): JSX.Element { return (
{/* Header with search, filter and Create Button */} -
-
+
+
-
+
.table-row { + background-color: #fff !important; +} + +.table-body > .table-row:nth-child(2n) { + background: #afffe8 !important; +} + +.eventAgendaItemContainer h2 { + margin: 0.6rem 0; +} + +.agendabtnsContainer { + display: flex; + gap: 10px; +} + +@media (max-width: 768px) { + .btnsContainer { + margin-bottom: 0; + display: flex; + flex-direction: column; + } + + .createAgendaItemButton { + position: absolute; + top: 1rem; + right: 2rem; + } +} @media (max-width: 1020px) { .btnsContainer { flex-direction: column;