Skip to content

Commit 9c1c1c1

Browse files
authored
Merge pull request #20 from cyruscollier/master
Replace Font Awesome reset icon with Nova x-circle icon
2 parents 7439759 + 0600c48 commit 9c1c1c1

13 files changed

+12
-2687
lines changed

dist/css/filter.css

+1-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/filter.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

dist/fonts/vendor/font-awesome/fontawesome-webfont.svg

-2,671
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.

dist/js/filter.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/filter.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/mix-manifest.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"/js/filter.js": "/js/filter.js?id=600ccbe8010e2133d28d",
3-
"/css/filter.css": "/css/filter.css?id=f3ba983b895c4611d7b4",
4-
"/js/filter.js.map": "/js/filter.js.map?id=e696de49cbed576fcbba",
5-
"/css/filter.css.map": "/css/filter.css.map?id=3a7186ee9f42604ffbf2"
2+
"/js/filter.js": "/js/filter.js?id=6b99ac67efc1e28eb436",
3+
"/css/filter.css": "/css/filter.css?id=3461ef4807b4ec62e404",
4+
"/js/filter.js.map": "/js/filter.js.map?id=9169fc2c68b010359996",
5+
"/css/filter.css.map": "/css/filter.css.map?id=dfbafbd5035925158f9d"
66
}

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@
1111
},
1212
"devDependencies": {
1313
"cross-env": "^5.0.0",
14-
"flatpickr": "^4.4.4",
14+
"flatpickr": "4.6.7",
1515
"laravel-mix": "^1.0",
1616
"moment": "^2.22.2"
1717
},
1818
"dependencies": {
19-
"@vue-hero-icons/solid": "^1.7.2",
2019
"vue": "^2.5.0"
2120
}
2221
}

resources/js/components/DateRangeFilter.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232

3333
<button
3434
v-show="isValidCurrentValue"
35-
class="reset-button btn btn-sm focus:outline-none flex justify-center items-center"
35+
class="reset-button btn btn-sm focus:outline-none flex justify-center items-center text-80"
3636
@click="resetFilter"
3737
>
38-
<XIcon class="reset-icon"/>
38+
<icon type="x-circle" view-box="0 0 22 22" width="20" height="20" />
3939
</button>
4040
</div>
4141
</div>

resources/js/components/DateRangePicker.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
onChange: this.onChange,
107107
});
108108
109-
this.$emit('ready', true);
109+
this.$emit('ready', this.flatpickr);
110110
});
111111
},
112112

0 commit comments

Comments
 (0)