Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactored OrganizationDashboard css/ closes #2513 #2593

Merged
merged 11 commits into from
Dec 13, 2024
Merged

refactored OrganizationDashboard css/ closes #2513 #2593

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be5beb7
refactored OrganizationDashboard css/ closes #2513
devender18 Dec 3, 2024
06f2cc2
refactor:OrganizationDashboard_css(fixes #2513)
devender18 Dec 3, 2024
5450198
Merge branch 'develop-postgres' into devender18/refactor_Organization…
devender18 Dec 3, 2024
9d43cd5
Plugin and advertisement screen revamp (#2006)
duplixx Dec 7, 2024
657fb78
refactored: CSS files in src/screens/OrgSettings(fixes: #2523) (#2610)
devender18 Dec 7, 2024
9ac9e46
Update pull-request.yml
palisadoes Dec 7, 2024
0a88fe9
Merge branch 'develop-postgres' into devender18/refactor_Organization…
devender18 Dec 7, 2024
b6c7566
refactored: CSS files in src/screens/OrganizationDashboard(fixes: #2513)
devender18 Dec 8, 2024
7658f3c
Merge branch 'devender18/refactor_OrganizationDashboard_css' of https…
devender18 Dec 8, 2024
aa8d72a
refactored: CSS files in src/screens/OrganizationDashboard(fixes: #2513)
devender18 Dec 8, 2024
d131188
improve import for global css
devender18 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions src/screens/OrganizationDashboard/OrganizationDashboard.module.css
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/screens/OrganizationDashboard/OrganizationDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import type {
InterfaceQueryOrganizationsListObject,
InterfaceVolunteerRank,
} from 'utils/interfaces';
import styles from './OrganizationDashboard.module.css';
import styles from '../../../src/style/app.module.css';
devender18 marked this conversation as resolved.
Show resolved Hide resolved
import { VOLUNTEER_RANKING } from 'GraphQl/Queries/EventVolunteerQueries';

/**
Expand All @@ -41,7 +41,7 @@ import { VOLUNTEER_RANKING } from 'GraphQl/Queries/EventVolunteerQueries';
*
* @returns The rendered component.
*/
function organizationDashboard(): JSX.Element {
function OrganizationDashboard(): JSX.Element {
const { t } = useTranslation('translation', { keyPrefix: 'dashboard' });
const { t: tCommon } = useTranslation('common');
const { t: tErrors } = useTranslation('errors');
Expand Down Expand Up @@ -483,4 +483,4 @@ function organizationDashboard(): JSX.Element {
);
}

export default organizationDashboard;
export default OrganizationDashboard;
38 changes: 38 additions & 0 deletions src/style/app.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,44 @@ hr {
flex-direction: column;
}

.cardHeader {
padding: 1.25rem 1rem 1rem 1rem;
border-bottom: 1px solid var(--bs-gray-200);
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
}

.cardHeader .cardTitle {
font-size: 1.2rem;
font-weight: 600;
}

.cardBody {
min-height: 180px;
padding-top: 0;
max-height: 570px;
overflow-y: scroll;
width: 100%;
max-width: 400px;
scrollbar-width: thin;
scrollbar-color: rgba(0, 0, 0, 0.3) transparent;
}

.cardBody .emptyContainer {
display: flex;
height: 180px;
justify-content: center;
align-items: center;
}

.cardBody .rankings {
aspect-ratio: 1;
border-radius: 50%;
width: 35px;
}

@media (max-width: 1020px) {
.btnsContainer {
flex-direction: column;
Expand Down
Loading