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.

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 CSS files in src/components/EventDashboardScreen #3425

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
198 changes: 0 additions & 198 deletions src/components/EventDashboardScreen/EventDashboardScreen.module.css

This file was deleted.

8 changes: 5 additions & 3 deletions src/components/EventDashboardScreen/EventDashboardScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { updateTargets } from 'state/action-creators';
import { useAppDispatch } from 'state/hooks';
import type { RootState } from 'state/reducers';
import type { TargetsType } from 'state/reducers/routesReducer';
import styles from './EventDashboardScreen.module.css';
import styles from '../../style/app.module.css';
import ProfileDropdown from 'components/ProfileDropdown/ProfileDropdown';
import useLocalStorage from 'utils/useLocalstorage';
import type { InterfaceMapType } from 'utils/interfaces';
Expand Down Expand Up @@ -37,8 +37,10 @@ const EventDashboardScreen = (): JSX.Element => {
if (adminFor === null) {
return (
<>
<div className={`d-flex flex-row ${styles.containerHeight}`}>
<div className={`${styles.colorLight} ${styles.mainContainer}`}>
<div className={`d-flex flex-row ${styles.containerHeightEventDash}`}>
<div
className={`${styles.colorLight} ${styles.mainContainerEventDashboard}`}
>
<div
className={`d-flex flex-row justify-content-between flex-wrap ${styles.gap}`}
>
Expand Down
1 change: 0 additions & 1 deletion src/components/ProfileDropdown/ProfileDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ const profileDropdown = (): JSX.Element => {
<Dropdown.Toggle
split
variant="none"
style={{ backgroundColor: 'white' }}
data-testid="togDrop"
id="dropdown-split-basic"
className={styles.dropdownToggle}
Expand Down
63 changes: 58 additions & 5 deletions src/style/app.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -5715,6 +5715,14 @@ button[data-testid='createPostBtn'] {
padding: 0 1rem;
}

.mainContainerEventDashboard {
width: 50%;
flex-grow: 3;
padding: 20px;
max-height: 100%;
overflow: auto;
}

.selectType {
border-radius: 10px;
}
Expand Down Expand Up @@ -7689,13 +7697,13 @@ button[data-testid='createPostBtn'] {
/* ProfileDropdown */

.profileContainer {
border: none;
border: 1px solid var(--create-button-border);
padding: 2.1rem 0.5rem;
height: 52px;
border-radius: 8px 0px 0px 8px;
border-radius: 16px 0px 0px 16px;
display: flex;
align-items: center;
background-color: var(--profile-bg) !important;
background-color: var(--tablerow-bg-color) !important;
justify-content: space-between;
width: 100%;
/* Add focus styles for keyboard navigation */
Expand All @@ -7704,6 +7712,10 @@ button[data-testid='createPostBtn'] {
}
}

.angleDown {
margin-left: 4px;
}

.profileContainer:focus {
outline: none;
background-color: var(--profileContainer-focus-bg);
Expand Down Expand Up @@ -7751,10 +7763,20 @@ button[data-testid='createPostBtn'] {
background-color: transparent !important;
}
.dropdownToggle {
background-image: url(../../../public/images/svg/angleRight.svg);
background-image: url(../../../public/images/svg/angleDown.svg);
background-repeat: no-repeat;
background-position: center;
background-color: var(--profile-bg) !important;
background-color: var(--tablerow-bg-color) !important;
border: 1px solid var(--create-button-border);
border-left: none;
border-top-right-radius: 16px;
border-bottom-right-radius: 16px;
color: var(--eventManagement-button-text);
}

.dropdownToggle:hover {
border: 1px solid var(--create-button-border);
border-left: none;
}

.dropdownToggle::after {
Expand Down Expand Up @@ -7836,6 +7858,29 @@ button[data-testid='createPostBtn'] {
}
}

@media (max-height: 900px) {
.pageContainer {
padding: 1rem 1.5rem 0 calc(300px + 2rem);
}
.collapseSidebarButton {
height: 30px;
width: calc(300px + 1rem);
}
}

@media (max-height: 650px) {
.pageContainer {
padding: 1rem 1.5rem 0 calc(270px);
}
.collapseSidebarButton {
width: 250px;
height: 20px;
}
.opendrawer {
width: 30px;
}
}

/* For tablets */
@media (max-width: 820px) {
.pageContainer {
Expand Down Expand Up @@ -8127,6 +8172,14 @@ button[data-testid='createPostBtn'] {
padding: 1rem 1.5rem 0 calc(300px + 1.5rem);
}

.containerHeightEventDash {
height: calc(100vh - 66px);
}

.colorLight {
background-color: var(--input-area-color);
}

.expandOrg {
padding-left: 4rem;
animation: moveLeft 0.9s ease-in-out;
Expand Down
Loading