small changes and fixes

149dffba · Mattias J Duffy · d441f9a6 · 149dffba · 149dffba
Commit 149dffba authored Jan 12, 2018 by Mattias J Duffy
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

src/styles/containers/facilityCard.scss src/styles/containers/facilityCard.scss +2 -0

src/utils/facilityUtils.js src/utils/facilityUtils.js +8 -3

No files found.
--- 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;

--- a/src/utils/facilityUtils.js
+++ b/src/utils/facilityUtils.js
@@ -321,10 +321,15 @@ const convertToMeridienTime = (time) => {
        });

    let amPM = 'am';
+    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 {