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

Using Global CSS root variables across all files #3014

Merged
Merged
Show file tree
Hide file tree
Changes from 3 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
13 changes: 1 addition & 12 deletions src/components/AddOn/core/AddOnEntry/AddOnEntry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,8 @@ function addOnEntry({
<>
<Card
data-testid="AddOnEntry"
style={{ border: '1px solid #31BB6B', borderRadius: '10px' }}
style={{ border: 'var(--primary-border-green)', borderRadius: '10px' }}
>
{/* {uninstalledOrgs.includes(currentOrg) && (
<Form.Check
type="switch"
id="custom-switch"
label={t('enable')}
className={styles.entrytoggle}
onChange={(): void => {}}
disabled={switchInProgress}
checked={enabled}
/>
)} */}
<Card.Body>
<Card.Title style={{ fontWeight: '800' }}>{title}</Card.Title>
<Card.Subtitle className="mb-2 text-muted author">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,12 +312,12 @@ function EventAttendance(): JSX.Element {
componentsProps={{
tooltip: {
sx: {
backgroundColor: 'white',
backgroundColor: 'var(--bs-white)',
fontSize: '2em',
maxHeight: '170px',
overflowY: 'scroll',
scrollbarColor: 'white',
border: '1px solid green',
border: 'var(--primary-border-green)',
borderRadius: '6px',
boxShadow: '0 0 5px rgba(0,0,0,0.1)',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@mui/material';
import { Button, Table } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
import style from '../../../style/app.module.css';
import styles from '../../../style/app.module.css';
import { useLazyQuery } from '@apollo/client';
import { EVENT_ATTENDEES, EVENT_REGISTRANTS } from 'GraphQl/Queries/Queries';
import { useParams } from 'react-router-dom';
Expand Down Expand Up @@ -112,7 +112,7 @@ function EventRegistrants(): JSX.Element {
)}
<Button
data-testid="filter-button"
className={`border-1 mx-4 ${style.createButton} `}
className={`border-1 mx-4 ${styles.createButton} `}
>
<img
src="/images/svg/organization.svg"
Expand All @@ -123,39 +123,39 @@ function EventRegistrants(): JSX.Element {
{t('allRegistrants')}
</Button>
</div>
<TableContainer component={Paper} className={`mt-3 ${style.tableHead}`}>
<TableContainer component={Paper} className={`mt-3 ${styles.tableHead}`}>
<Table aria-label={t('eventRegistrantsTable')} role="grid">
<TableHead>
<TableRow role="row" className={`${style.rowBackground}`}>
<TableRow role="row" className={`${styles.rowBackground}`}>
<TableCell
data-testid="table-header-serial"
className={style.tableHeader}
className={styles.tableHeader}
role="columnheader"
aria-sort="none"
>
{t('serialNumber')}
</TableCell>
<TableCell
data-testid="table-header-registrant"
className={style.tableHeader}
className={styles.tableHeader}
>
{t('registrant')}
</TableCell>
<TableCell
data-testid="table-header-registered-at"
className={style.tableHeader}
className={styles.tableHeader}
>
{t('registeredAt')}
</TableCell>
<TableCell
data-testid="table-header-created-at"
className={style.tableHeader}
className={styles.tableHeader}
>
{t('createdAt')}
</TableCell>
<TableCell
data-testid="table-header-add-registrant"
className={style.tableHeader}
className={styles.tableHeader}
>
{t('addRegistrant')}
</TableCell>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const VolunteerGroupViewModal: React.FC<InterfaceVolunteerGroupViewModal> = ({
className="fw-lighter ms-2 mb-0"
style={{
fontSize: '0.8rem',
color: 'grey',
color: 'var(--search-button-border)',
}}
>
Volunteers
Expand Down
2 changes: 1 addition & 1 deletion src/screens/ManageTag/ManageTag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ function ManageTag(): JSX.Element {
</div>
<hr
style={{
borderColor: 'lightgray',
borderColor: 'var(--grey-border-box-color)',
borderWidth: '2px',
width: '85%',
}}
Expand Down
1 change: 0 additions & 1 deletion src/screens/OrgList/OrgList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import type {
InterfaceUserType,
} from 'utils/interfaces';
import useLocalStorage from 'utils/useLocalstorage';
// import styles from '../../style/app.module.css';
import styles from '../../style/app.module.css';
import OrganizationModal from './OrganizationModal';

Expand Down
12 changes: 5 additions & 7 deletions src/screens/OrganizationTags/OrganizationTags.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -402,25 +402,23 @@ function OrganizationTags(): JSX.Element {
),
}}
sx={{
borderRadius: '20px',
backgroundColor: '#EAEBEF',
borderRadius: 'var(--table-head-radius)',
backgroundColor: 'var(--grey-bg-color)',
'& .MuiDataGrid-row': {
backgroundColor: '#eff1f7',
backgroundColor: 'var(--tablerow-bg-color)',
'&:focus-within': {
// outline: '2px solid #000',
outlineOffset: '-2px',
},
},
'& .MuiDataGrid-row:hover': {
backgroundColor: '#EAEBEF',
backgroundColor: 'var(--grey-bg-color)',
boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.1)',
},
'& .MuiDataGrid-row.Mui-hovered': {
backgroundColor: '#EAEBEF',
backgroundColor: 'var(--grey-bg-color)',
boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.1)',
},
'& .MuiDataGrid-cell:focus': {
// outline: '2px solid #000',
outlineOffset: '-2px',
},
}}
Expand Down
1 change: 0 additions & 1 deletion src/screens/Requests/Requests.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ const Requests = (): JSX.Element => {
tabIndex={-1}
className={`${styles.searchButton} `}
data-testid="searchButton"
// style={{ marginTop: '9px' }}
onClick={handleSearchByBtnClick}
>
<Search />
Expand Down
2 changes: 2 additions & 0 deletions src/style/app.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
--tablerow-bg-color: #eff1f7;
--row-background: var(--bs-white, white);
--font-size-header: 16px;

--primary-border-green: 1px solid #31bb6b;
palisadoes marked this conversation as resolved.
Show resolved Hide resolved
--input-area-color: #f1f3f6;
--date-picker-background: #f2f2f2;
--grey-bg-color-dark: #707070;
Expand Down
Loading