From a11e5b1e13d69aee76f9bf4971a536ab42fb248a Mon Sep 17 00:00:00 2001 From: Frank Ali Date: Thu, 8 Aug 2019 11:03:04 -0500 Subject: [PATCH] Merge pull request #8 in NP/ncippe-front-end from NCIPPE-40--download-document to master Squashed commit of the following: commit 496e2a34d2eb9ca9e366bd16c0db52462b9275e7 Author: alifr Date: Thu Aug 8 11:54:53 2019 -0400 minor css adjustments commit ba7f45f0a3b9821b43ec925064f8aad26b7822d4 Author: alifr Date: Wed Aug 7 16:52:30 2019 -0400 swap s3 link for real pdf for now commit dd64573b8f6448926ac035bd8707178b4c020320 Author: alifr Date: Wed Aug 7 16:51:58 2019 -0400 remove react-router-dom references --- src/App.js | 23 ++++++++----------- src/components/TestResults/TestResultsItem.js | 4 ++-- src/components/region/Header/Header.js | 2 -- src/index.css | 3 ++- src/pages/MockRoles.js | 1 - 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/App.js b/src/App.js index 45f80b6d..81a629e0 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,4 @@ import React from 'react' -import { BrowserRouter } from 'react-router-dom' import { makeStyles } from '@material-ui/core/styles' import { Container, CssBaseline } from '@material-ui/core' @@ -25,18 +24,16 @@ const App = () => { const classes = useStyles() return ( - - -
- -
- -
- -
-
-
-
+ +
+ +
+ +
+ +
+
+
); } diff --git a/src/components/TestResults/TestResultsItem.js b/src/components/TestResults/TestResultsItem.js index 83a317b2..9c515afb 100644 --- a/src/components/TestResults/TestResultsItem.js +++ b/src/components/TestResults/TestResultsItem.js @@ -43,10 +43,10 @@ const TestResultsItem = ({report}) => { {moment(timestamp).format("MMM Do YYYY")} - + - + diff --git a/src/components/region/Header/Header.js b/src/components/region/Header/Header.js index cb3c1320..644cf474 100644 --- a/src/components/region/Header/Header.js +++ b/src/components/region/Header/Header.js @@ -5,8 +5,6 @@ import { Typography, } from '@material-ui/core'; import { makeStyles } from '@material-ui/core/styles' - -// import { Link as RouterLink } from 'react-router-dom' import { Link as RouterLink } from "@reach/router" import LoginButton from '../../login/SharedLogin/LoginButton' diff --git a/src/index.css b/src/index.css index 683a8baf..d3e2588c 100644 --- a/src/index.css +++ b/src/index.css @@ -61,12 +61,13 @@ main { .zoom-enter, .zoom-enter-done { z-index: 2; + background-color: #fafafa; position: fixed; top: 0; right: 0; left: 0; height: 100vh; - background-color: #fafafa; + overflow: auto; } .zoom-exit { diff --git a/src/pages/MockRoles.js b/src/pages/MockRoles.js index 2746f37e..94d4ecba 100644 --- a/src/pages/MockRoles.js +++ b/src/pages/MockRoles.js @@ -10,7 +10,6 @@ const useStyles = makeStyles(theme => ({ root: { display: 'flex', flexDirection: 'column', - height: '80vh', alignItems: 'center', marginTop: '4vw'