From 149dffba713c7afecf90d375c066c845ba41153e Mon Sep 17 00:00:00 2001
From: Mattias <mduffy8@gmu.edu>
Date: Fri, 12 Jan 2018 00:17:56 -0500
Subject: [PATCH] small changes and fixes

---
 src/styles/containers/facilityCard.scss |  2 ++
 src/utils/facilityUtils.js              | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/styles/containers/facilityCard.scss b/src/styles/containers/facilityCard.scss
index b5e293f..89a46f0 100644
--- a/src/styles/containers/facilityCard.scss
+++ b/src/styles/containers/facilityCard.scss
@@ -48,8 +48,10 @@
 
 .fc-title {
   font-weight: bold !important;
+  margin-right: 6px!important;
 }
 
+
 .fc-extra-info {
   display: flex;
   align-items: center;
diff --git a/src/utils/facilityUtils.js b/src/utils/facilityUtils.js
index 5e276cc..d5dd331 100644
--- a/src/utils/facilityUtils.js
+++ b/src/utils/facilityUtils.js
@@ -321,10 +321,15 @@ const convertToMeridienTime = (time) => {
         });
 
     let amPM = 'am';
-    if (timeArr[0] > 12) {
-        timeArr[0] -= 12;
-        amPM = 'pm';
+    if(timeArr[0] === 0 || timeArr[0] === 24){
+        timeArr[0] = 12;
+    }else{
+        if (timeArr[0] > 12) {
+            timeArr[0] -= 12;
+            amPM = 'pm';
+        }
     }
+    
     if (timeArr[1] === 0) {
         timeArr[1] = '';
     } else {
-- 
GitLab