From d0505e2f9ab9483f370ba547cb93ce6cc388f241 Mon Sep 17 00:00:00 2001 From: Sascha Date: Sun, 14 Mar 2021 15:44:32 +0100 Subject: [PATCH 1/2] Use success.dark for green-button:hover --- webui/src/components/BugTitleForm/BugTitleForm.tsx | 4 ++++ webui/src/pages/bug/CommentForm.tsx | 7 ++++--- webui/src/pages/list/ListQuery.tsx | 4 ++++ webui/src/pages/new/NewBugPage.tsx | 4 ++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/webui/src/components/BugTitleForm/BugTitleForm.tsx b/webui/src/components/BugTitleForm/BugTitleForm.tsx index c31f8ef7a892aecec8a81aa3d025ec9e2040437d..c3a0434962e660a02738a1b6873512240662b063 100644 --- a/webui/src/components/BugTitleForm/BugTitleForm.tsx +++ b/webui/src/components/BugTitleForm/BugTitleForm.tsx @@ -43,6 +43,10 @@ const useStyles = makeStyles((theme) => ({ marginLeft: theme.spacing(1), backgroundColor: theme.palette.success.main, color: theme.palette.success.contrastText, + '&:hover': { + backgroundColor: theme.palette.success.dark, + color: theme.palette.primary.contrastText, + }, }, saveButton: { marginRight: theme.spacing(1), diff --git a/webui/src/pages/bug/CommentForm.tsx b/webui/src/pages/bug/CommentForm.tsx index 0b97e133323c732aee7b8d33078d5c0cf6111248..773e7d0ecd8f6fb40d4176a204078db16240ad2e 100644 --- a/webui/src/pages/bug/CommentForm.tsx +++ b/webui/src/pages/bug/CommentForm.tsx @@ -32,10 +32,11 @@ const useStyles = makeStyles((theme) => ({ }, greenButton: { marginLeft: '8px', - backgroundColor: '#2ea44fd9', - color: '#fff', + backgroundColor: theme.palette.success.main, + color: theme.palette.success.contrastText, '&:hover': { - backgroundColor: '#2ea44f', + backgroundColor: theme.palette.success.dark, + color: theme.palette.primary.contrastText, }, }, })); diff --git a/webui/src/pages/list/ListQuery.tsx b/webui/src/pages/list/ListQuery.tsx index fec7c33b901b5aec8878a10d3da97181fd45cfe0..3a58f803a94be0f19293ad96b2c70588633959ea 100644 --- a/webui/src/pages/list/ListQuery.tsx +++ b/webui/src/pages/list/ListQuery.tsx @@ -115,6 +115,10 @@ const useStyles = makeStyles((theme) => ({ greenButton: { backgroundColor: theme.palette.success.main, color: theme.palette.success.contrastText, + '&:hover': { + backgroundColor: theme.palette.success.dark, + color: theme.palette.primary.contrastText, + }, }, })); diff --git a/webui/src/pages/new/NewBugPage.tsx b/webui/src/pages/new/NewBugPage.tsx index a46226ad29fbc92059a2a93177bc16e5cac774ed..4517c6e30d355b56e4ded1856f5b6dfe6de5a7e7 100644 --- a/webui/src/pages/new/NewBugPage.tsx +++ b/webui/src/pages/new/NewBugPage.tsx @@ -32,6 +32,10 @@ const useStyles = makeStyles((theme: Theme) => ({ greenButton: { backgroundColor: theme.palette.success.main, color: theme.palette.success.contrastText, + '&:hover': { + backgroundColor: theme.palette.success.dark, + color: theme.palette.primary.contrastText, + }, }, })); From 2c5d3345e2d3b4746619f3adf859321eadf21992 Mon Sep 17 00:00:00 2001 From: Sascha Date: Sun, 14 Mar 2021 16:10:01 +0100 Subject: [PATCH 2/2] Change caption of buttons from "Issue" to "Bug" --- webui/src/components/BugTitleForm/BugTitleForm.tsx | 2 +- webui/src/components/CloseBugButton/CloseBugButton.tsx | 2 +- webui/src/components/ReopenBugButton/ReopenBugButton.tsx | 2 +- webui/src/pages/list/ListQuery.tsx | 2 +- webui/src/pages/new/NewBugPage.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webui/src/components/BugTitleForm/BugTitleForm.tsx b/webui/src/components/BugTitleForm/BugTitleForm.tsx index c3a0434962e660a02738a1b6873512240662b063..cc9f52675ff7e54f8251e3615c02fa5be19c4dc6 100644 --- a/webui/src/components/BugTitleForm/BugTitleForm.tsx +++ b/webui/src/components/BugTitleForm/BugTitleForm.tsx @@ -159,7 +159,7 @@ function BugTitleForm({ bug }: Props) { variant="contained" href="/new" > - New issue + New bug )} diff --git a/webui/src/components/CloseBugButton/CloseBugButton.tsx b/webui/src/components/CloseBugButton/CloseBugButton.tsx index 8d397c23d60b8fcd46f5135b45d0646345456411..9f098483a8fc2450c6e50aea1845ee3e37a3474c 100644 --- a/webui/src/components/CloseBugButton/CloseBugButton.tsx +++ b/webui/src/components/CloseBugButton/CloseBugButton.tsx @@ -57,7 +57,7 @@ function CloseBugButton({ bug, disabled }: Props) { disabled={bug.status === 'CLOSED' || disabled} startIcon={} > - Close issue + Close bug ); diff --git a/webui/src/components/ReopenBugButton/ReopenBugButton.tsx b/webui/src/components/ReopenBugButton/ReopenBugButton.tsx index 195ca5125e6b99be39d32828d0ec269afc171dd4..e3e792fc2e2bc50add8e1fb5c6380d1a1d2ac144 100644 --- a/webui/src/components/ReopenBugButton/ReopenBugButton.tsx +++ b/webui/src/components/ReopenBugButton/ReopenBugButton.tsx @@ -46,7 +46,7 @@ function ReopenBugButton({ bug, disabled }: Props) { onClick={() => openBugAction()} disabled={bug.status === 'OPEN' || disabled} > - Reopen issue + Reopen bug ); diff --git a/webui/src/pages/list/ListQuery.tsx b/webui/src/pages/list/ListQuery.tsx index 3a58f803a94be0f19293ad96b2c70588633959ea..500ccf77dec04992955147f35dc4b1127306b71e 100644 --- a/webui/src/pages/list/ListQuery.tsx +++ b/webui/src/pages/list/ListQuery.tsx @@ -323,7 +323,7 @@ function ListQuery() { variant="contained" href="/new" > - New issue + New bug )} diff --git a/webui/src/pages/new/NewBugPage.tsx b/webui/src/pages/new/NewBugPage.tsx index 4517c6e30d355b56e4ded1856f5b6dfe6de5a7e7..96afb56a8a1d05720f7272e65d36f4429c21e62b 100644 --- a/webui/src/pages/new/NewBugPage.tsx +++ b/webui/src/pages/new/NewBugPage.tsx @@ -94,7 +94,7 @@ function NewBugPage() { type="submit" disabled={isFormValid() ? false : true} > - Submit new issue + Submit new bug