Merge pull request #599 from GlancingMind/upstream-fix-color-of-green-buttons

Michael Muré created 4 years ago

WebUI: Fix hover-color of green buttons and caption

Change summary

webui/src/components/BugTitleForm/BugTitleForm.tsx       | 6 +++++-
webui/src/components/CloseBugButton/CloseBugButton.tsx   | 2 +-
webui/src/components/ReopenBugButton/ReopenBugButton.tsx | 2 +-
webui/src/pages/bug/CommentForm.tsx                      | 7 ++++---
webui/src/pages/list/ListQuery.tsx                       | 6 +++++-
webui/src/pages/new/NewBugPage.tsx                       | 6 +++++-
6 files changed, 21 insertions(+), 8 deletions(-)

Detailed changes

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),
@@ -155,7 +159,7 @@ function BugTitleForm({ bug }: Props) {
                 variant="contained"
                 href="/new"
               >
-                New issue
+                New bug
               </Button>
             </div>
           )}

webui/src/components/CloseBugButton/CloseBugButton.tsx

@@ -57,7 +57,7 @@ function CloseBugButton({ bug, disabled }: Props) {
         disabled={bug.status === 'CLOSED' || disabled}
         startIcon={<ErrorOutlineIcon className={classes.closeIssueIcon} />}
       >
-        Close issue
+        Close bug
       </Button>
     </div>
   );

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
       </Button>
     </div>
   );

webui/src/pages/bug/CommentForm.tsx

@@ -32,10 +32,11 @@ const useStyles = makeStyles<Theme, StyleProps>((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,
     },
   },
 }));

webui/src/pages/list/ListQuery.tsx

@@ -115,6 +115,10 @@ const useStyles = makeStyles<Theme, StylesProps>((theme) => ({
   greenButton: {
     backgroundColor: theme.palette.success.main,
     color: theme.palette.success.contrastText,
+    '&:hover': {
+      backgroundColor: theme.palette.success.dark,
+      color: theme.palette.primary.contrastText,
+    },
   },
 }));
 
@@ -319,7 +323,7 @@ function ListQuery() {
               variant="contained"
               href="/new"
             >
-              New issue
+              New bug
             </Button>
           )}
         </IfLoggedIn>

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,
+    },
   },
 }));
 
@@ -90,7 +94,7 @@ function NewBugPage() {
             type="submit"
             disabled={isFormValid() ? false : true}
           >
-            Submit new issue
+            Submit new bug
           </Button>
         </div>
       </form>