diff --git a/client/src/components/Button/TertiaryButton.jsx b/client/src/components/Button/TertiaryButton.jsx new file mode 100644 index 00000000..b1b7978c --- /dev/null +++ b/client/src/components/Button/TertiaryButton.jsx @@ -0,0 +1,32 @@ +import React from "react"; +import PropTypes from "prop-types"; +import Button from "./Button"; +import { MdPrint } from "react-icons/md"; + +const TertiaryButton = ({ id, onClick, isDisabled, isDisplayed, children }) => { + return ( + + ); +}; + +TertiaryButton.propTypes = { + children: PropTypes.object, + onClick: PropTypes.func, + id: PropTypes.string.isRequired, + isDisabled: PropTypes.bool, + isDisplayed: PropTypes.bool.isRequired +}; + +export default TertiaryButton; diff --git a/client/src/components/Projects/CsvModal.jsx b/client/src/components/Projects/CsvModal.jsx index e33df71e..2265b38e 100644 --- a/client/src/components/Projects/CsvModal.jsx +++ b/client/src/components/Projects/CsvModal.jsx @@ -165,7 +165,11 @@ const CsvModal = ({ {(project || projectCollection) && !loading && !csvData && ( - )} @@ -174,8 +178,8 @@ const CsvModal = ({ Close - {/* */} ); diff --git a/client/src/components/Projects/ProjectsPage.jsx b/client/src/components/Projects/ProjectsPage.jsx index b1d80497..d324f6eb 100644 --- a/client/src/components/Projects/ProjectsPage.jsx +++ b/client/src/components/Projects/ProjectsPage.jsx @@ -27,6 +27,7 @@ import MultiProjectToolbarMenu from "./MultiProjectToolbarMenu"; import fetchEngineRules from "./fetchEngineRules"; import UniversalSelect from "../UI/UniversalSelect"; import ProjectTableColumnHeader from "./ColumnHeaderPopups/ProjectTableColumnHeader"; +import TertiaryButton from "../Button/TertiaryButton"; const useStyles = createUseStyles({ outerDiv: { @@ -941,12 +942,12 @@ const ProjectsPage = ({ contentContainerRef }) => {
- + {/* {filterCollapsed ? ( @@ -62,6 +59,7 @@ export default function RenameSnapshotModal({ className={classes.buttonColor} onClick={() => onClose("ok", snapshotProjectName)} variant="contained" + color={"colorPrimary"} > Done diff --git a/client/src/components/Projects/ShareSnapshotModal.jsx b/client/src/components/Projects/ShareSnapshotModal.jsx index 46d856c3..96fd0833 100644 --- 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" }} > @@ -308,11 +305,11 @@ If you don't already have a [TDM Calculator](${tdmLink}) account, please set one }} > @@ -363,6 +360,7 @@ If you don't already have a [TDM Calculator](${tdmLink}) account, please set one setPage(1); setSelectedEmail(""); }} + variant="outlined" > Cancel @@ -374,6 +372,7 @@ If you don't already have a [TDM Calculator](${tdmLink}) account, please set one setSelectedEmail(""); }} variant="contained" + color={"colorPrimary"} > Yes