Apply primary button style to CSV download, share snapshot modals

hackforla · Nov 14, 2024 · 37c1e05 · 37c1e05
1 parent a124513
commit 37c1e05
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/client/src/components/Projects/CsvModal.jsx b/client/src/components/Projects/CsvModal.jsx
@@ -165,7 +165,11 @@ const CsvModal = ({
           </Button>
 
           {(project || projectCollection) && !loading && !csvData && (
-            <Button onClick={handleGenerateButton} variant="error">
+            <Button
+              onClick={handleGenerateButton}
+              variant="contained"
+              color={"colorPrimary"}
+            >
               Generate File
             </Button>
           )}
@@ -174,8 +178,8 @@ const CsvModal = ({
             <CSVLink
               data={csvData}
               style={{
-                backgroundColor: "green",
-                color: "black",
+                backgroundColor: theme.colorPrimary,
+                color: theme.colors.primary.black,
                 textDecoration: "none",
                 height: "1.4rem",
                 fontFamily: "Calibri",

diff --git a/client/src/components/Projects/DownloadProjectModal.jsx b/client/src/components/Projects/DownloadProjectModal.jsx
@@ -98,13 +98,6 @@ export default function DownloadProjectModal({
         <Button onClick={onClose} variant="outlined">
           Close
         </Button>
-        {/* <Button
-          onClick={() => onClose("ok")}
-          variant="contained"
-          color={"colorPrimary"}
-        >
-          Create a Copy
-        </Button> */}
       </div>
     </ModalDialog>
   );

diff --git a/client/src/components/Projects/RenameSnapshotModal.jsx b/client/src/components/Projects/RenameSnapshotModal.jsx
@@ -11,10 +11,7 @@ const useStyles = createUseStyles(theme => ({
     justifyContent: "center",
     margin: 0
   },
-  heading1: theme.typography.heading1,
-  buttonColor: {
-    backgroundColor: "#eaeff2"
-  }
+  heading1: theme.typography.heading1
 }));
 
 export default function RenameSnapshotModal({
@@ -54,14 +51,15 @@ export default function RenameSnapshotModal({
         <Button
           className={classes.buttonColor}
           onClick={onClose}
-          variant="contained"
+          variant="outlined"
         >
           Cancel
         </Button>
         <Button
           className={classes.buttonColor}
           onClick={() => onClose("ok", snapshotProjectName)}
           variant="contained"
+          color={"colorPrimary"}
         >
           Done
         </Button>

diff --git a/client/src/components/Projects/ShareSnapshotModal.jsx b/client/src/components/Projects/ShareSnapshotModal.jsx
@@ -3,7 +3,6 @@ import PropTypes from "prop-types";
 import { createUseStyles, useTheme } from "react-jss";
 import Button from "../Button/Button";
 import ModalDialog from "../UI/AriaModal/ModalDialog";
-import clsx from "clsx";
 import * as projectShareService from "../../services/projectShare.service";
 
 const useStyles = createUseStyles(theme => ({
@@ -14,9 +13,6 @@ const useStyles = createUseStyles(theme => ({
   },
   heading1: theme.typography.heading1,
   heading2: theme.typography.heading2,
-  buttonColor: {
-    backgroundColor: theme.colors.secondary.lightGray
-  },
   buttonDisabled: {
     cursor: "default"
   },
@@ -216,12 +212,13 @@ If you don't already have a [TDM Calculator](${tdmLink}) account, please set one
                 style={{ justifyContent: "right" }}
               >
                 <Button
-                  className={clsx(classes.buttonColor, maybeDisabled)}
+                  className={maybeDisabled}
                   onClick={() => {
                     setPage(2);
                   }}
                   disabled={sharedEmails.length ? false : true}
                   variant="contained"
+                  color={"colorPrimary"}
                 >
                   Next
                 </Button>
@@ -308,11 +305,11 @@ If you don't already have a [TDM Calculator](${tdmLink}) account, please set one
                 }}
               >
                 <Button
-                  className={classes.buttonColor}
                   onClick={() => {
                     setPage(1);
                     setIsCopied(false);
                   }}
+                  variant="outlined"
                 >
                   Back
                 </Button>
@@ -363,6 +360,7 @@ If you don't already have a [TDM Calculator](${tdmLink}) account, please set one
                     setPage(1);
                     setSelectedEmail("");
                   }}
+                  variant="outlined"
                 >
                   Cancel
                 </Button>
@@ -374,6 +372,7 @@ If you don't already have a [TDM Calculator](${tdmLink}) account, please set one
                     setSelectedEmail("");
                   }}
                   variant="contained"
+                  color={"colorPrimary"}
                 >
                   Yes
                 </Button>