Merge pull request #114 from readingdancer/Tweaks-To-The-Icons

Small change to the provider name layout for school meals.
code-for-chapel-hill · Apr 9, 2020 · 3883d08 · 3883d08
2 parents ba553c5 + 2603f86
commit 3883d08
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: Continuous Integration
 on:
   push:
     tags-ignore:
-    - v*
+      - 'v*'
 jobs:
   test:
     name: Test

diff --git a/covid-19-support/src/components/BusinessDetails.vue b/covid-19-support/src/components/BusinessDetails.vue
@@ -14,13 +14,13 @@
             <i :class="businessIcon(business.marker)"></i>
             <div class="busName">
               <h5>{{ business.marker.gsx$providername.$t }}</h5>
+              <span v-if="!!business.marker.gsx$provideraddloc.$t">{{ business.marker.gsx$provideraddloc.$t }}</span>
               <template v-if="!!business.marker.gsx$cuisine.$t">{{ business.marker.gsx$cuisine.$t }}</template>
             </div>
           </div>
           <p>
             <b>{{ $t('label.address') }}:</b><br />
-            <span v-if="!!business.marker.gsx$provideraddloc.$t">{{ business.marker.gsx$provideraddloc.$t }}, </span
-            >{{ business.marker.gsx$address.$t }}, {{ business.marker.gsx$city.$t }}, {{ business.marker.gsx$state.$t }}
+            {{ business.marker.gsx$address.$t }}, {{ business.marker.gsx$city.$t }}, {{ business.marker.gsx$state.$t }}
             {{ business.marker.gsx$zip.$t }}
           </p>
 

diff --git a/covid-19-support/src/components/ResultsList.vue b/covid-19-support/src/components/ResultsList.vue
@@ -10,11 +10,13 @@
         @click="$emit('location-selected', { locValue: index, isSetByMap: false })"
       >
         <h5 class="resultTitle">{{ item.marker.gsx$providername.$t }}</h5>
+        <template v-if="!!item.marker.gsx$provideraddloc.$t"
+          ><div class="addloc">{{ item.marker.gsx$provideraddloc.$t }}</div></template
+        >
         <div v-if="!item.oc" class="closed">Closed on {{ getDay }}</div>
         <span class="resultAddress">
           <span v-if="!!item.marker.gsx$cuisine.$t">{{ item.marker.gsx$cuisine.$t }}<br /></span>
-          <template v-if="!!item.marker.gsx$provideraddloc.$t">{{ item.marker.gsx$provideraddloc.$t }}, </template
-          >{{ item.marker.gsx$address.$t }},
+          {{ item.marker.gsx$address.$t }},
           {{ item.marker.gsx$city.$t }}
         </span>
         <template v-if="item.marker.gsx$discountmedical.$t == 1"
@@ -82,6 +84,9 @@ export default {
 </script>
 
 <style>
+.addloc {
+  margin-bottom: 8px;
+}
 .resultList {
   max-height: calc(100vh - 294px);
   overflow-y: auto;
@@ -117,6 +122,7 @@ export default {
 
 .resultTitle {
   font-size: 0.9rem;
+  margin-bottom: 0;
 }
 .resultAddress {
   font-size: 0.8rem;
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Continuous Integration @@
     on:
       push:
         tags-ignore:
-        - v*
+          - 'v*'
     jobs:
       test:
         name: Test
@@ Expand Down @@