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

NoMongo: Fix Stylesheet in Anticipation of Dark Mode [PR-2] #3716

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
2 changes: 1 addition & 1 deletion src/components/UserPortal/PeopleCard/PeopleCard.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import aboutImg from 'assets/images/defaultImg.png';
import styles from './../../../style/app.module.css';
import styles from './../../../style/app-fixed.module.css';

/**
* Props interface for the PeopleCard component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type { TargetsType } from 'state/reducers/routesReducer';
// import type { InterfaceQueryOrganizationsListObject } from 'utils/interfaces';
// import AngleRightIcon from 'assets/svgs/angleRight.svg?react';
import TalawaLogo from 'assets/svgs/talawa.svg?react';
import styles from '../../../style/app.module.css';
import styles from '../../../style/app-fixed.module.css';
// import Avatar from 'components/Avatar/Avatar';
import ProfileCard from 'components/ProfileCard/ProfileCard';
import SignOut from './../../SignOut/SignOut';
Expand Down
2 changes: 1 addition & 1 deletion src/screens/OrgList/OrganizationModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { Modal, Form, Row, Col, Button } from 'react-bootstrap';
import convertToBase64 from 'utils/convertToBase64';
import type { ChangeEvent } from 'react';
import styles from '../../style/app.module.css';
import styles from '../../style/app-fixed.module.css';
import type { InterfaceCurrentUserTypePG } from 'utils/interfaces';
import { countryOptions } from 'utils/formEnumFields';

Expand Down
2 changes: 1 addition & 1 deletion src/screens/OrgPost/OrgPost.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { toast } from 'react-toastify';
import convertToBase64 from 'utils/convertToBase64';
import { errorHandler } from 'utils/errorHandler';
import type { InterfaceQueryOrganizationPostListItem } from 'utils/interfaces';
import styles from '../../style/app.module.css';
import styles from '../../style/app-fixed.module.css';
import SortingButton from '../../subComponents/SortingButton';
import SearchBar from 'subComponents/SearchBar';

Expand Down
2 changes: 1 addition & 1 deletion src/screens/OrganizationActionItems/ItemDeleteModal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Modal, Button } from 'react-bootstrap';
import styles from '../../style/app.module.css';
import styles from '../../style/app-fixed.module.css';
import { useMutation } from '@apollo/client';
import { DELETE_ACTION_ITEM_MUTATION } from 'GraphQl/Mutations/ActionItemMutations';
import { toast } from 'react-toastify';
Expand Down
2 changes: 1 addition & 1 deletion src/screens/OrganizationActionItems/ItemModal.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useMemo, useState } from 'react';
import { Modal, Form, Button } from 'react-bootstrap';
import type { ChangeEvent, FC } from 'react';
import styles from '../../style/app.module.css';
import styles from '../../style/app-fixed.module.css';
import { DatePicker } from '@mui/x-date-pickers';
import dayjs from 'dayjs';
import type { Dayjs } from 'dayjs';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { type FC, type FormEvent, useEffect, useState } from 'react';
import { Modal, Button, Form } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
import { FormControl, TextField } from '@mui/material';
import styles from '../../style/app.module.css';
import styles from '../../style/app-fixed.module.css';
import { useMutation } from '@apollo/client';
import { UPDATE_ACTION_ITEM_MUTATION } from 'GraphQl/Mutations/ActionItemMutations';
import { toast } from 'react-toastify';
Expand Down
2 changes: 1 addition & 1 deletion src/screens/OrganizationActionItems/ItemViewModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 '../../style/app.module.css';
import styles from '../../style/app-fixed.module.css';
import { useTranslation } from 'react-i18next';
import { FormControl, TextField } from '@mui/material';
import { TaskAlt, HistoryToggleOff } from '@mui/icons-material';
Expand Down
9 changes: 3 additions & 6 deletions src/screens/OrganizationPeople/AddMember.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import type {
InterfaceQueryOrganizationsListObject,
InterfaceQueryUserListItem,
} from 'utils/interfaces';
import styles from '../../style/app.module.css';
import styles from '../../style/app-fixed.module.css';
import Avatar from 'components/Avatar/Avatar';
import SortingButton from 'subComponents/SortingButton';

Expand Down Expand Up @@ -442,10 +442,7 @@ function AddMember(): JSX.Element {
show={createNewUserModalisOpen}
onHide={toggleCreateNewUserModal}
>
<Modal.Header
className={styles.createUserModalHeader}
data-testid="createUser"
>
<Modal.Header className={styles.createButton} data-testid="createUser">
<Modal.Title>Create User</Modal.Title>
</Modal.Header>
<Modal.Body>
Expand Down Expand Up @@ -548,7 +545,7 @@ function AddMember(): JSX.Element {
</div>
</Modal.Body>
<Modal.Footer>
<div className={styles.createUserActionBtns}>
<div className={styles.createButton}>
<Button
className={`${styles.removeButton}`}
variant="danger"
Expand Down
2 changes: 1 addition & 1 deletion src/screens/PageNotFound/PageNotFound.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import useLocalStorage from 'utils/useLocalstorage';

import styles from '../../style/app.module.css';
import styles from '../../style/app-fixed.module.css';
import Logo from 'assets/images/talawa-logo-600x600.png';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/screens/UserPortal/People/People.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import { useQuery } from '@apollo/client';
import SearchOutlinedIcon from '@mui/icons-material/SearchOutlined';
import { FilterAltOutlined } from '@mui/icons-material';
import styles from '../../../style/app.module.css';
import styles from '../../../style/app-fixed.module.css';
import { useTranslation } from 'react-i18next';
import HourglassBottomIcon from '@mui/icons-material/HourglassBottom';
import { useParams } from 'react-router-dom';
Expand Down
Loading