Merge pull request #20 from cyruscollier/master

Replace Font Awesome reset icon with Nova x-circle icon
pos-lifestyle · Jul 29, 2021 · 9c1c1c1 · 9c1c1c1
2 parents 7439759 + 0600c48
commit 9c1c1c1
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 2,687 deletions.
diff --git a/dist/css/filter.css b/dist/css/filter.css
diff --git a/dist/css/filter.css.map b/dist/css/filter.css.map
diff --git a/dist/fonts/vendor/font-awesome/fontawesome-webfont.eot b/dist/fonts/vendor/font-awesome/fontawesome-webfont.eot
diff --git a/dist/fonts/vendor/font-awesome/fontawesome-webfont.svg b/dist/fonts/vendor/font-awesome/fontawesome-webfont.svg
diff --git a/dist/fonts/vendor/font-awesome/fontawesome-webfont.ttf b/dist/fonts/vendor/font-awesome/fontawesome-webfont.ttf
diff --git a/dist/fonts/vendor/font-awesome/fontawesome-webfont.woff b/dist/fonts/vendor/font-awesome/fontawesome-webfont.woff
diff --git a/dist/fonts/vendor/font-awesome/fontawesome-webfont.woff2 b/dist/fonts/vendor/font-awesome/fontawesome-webfont.woff2
diff --git a/dist/js/filter.js b/dist/js/filter.js
diff --git a/dist/js/filter.js.map b/dist/js/filter.js.map
diff --git a/dist/mix-manifest.json b/dist/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/filter.js": "/js/filter.js?id=600ccbe8010e2133d28d",
-    "/css/filter.css": "/css/filter.css?id=f3ba983b895c4611d7b4",
-    "/js/filter.js.map": "/js/filter.js.map?id=e696de49cbed576fcbba",
-    "/css/filter.css.map": "/css/filter.css.map?id=3a7186ee9f42604ffbf2"
+    "/js/filter.js": "/js/filter.js?id=6b99ac67efc1e28eb436",
+    "/css/filter.css": "/css/filter.css?id=3461ef4807b4ec62e404",
+    "/js/filter.js.map": "/js/filter.js.map?id=9169fc2c68b010359996",
+    "/css/filter.css.map": "/css/filter.css.map?id=dfbafbd5035925158f9d"
 }
diff --git a/package.json b/package.json
@@ -11,12 +11,11 @@
     },
     "devDependencies": {
         "cross-env": "^5.0.0",
-        "flatpickr": "^4.4.4",
+        "flatpickr": "4.6.7",
         "laravel-mix": "^1.0",
         "moment": "^2.22.2"
     },
     "dependencies": {
-        "@vue-hero-icons/solid": "^1.7.2",
         "vue": "^2.5.0"
     }
 }
diff --git a/resources/js/components/DateRangeFilter.vue b/resources/js/components/DateRangeFilter.vue
@@ -32,10 +32,10 @@
 
                 <button
                     v-show="isValidCurrentValue"
-                    class="reset-button btn btn-sm focus:outline-none flex justify-center items-center"
+                    class="reset-button btn btn-sm focus:outline-none flex justify-center items-center text-80"
                     @click="resetFilter"
                 >
-                    <XIcon class="reset-icon"/>
+                    <icon type="x-circle" view-box="0 0 22 22" width="20" height="20" />
                 </button>
             </div>
         </div>

diff --git a/resources/js/components/DateRangePicker.vue b/resources/js/components/DateRangePicker.vue
@@ -106,7 +106,7 @@
                     onChange: this.onChange,
                 });
 
-                this.$emit('ready', true);
+                this.$emit('ready', this.flatpickr);
             });
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,7 @@ @@
                         onChange: this.onChange,
                     });
-                    this.$emit('ready', true);
+                    this.$emit('ready', this.flatpickr);
                 });
             },
@@ Expand Down @@