Skip to content

refactor: delete SASS dep, use native CSS #38

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

Open
wesleyboar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor: delete SASS dep, use native CSS #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c7fd44
refactor: delete SASS dep, use native CSS
wesleyboar Mar 5, 2026
a53db14
Merge branch 'main' into refactor/delete-sass-use-native-css
wesleyboar May 11, 2026
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
24 changes: 0 additions & 24 deletions apcd_cms/src/client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apcd_cms/src/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
"react-test-renderer": "^17.0.2",
"redux-mock-store": "^1.5.3",
"redux-saga-test-plan": "^4.0.0-rc.3",
"sass": "^1.42.1",
"stylelint": "^14.4.0",
"stylelint-config-recommended": "^7.0.0",
"stylelint-config-standard": "^25.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apcd_cms/src/client/src/components/Admin/ViewUsers/EditRecordModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Formik, Field, Form, ErrorMessage } from 'formik';
import { fetchUtil } from 'utils/fetchUtil';
import * as Yup from 'yup';
import { UserRow } from 'hooks/admin';
import styles from './ViewUsers.module.scss';
import styles from './ViewUsers.module.css';
import { formatDate } from 'utils/dateUtil';
import QueryWrapper from 'core-wrappers/QueryWrapper';
import FieldWrapper from 'core-wrappers/FieldWrapperFormik';
Expand Down
2 changes: 1 addition & 1 deletion apcd_cms/src/client/src/components/Admin/ViewUsers/ViewRecordModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Modal, ModalHeader, Row, Col, ModalBody } from 'reactstrap';
import { UserRow } from 'hooks/admin';
import styles from './ViewUsers.module.scss';
import styles from './ViewUsers.module.css';
import { formatDate } from 'utils/dateUtil';

interface UserDetailsModalProps {
Expand Down
18 changes: 9 additions & 9 deletions ...nts/Admin/ViewUsers/ViewUsers.module.scss → ...ents/Admin/ViewUsers/ViewUsers.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$modal-width: 55%;

.customModal {
max-width: $modal-width !important;
width: $modal-width;
--width: 55%;

max-width: var(--width) !important;
width: var(--width);
}

.modal-header {
Expand All @@ -12,18 +12,18 @@ $modal-width: 55%;
}

.customModalTitle {
text-transform: none !important; // Prevent text from being all caps
text-transform: none !important; /* Prevent text from being all caps */
font-size: 2.5rem;
margin: 0; // Ensure there's no margin
margin: 0; /* Ensure there's no margin */
}

.customLabel {
font-size: 1.5rem; // Adjust the font size as needed
font-size: 1.5rem; /* Adjust the font size as needed */
}

.customSubmitButton {
font-size: 1.5rem; // Increase font size
padding: 0.75rem 1.5rem; // Increase padding
font-size: 1.5rem; /* Increase font size */
padding: 0.75rem 1.5rem; /* Increase padding */
}

.viewRecord {
Expand Down
2 changes: 1 addition & 1 deletion apcd_cms/src/client/src/components/Admin/ViewUsers/ViewUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ViewRecordModal from './ViewRecordModal';
import EditRecordModal from './EditRecordModal';
import LoadingSpinner from 'core-components/LoadingSpinner';
import Paginator from 'core-components/Paginator';
import styles from './ViewUsers.module.scss';
import styles from './ViewUsers.module.css';
import { ClearOptionsButton } from 'apcd-components/ClearOptionsButton';

export const ViewUsers: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion apcd_cms/src/client/src/components/Submitter/ViewSubmitterUsers/EditRecordModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Formik, Field, Form, ErrorMessage } from 'formik';
import { fetchUtil } from 'utils/fetchUtil';
import * as Yup from 'yup';
import { SubmitterUserRow } from 'hooks/admin';
import styles from './ViewSubmitterUsers.module.scss';
import styles from './ViewSubmitterUsers.module.css';

interface EditRecordModalProps {
isOpen: boolean;
Expand Down
2 changes: 1 addition & 1 deletion apcd_cms/src/client/src/components/Submitter/ViewSubmitterUsers/ViewRecordModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Modal, ModalHeader, Row, Col, ModalBody } from 'reactstrap';
import { SubmitterUserRow } from 'hooks/admin';
import styles from './ViewSubmitterUsers.module.scss';
import styles from './ViewSubmitterUsers.module.css';
// import { formatDate } from 'utils/dateUtil';

interface UserDetailsModalProps {
Expand Down
18 changes: 9 additions & 9 deletions ...itterUsers/ViewSubmitterUsers.module.scss → ...mitterUsers/ViewSubmitterUsers.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$modal-width: 55%;

.customModal {
max-width: $modal-width !important;
width: $modal-width;
--width: 55%;

max-width: var(--width) !important;
width: var(--width);
}

.modal-header {
Expand All @@ -12,18 +12,18 @@ $modal-width: 55%;
}

.customModalTitle {
text-transform: none !important; // Prevent text from being all caps
text-transform: none !important; /* Prevent text from being all caps */
font-size: 2.5rem;
margin: 0; // Ensure there's no margin
margin: 0; /* Ensure there's no margin */
}

.customLabel {
font-size: 1.5rem; // Adjust the font size as needed
font-size: 1.5rem; /* Adjust the font size as needed */
}

.customSubmitButton {
font-size: 1.5rem; // Increase font size
padding: 0.75rem 1.5rem; // Increase padding
font-size: 1.5rem; /* Increase font size */
padding: 0.75rem 1.5rem; /* Increase padding */
}

.viewRecord {
Expand Down
2 changes: 1 addition & 1 deletion apcd_cms/src/client/src/components/Submitter/ViewSubmitterUsers/ViewSubmitterUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ViewRecordModal from './ViewRecordModal';
import EditRecordModal from './EditRecordModal';
import LoadingSpinner from 'core-components/LoadingSpinner';
import Paginator from 'core-components/Paginator';
import styles from './ViewSubmitterUsers.module.scss';
import styles from './ViewSubmitterUsers.module.css';
import { ClearOptionsButton } from 'apcd-components/ClearOptionsButton';

export const ViewSubmitterUsers: React.FC = () => {
Expand Down
1 change: 0 additions & 1 deletion apcd_cms/src/client/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import path, {resolve} from 'path';


export default defineConfig({
css: { preprocessorOptions: { scss: { charset: false } } },
build: {
outDir: 'dist',
rollupOptions: {
Expand Down