Merge branch 'master' of github.com:cs0320-2021/term-project-cohwille-jmccaul3-mfoiani-rhunt2

# Conflicts:
#	react-frontend/src/components/Visualization.js

1 files changed, 27 insertions, 7 deletions

diff --git a/react-frontend/src/css/UserCheckin.css b/react-frontend/src/css/UserCheckin.css
index 141cc01..389bca6 100644
--- a/react-frontend/src/css/UserCheckin.css
+++ b/react-frontend/src/css/UserCheckin.css
@@ -20,7 +20,7 @@ ul {
   z-index: 10;
   background-color: #333333;
   border-radius: 20px;
-  margin: 5px;
+  margin: 5px 5px 5px 0;
 }
 
 .Coord-ex {
@@ -30,22 +30,28 @@ ul {
   text-align: center;
 }
 
+.Chosen-user > h3, .Checkins > h3 {
+  display: flex;
+  justify-content: space-between;
+  height: 5vh;
+  padding: 0 30px;
+}
+
 .Chosen-user > h2, .Checkins > h2 {
   display: flex;
-  justify-content: space-evenly;
+  justify-content: center;
   height: 5vh;
-  padding: 0 10px;
+  padding: 0 30px;
 }
 
 .Checkin-list {
   padding: 0 20px;
-  height: 86vh;
+  height: 85vh;
   overflow-y: scroll;
-  cursor: default;
 }
 
 .User-checkin-list {
-  height: 80vh;
+  height: 75vh;
   overflow-y: scroll;
 
   list-style-position: inside;
@@ -79,7 +85,7 @@ ul {
 .Img-btn {
   background-color: #424242;
   border-radius: 50%;
-  margin-right: 10px;
+  margin-left: auto;
 }
 
 .Img-btn:hover {
@@ -91,4 +97,18 @@ ul {
   cursor: pointer;
   text-decoration: underline;
   color: lightgreen;
+}
+
+/* CSS borrowed from W3 Schools */
+input[type=text] {
+  width: 80%;
+  padding: 12px 20px;
+  box-sizing: border-box;
+  font-size: 80%;
+  background-color: lightgoldenrodyellow;
+  border-radius: 2;
+}
+
+.Title {
+  margin-top: 20px;
 }
\ No newline at end of file