Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1401 fe update color of reports dropdown #1404

Merged
merged 4 commits into from
Oct 17, 2022
Merged

1401 fe update color of reports dropdown #1404

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8f2142
updated yellow underline
jekijo Oct 13, 2022
1c31c64
updated reports dropdown color
jekijo Oct 13, 2022
2c864a0
Merge branch 'dev' into 1401-fe-update-color-of-reports-dropdown
edwinjue Oct 17, 2022
bc97f49
replaced harcoded hex color values with constants defined in @theme/c…
edwinjue Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions client/components/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react';
import { NavLink, Link } from 'react-router-dom';
import { makeStyles } from '@material-ui/core/styles';
import {
AppBar,
Button,
Toolbar,
Typography,
Menu,
MenuItem,
} from '@material-ui/core';
import AppBar from '@material-ui/core/AppBar';
import Button from '@material-ui/core/Button';
import Toolbar from '@material-ui/core/Toolbar';
import Typography from '@material-ui/core/Typography';
import Menu from '@material-ui/core/Menu';
import MenuItem from '@material-ui/core/MenuItem';

import fonts from '@theme/fonts';
import colors from '@theme/colors';

// Header should make use of style overrides to look the same regardless of light/dark theme.
const useStyles = makeStyles(theme => ({
Expand Down Expand Up @@ -37,10 +37,13 @@ const useStyles = makeStyles(theme => ({
fontWeight: theme.typography.fontWeightBold,
flexGrow: 1,
},
menuPaper: {
backgroundColor: colors.textPrimaryDark,
},
}));

const activeStyle = {
borderBottom: '1px solid yellow',
borderBottom: `1px solid ${colors.primaryFocus}`,
};

// TODO: links/routing, mobile
Expand Down Expand Up @@ -83,6 +86,7 @@ const Header = () => {
vertical: 'bottom',
horizontal: 'left',
}}
classes={{ paper: classes.menuPaper }}
>
<Link to="/reports/overview-combined">
<MenuItem onClick={handleClose}>
Expand Down