Merge pull request #44 from codersagainstcovidorg/updated-colors

Updated colors to new color scheme
codersagainstcovidorg · Mar 27, 2020 · 16e611c · 16e611c
2 parents 8c0bb41 + 6b7bdc6
commit 16e611c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -3,6 +3,7 @@ import Grid from '@material-ui/core/Grid';
 import { ThemeProvider, createMuiTheme } from '@material-ui/core/styles';
 import ReactGA from 'react-ga';
 import { faTasks, faVial } from '@fortawesome/free-solid-svg-icons';
+import { indigo } from '@material-ui/core/colors';
 import { Sidebar } from './Components/Sidebar';
 import Map from './Components/Map';
 import LocationModal from './Components/LocationModal';
@@ -12,7 +13,7 @@ import Header from './Components/Header';
 const theme = createMuiTheme({
   palette: {
     primary: {
-      main: '#4a138c',
+      main: indigo[900],
       light: '#7c42bd',
       dark: '#12005e',
       contrastText: '#ffffff',

diff --git a/src/Components/LocationModal.tsx b/src/Components/LocationModal.tsx
@@ -61,11 +61,6 @@ const useStyles = makeStyles((theme: Theme) =>
       maxHeight: '90%',
       overflowY: 'auto',
     },
-    bottomNavigation: {
-      '&.Mui-selected': {
-        color: indigo[800],
-      },
-    },
     media: {
       height: 0,
       paddingTop: '56.25%', // 16:9
@@ -91,15 +86,6 @@ const useStyles = makeStyles((theme: Theme) =>
       width: '100%',
       height: '60px',
       fontSize: '20px',
-      color: theme.palette.getContrastText(indigo[800]),
-      backgroundColor: indigo[800],
-      '&:hover': {
-        backgroundColor: indigo[900],
-        // Reset on touch devices, it doesn't add specificity
-        '@media (hover: none)': {
-          backgroundColor: indigo[800],
-        },
-      },
     },
     grid: {
       flexGrow: 1,
@@ -238,6 +224,7 @@ const LocationModal = ({ location, onClose }: ModalProps) => {
           <Button
             variant="contained"
             size="large"
+            color="primary"
             className={classes.callToAction}
             href={
               location.location_contact_url_covid_screening_tool !== ''