diff options
author | Lena <lena.becker-3@mni.thm.de> | 2021-02-28 20:54:17 +0100 |
---|---|---|
committer | Sascha <GlancingMind@outlook.com> | 2021-03-15 16:35:14 +0100 |
commit | 16b176f9bf40a5fd6fb832f8858ec389826752a5 (patch) | |
tree | 6bdccfe6482cc5d1fe01a3ad71add6b7d51b3523 | |
parent | 4dcc6f67b37bf756c7afb7e40f700a838906113b (diff) | |
download | git-bug-16b176f9bf40a5fd6fb832f8858ec389826752a5.tar.gz |
Make backbutton sticky #10
-rw-r--r-- | webui/src/pages/bug/Bug.tsx | 22 | ||||
-rw-r--r-- | webui/src/pages/bug/CommentForm.tsx | 10 | ||||
-rw-r--r-- | webui/src/pages/notfound/NotFoundPage.tsx | 3 |
3 files changed, 22 insertions, 13 deletions
diff --git a/webui/src/pages/bug/Bug.tsx b/webui/src/pages/bug/Bug.tsx index d85c5296..b8c3e8aa 100644 --- a/webui/src/pages/bug/Bug.tsx +++ b/webui/src/pages/bug/Bug.tsx @@ -1,6 +1,8 @@ import React from 'react'; +import Button from '@material-ui/core/Button'; import { makeStyles } from '@material-ui/core/styles'; +import ArrowBackIcon from '@material-ui/icons/ArrowBack'; import BugTitleForm from 'src/components/BugTitleForm/BugTitleForm'; import IfLoggedIn from 'src/components/IfLoggedIn/IfLoggedIn'; @@ -18,7 +20,6 @@ const useStyles = makeStyles((theme) => ({ maxWidth: 1000, margin: 'auto', marginTop: theme.spacing(4), - overflow: 'hidden', }, header: { marginLeft: theme.spacing(3) + 40, @@ -61,6 +62,16 @@ const useStyles = makeStyles((theme) => ({ commentForm: { marginLeft: 48, }, + backButton: { + position: 'sticky', + marginTop: theme.spacing(1), + top: '80px', + backgroundColor: '#574142', + color: '#fff', + '&:hover': { + backgroundColor: '#610B0B', + }, + }, })); type Props = { @@ -99,6 +110,15 @@ function Bug({ bug }: Props) { </li> ))} </ul> + <Button + variant="contained" + className={classes.backButton} + aria-label="back" + href="/" + > + <ArrowBackIcon /> + Back to List + </Button> </div> </div> </main> diff --git a/webui/src/pages/bug/CommentForm.tsx b/webui/src/pages/bug/CommentForm.tsx index 6ec9bf2a..e53c7ddd 100644 --- a/webui/src/pages/bug/CommentForm.tsx +++ b/webui/src/pages/bug/CommentForm.tsx @@ -39,13 +39,6 @@ const useStyles = makeStyles<Theme, StyleProps>((theme) => ({ backgroundColor: '#2ea44f', }, }, - backButton: { - backgroundColor: '#574142', - color: '#fff', - '&:hover': { - backgroundColor: '#610B0B', - }, - }, })); type Props = { @@ -109,9 +102,6 @@ function CommentForm({ bug }: Props) { onChange={(comment: string) => setIssueComment(comment)} /> <div className={classes.actions}> - <Button className={classes.backButton} variant="contained" href="/"> - Back to List - </Button> {bug.status === 'OPEN' ? getCloseButton() : getReopenButton()} <Button className={classes.greenButton} diff --git a/webui/src/pages/notfound/NotFoundPage.tsx b/webui/src/pages/notfound/NotFoundPage.tsx index 2aba9cef..57b186c5 100644 --- a/webui/src/pages/notfound/NotFoundPage.tsx +++ b/webui/src/pages/notfound/NotFoundPage.tsx @@ -1,4 +1,3 @@ -import wrap from '@arrows/composition/internal/wrap'; import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; @@ -40,7 +39,7 @@ function NotFoundPage() { <img src="/logo-alpha-flat-outline.svg" className={classes.logo} - alt="git-bug" + alt="git-bug Logo" /> <a href="/" className={classes.backLink}> <h2 className={classes.header}>Go back to start page</h2> |