Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
qinshenxue committed Jun 22, 2022
2 parents 32f8d9a + ea3db43 commit 6f52d29
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 21 deletions.
2 changes: 1 addition & 1 deletion index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>vui-icon demo</title>
<script src="https://unpkg.com/vue/dist/vue.js"></script>
<script src="https://unpkg.com/vue@2.6"></script>
<script src="lib/vue-feather.min.js?v=<%= Date.now() %>"></script>
<style type="text/css">
body {
Expand Down
11 changes: 8 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head>
<meta charset="UTF-8">
<title>vui-icon demo</title>
<script src="https://unpkg.com/vue/dist/vue.js"></script>
<script src="lib/vue-feather.min.js?v=1615248870258"></script>
<script src="https://unpkg.com/vue@2.6"></script>
<script src="lib/vue-feather.min.js?v=1655861408647"></script>
<style type="text/css">
body {
margin: 0;
Expand Down Expand Up @@ -98,7 +98,7 @@


<div class="search">
<input type="text" placeholder="Search 286 icons" @input="searchIcon">
<input type="text" placeholder="Search 287 icons" @input="searchIcon">
<icon name="search"></icon>
</div>
<div class="icons">
Expand Down Expand Up @@ -1273,6 +1273,11 @@
<div class="name">sunset</div>
</div>

<div class="box" title="table">
<icon name="table"></icon>
<div class="name">table</div>
</div>

<div class="box" title="tablet">
<icon name="tablet"></icon>
<div class="name">tablet</div>
Expand Down
2 changes: 1 addition & 1 deletion lib/feather-icons.esm.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/vue-feather-plugin.esm.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/vue-feather.esm.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/vue-feather.min.js

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-icon",
"version": "2.2.0",
"version": "2.3.0",
"description": "Maybe it is the smallest vue component that contains all the feather icons",
"keywords": [
"vue icon",
Expand Down Expand Up @@ -34,7 +34,7 @@
"babel-preset-env": "^1.6.1",
"css-loader": "^0.28.9",
"ejs": "^2.5.7",
"feather-icons": "^4.28.0",
"feather-icons": "^4.29.0",
"html-webpack-plugin": "^2.30.1",
"rollup": "^0.55.1",
"rollup-plugin-babel": "^3.0.3",
Expand Down
2 changes: 1 addition & 1 deletion src/feather-icons.js

Large diffs are not rendered by default.

0 comments on commit 6f52d29

Please sign in to comment.