Merge branch 'master' into dev-peter-session

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 73,
+    'asset_version' => 74,
 
     'temp_dir' => env('TEMP_DIR'),
 

resources/views/layouts/patient-header.blade.php

@@ -34,7 +34,7 @@ $addressParts .= implode(", ", $addressPart2);
 		font-size: 1rem !important;
 	}
 </style>
-<div class="p-2 bg-dark-primary text-white mcp-theme-1">
+<div class="p-2 mcp-theme-1">
   @if($patient->is_duplicate)
   <div class="alert alert-warning p-1 mb-2 border-dark mcp-theme-1 screen-only">
     <span class="text-dark">This chart is a duplicate of&nbsp;</span>
@@ -45,12 +45,12 @@ $addressParts .= implode(", ", $addressPart2);
   @endif
   <div class="d-flex justify-content-between">
     <div class="d-flex align-items-end header-info">
-      <h6>{{$patientName}},</h6>
+      <h6 class="font-weight-bold">{{$patientName}},</h6>
       <h6 class="ml-2">{{$patient->age_in_years}} Y, {{$patient->sex}}</h6>
       <h6 class="d-inline-flex align-items-baseline ml-2">
         <span><i class="chart mr-2">#{{$patient->chart_number}}</i></span>
         <span class="on-hover-show d-inline-block on-hover-opaque">
-          <i class="fa fa-info-circle ml-1 text-white"></i>
+          <i class="fa fa-info-circle ml-1"></i>
           <div class="on-hover-content py-2 pl-3 text-nowrap text-dark" style="left:0;right:auto;">
             Joined
             <?=$memberSince?>
@@ -69,7 +69,7 @@ $addressParts .= implode(", ", $addressPart2);
     <div class="d-flex justify-content-around">
       <div>
         <div moe relative>
-          <a href="#" start show class="text-white ml-3 d-flex align-items-baseline"><i class="fa fa-comment mr-1"></i></a>
+          <a href="#" start show class="ml-3 d-flex align-items-baseline"><i class="fa fa-comment mr-1"></i></a>
           <form right url="/api/clientSms/createOutgoing" class="mcp-theme-1" noreload>
             <input type="hidden" name="uid" value="{{ $patient->uid }}">
             <div class="mb-2">
@@ -92,7 +92,7 @@ $addressParts .= implode(", ", $addressPart2);
       </div>
       <div>
         <span moe relative class="">
-          <a href="#" start show class="text-white ml-3 d-flex align-items-baseline" title="SMS check-in link to the patient"><i class="fa fa-paper-plane mr-1"></i></a>
+          <a href="#" start show class="ml-3 d-flex align-items-baseline" title="SMS check-in link to the patient"><i class="fa fa-paper-plane mr-1"></i></a>
           <form right url="/api/client/sendCheckInTokenViaSmsOrEmail" class="mcp-theme-1">
             <input type="hidden" name="uid" value="{{ $patient->uid }}">
             <p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
@@ -113,11 +113,11 @@ $addressParts .= implode(", ", $addressPart2);
       </div>
       @if($performer->pro->pro_type == 'ADMIN')
       <div>
-        <a href="#" start class="text-white ml-3" show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye mr-1"></i></a>
+        <a href="#" start class="ml-3" show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye mr-1"></i></a>
       </div>
       @endif
       <div>
-        <a href="#" start class="text-white ml-3" show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video mr-1"></i></a>
+        <a href="#" start class="ml-3" show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video mr-1"></i></a>
       </div>
     </div>
   </div>
@@ -507,7 +507,7 @@ $addressParts .= implode(", ", $addressPart2);
       @endif
     </div>
     <div class="bg-light p-2">
-      <ul class="vbox align-self-start patient-header-address ">
+      <ul class="vbox align-self-start patient-header-address mb-0">
         <li class="mb-1 d-flex align-items-start">
           <span class="aligned-icon">
             <i class="fa fa-map-marker-alt" aria-hidden="true"></i>