Merge branch 'dev' into main

Author: calvintanwj

client/src/components/Journal/MarkdownEntry.js

@@ -35,10 +35,9 @@ function MarkdownEntry(props) {
       <div id="entry-text" onClick={props.clickHandler}>
         <h2 id="entry-title">{entry.title}</h2>
         <p>{format(new Date(entry.date), "dd-MM-yyyy")}</p>
-        <ReactMarkdown
-          components={components}
-          remarkPlugins={[gfm]}
-        >{entry.entry}</ReactMarkdown>
+        <ReactMarkdown components={components} remarkPlugins={[gfm]}>
+          {entry.entry}
+        </ReactMarkdown>
       </div>
     </div>
   );

client/src/components/Scheduler/AddEventForm.js

@@ -88,12 +88,13 @@ function AddEventForm(props) {
   }
 
   const customStylesForDiscard = {
-    overlay: { zIndex: 9999 },
+    overlay: { zIndex: 9999, width: "100vw", height: "100vh" },
     content: {
-      top: "43%",
+      top: "44.5%",
       bottom: "42.5%",
-      left: "41%",
-      right: "41%",
+      left: "42%",
+      right: "42%",
+      overflow: "auto",
     },
   };
 

client/src/components/Scheduler/Scheduler.css

@@ -444,17 +444,16 @@
   height: 10%;
   background: transparent;
   border: none;
-  position: fixed;
 }
 
 #edit-event-close-button:after {
   font-family: FontAwesome;
   content: "\f410";
   font-size: 30px;
   cursor: pointer;
-  position: fixed;
-  top: 27%;
-  right: 42%;
+  position: relative;
+  left: 10%;
+  bottom: 10%;
 }
 
 #edit-event-close-button:hover {
@@ -633,15 +632,16 @@
 
 #discard-prompt p {
   font-weight: bold;
-  margin-top: 1%;
+  font-size: 0.9em;
+  margin-top: -1%;
 }
 
 #discard-prompt button {
   font-family: "Exo 2", sans-serif;
   padding: 5px;
   float: right;
   margin: 0 3px;
-  margin-top: 6%;
+  margin-top: 2.5%;
   cursor: pointer;
   border: none;
   border-radius: 10px;

client/src/components/Scheduler/Scheduler.js

@@ -57,23 +57,25 @@ function Scheduler() {
 
   // styling for Edit Form
   const customStylesForEdit = {
-    overlay: { zIndex: 9999 },
+    overlay: { zIndex: 9999, width: "100vw", height: "100vh" },
     content: {
       top: "25%",
       bottom: "15%",
       right: "40%",
       left: "15%",
+      overflow: "auto",
     },
   };
 
   // styling for Add Event Form
   const customStylesForAdd = {
-    overlay: { zIndex: 9999 },
+    overlay: { zIndex: 9999, width: "100vw", height: "100vh" },
     content: {
       top: "15%",
       bottom: "20%",
       left: "20%",
       right: "20%",
+      overflow: "auto",
     },
   };
 
@@ -113,12 +115,13 @@ function Scheduler() {
   }
 
   const customStylesForDiscard = {
-    overlay: { zIndex: 9999 },
+    overlay: { zIndex: 9999, width: "100vw", height: "100vh" },
     content: {
-      top: "43%",
+      top: "44.5%",
       bottom: "42.5%",
-      left: "41%",
-      right: "41%",
+      left: "42%",
+      right: "42%",
+      overflow: "auto",
     },
   };