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

Tweaks to the icons
code-for-chapel-hill · Apr 9, 2020 · ba553c5 · ba553c5
2 parents 0164703 + 8ebd5d3
commit ba553c5
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 5 deletions.
diff --git a/covid-19-support/public/images/ico_120.png b/covid-19-support/public/images/ico_120.png
diff --git a/covid-19-support/public/images/ico_1204.png b/covid-19-support/public/images/ico_1204.png
diff --git a/covid-19-support/public/images/ico_128.png b/covid-19-support/public/images/ico_128.png
diff --git a/covid-19-support/public/images/ico_152.png b/covid-19-support/public/images/ico_152.png
diff --git a/covid-19-support/public/images/ico_167.png b/covid-19-support/public/images/ico_167.png
diff --git a/covid-19-support/public/images/ico_180.png b/covid-19-support/public/images/ico_180.png
diff --git a/covid-19-support/public/images/ico_192.png b/covid-19-support/public/images/ico_192.png
diff --git a/covid-19-support/public/images/ico_270.png b/covid-19-support/public/images/ico_270.png
diff --git a/covid-19-support/public/images/ico_558.png b/covid-19-support/public/images/ico_558.png
diff --git a/covid-19-support/public/images/ico_57.png b/covid-19-support/public/images/ico_57.png
diff --git a/covid-19-support/public/images/ico_76.png b/covid-19-support/public/images/ico_76.png
diff --git a/covid-19-support/public/images/ico_wider2_270.png b/covid-19-support/public/images/ico_wider2_270.png
diff --git a/covid-19-support/public/index.html b/covid-19-support/public/index.html
@@ -27,7 +27,7 @@
     <meta name="application-name" content="NC COVID Support" />
     <meta name="msapplication-config" content="<%= BASE_URL %>browserconfig.xml?a=2" />
 
-    <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,600;1,400&display=swap" rel="stylesheet" />
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;600&display=swap" rel="stylesheet" />
     <title>NC COVID Support - Community Resources for North Carolina</title>
     <meta
       name="keywords"

diff --git a/covid-19-support/src/App.vue b/covid-19-support/src/App.vue
@@ -173,6 +173,7 @@ h5,
 h6,
 .navbar-brand,
 .poppins {
+  font-weight: 600 !important;
   font-family: 'Poppins', sans-serif;
 }
 

diff --git a/covid-19-support/src/components/BusinessDetails.vue b/covid-19-support/src/components/BusinessDetails.vue
@@ -170,7 +170,7 @@ export default {
 
 <style scoped>
 .business-details {
-  max-height: calc(100vh - 263px);
+  max-height: calc(100vh - 237px);
   overflow-y: auto;
 }
 .backtolist {

diff --git a/covid-19-support/src/components/Header.vue b/covid-19-support/src/components/Header.vue
@@ -64,6 +64,7 @@ export default {
   margin-right: 2px !important;
   font-size: 0.95rem !important;
   padding: 0.2rem 0 !important;
+  font-weight: 600;
 }
 
 .language {

diff --git a/covid-19-support/src/components/ResultsList.vue b/covid-19-support/src/components/ResultsList.vue
@@ -17,8 +17,23 @@
           >{{ item.marker.gsx$address.$t }},
           {{ item.marker.gsx$city.$t }}
         </span>
+        <template v-if="item.marker.gsx$discountmedical.$t == 1"
+          ><span :title="$tc('label.discounts', 1)"><i class="fas fa-user-md" /></span
+        ></template>
+        <template v-if="item.marker.gsx$familymeal.$t == 1"
+          ><span :title="$tc('category.family', 2)"><i class="fas fa-user-friends" /></span
+        ></template>
+        <template v-if="item.marker.gsx$mealstudent.$t == 1"
+          ><span :title="$tc('label.mealsforstudents', 1)"><i class="fas fa-school" /></span
+        ></template>
+        <template v-if="item.marker.gsx$mealstudent.$t == 1"
+          ><span :title="$tc('label.opentopublic', 1)"><i class="fas fa-users" /></span
+        ></template>
+        <template v-if="item.marker.gsx$drivethru.$t == 1"
+          ><span :title="$t('label.drivethru')"><i class="fas fa-car-side" /></span
+        ></template>
         <template v-if="item.marker.gsx$curbside.$t == 1"
-          ><span :title="$t('label.curbsidepickup')"><i class="fas fa-car" /></span
+          ><span :title="$tc('label.curbsidepickup', 1)"><i class="fas fa-car" /></span
         ></template>
         <template v-if="item.marker.gsx$orderonline.$t == 1"
           ><span :title="$t('label.orderonline')"><i class="fas fa-mouse" /></span
@@ -68,7 +83,7 @@ export default {
 
 <style>
 .resultList {
-  max-height: calc(100vh - 320px);
+  max-height: calc(100vh - 294px);
   overflow-y: auto;
 }
 .resultItem {

diff --git a/covid-19-support/src/components/SearchFilter.vue b/covid-19-support/src/components/SearchFilter.vue
@@ -124,6 +124,10 @@ export default {
 </script>
 
 <style scoped>
+.custom-select {
+  font-size: 0.8rem;
+}
+
 #search-filter-wrapper {
   margin-left: -300px;
   -webkit-transition: margin 0.25s ease-out;
@@ -156,7 +160,7 @@ export default {
 }
 
 .list-group.need-day-group {
-  padding: 1rem 0 !important;
+  padding: 1rem 0 0 0 !important;
 }
 
 .list-group-flush.need-day-group .list-group-item:first-child {