Skip to content

Commit

Permalink
Update Action Item Page according to Figma Style Guide
Browse files Browse the repository at this point in the history
  • Loading branch information
pranavnathe committed Jan 21, 2025
1 parent f7d28d5 commit 7f816bc
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 12 deletions.
7 changes: 5 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import '../src/assets/css/scrollStyles.css';
const theme = createTheme({
palette: {
primary: {
main: '#31bb6b',
main: '#1778F2',
},
},
});
Expand Down Expand Up @@ -139,7 +139,10 @@ const client: ApolloClient<NormalizedCacheObject> = new ApolloClient({
const fallbackLoader = <div className="loader"></div>;

const container = document.getElementById('root');
const root = createRoot(container!); // Note the use of '!' is to assert the container is not null
if (!container) {
throw new Error('Root container missing in the DOM');

Check warning on line 143 in src/index.tsx

View check run for this annotation

Codecov / codecov/patch

src/index.tsx#L143

Added line #L143 was not covered by tests
}
const root = createRoot(container);

Check warning on line 145 in src/index.tsx

View check run for this annotation

Codecov / codecov/patch

src/index.tsx#L145

Added line #L145 was not covered by tests

root.render(
<Suspense fallback={fallbackLoader}>
Expand Down
2 changes: 1 addition & 1 deletion src/screens/OrganizationActionItems/ItemDeleteModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const ItemDeleteModal: React.FC<InterfaceItemDeleteModalProps> = ({
<Button
variant="danger"
onClick={hide}
className={styles.modalCloseBtn}
className={styles.closeButton}
data-testid="modalCloseBtn"
>
{' '}
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 @@ -57,7 +57,7 @@ const ItemViewModal: FC<InterfaceViewModalProps> = ({ isOpen, hide, item }) => {
<Button
variant="danger"
onClick={hide}
className={styles.modalCloseBtn}
className={styles.closeButton}
data-testid="modalCloseBtn"
>
<i className="fa fa-times"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,20 +468,20 @@ function organizationActionItems(): JSX.Element {
}}
sx={{
borderRadius: '20px',
backgroundColor: 'EAEBEF)',
backgroundColor: 'FFFFFF)',
'& .MuiDataGrid-row': {
backgroundColor: '#eff1f7',
backgroundColor: '#FFFFFF',
'&:focus-within': {
// outline: '2px solid #000',
outlineOffset: '-2px',
},
},
'& .MuiDataGrid-row:hover': {
backgroundColor: '#EAEBEF',
backgroundColor: '#FFFFFF',
boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.1)',
},
'& .MuiDataGrid-row.Mui-hovered': {
backgroundColor: '#EAEBEF',
backgroundColor: '#FFFFFF',
boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.1)',
},
'& .MuiDataGrid-cell:focus': {
Expand Down
15 changes: 11 additions & 4 deletions src/style/app.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
--dark-blue: #1778f2;
--remove-button-color: #c8102e;
--card-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
--drop-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);

/* breakpoints */
--breakpoint-mobile: 576px;
Expand Down Expand Up @@ -333,6 +334,12 @@
text-decoration: underline;
}

.closeButton {
color: var(--remove-button-color);
border: none;
background-color: var(--white-color);
}

.dropdown {
background-color: var(--bs-white) !important;
min-width: 150px;
Expand All @@ -353,7 +360,7 @@
:disabled,
:checked
) {
box-shadow: 2.5px 2.5px 2.5px var(--dropdown-shadow);
box-shadow: var(--drop-shadow);
border: 1px solid var(--brown-color) !important;
color: var(--dropdown-color) !important;
}
Expand Down Expand Up @@ -477,7 +484,7 @@
.createButton {
background-color: var(--grey-bg-color) !important;
color: var(--black-color) !important;
/* margin-top: 10px; */
margin-top: 10px;
/* margin-left: 5px; */
border: 1px solid var(--brown-color);
}
Expand All @@ -486,6 +493,7 @@
background-color: var(--grey-bg-color) !important;
color: var(--black-color) !important;
border: 1px solid var(--brown-color) !important;
box-shadow: var(--drop-shadow);
}

.visuallyHidden {
Expand All @@ -503,13 +511,12 @@
margin-top: 10px;
margin-bottom: 10px;
background-color: var(--bs-white);
box-shadow: 0 1px 1px var(--input-shadow-color);
}

.inputField:focus {
border: 0.1px solid var(--input-field-border) !important;
background-color: var(--input-field-bg) !important;
box-shadow: 4px 4px 8px var(--input-field-shadow);
box-shadow: var(--drop-shadow);
outline: none;
transition: box-shadow 0.2s ease;
}
Expand Down

0 comments on commit 7f816bc

Please sign in to comment.