Skip to content

Commit a850258

Browse files
committed
chore: update various items to support mdi-v5
1 parent e3f0131 commit a850258

File tree

9 files changed

+17
-10
lines changed

9 files changed

+17
-10
lines changed

demo/quasar.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = function (ctx) {
1717

1818
extras: [
1919
'ionicons-v4',
20-
'mdi-v4',
20+
'mdi-v5',
2121
'fontawesome-v5',
2222
'eva-icons',
2323
'themify',

demo/src/components/IconCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default {
4545
{ label: 'Material Icons Outlined', value: 'material-icons-outlined' },
4646
{ label: 'Material Icons Round', value: 'material-icons-round' },
4747
{ label: 'Material Icons Sharp', value: 'material-icons-sharp' },
48-
{ label: 'MDI Icons (v4)', value: 'mdi-v4' },
48+
{ label: 'MDI Icons (v5)', value: 'mdi-v5' },
4949
{ label: 'Themify Icons', value: 'themify' },
5050
{ label: 'Line-awesome Icons', value: 'line-awesome' }
5151
],

demo/src/markdown/iconpicker.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ import '@quasar/quasar-ui-qiconpicker/dist/icon-set/material-icons-outlined.umd.
8282
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/material-icons-round.umd.js'
8383
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/material-icons-sharp.umd.js'
8484
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/material-icons.umd.js'
85-
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/mdi-v4.umd.js'
85+
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/mdi-v5.umd.js'
8686
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/themify.umd.js'
8787
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/lineawesome.umd.js'
8888
export default {
@@ -167,8 +167,13 @@ Choices are:
167167
6. material-icons-sharp.umd.js
168168
7. material-icons.umd.js
169169
8. mdi-v4.umd.js
170-
9. themify.umd.js
171-
10. line-awesome.umd.js
170+
9. mdi-v5.umd.js
171+
10. themify.umd.js
172+
11. line-awesome.umd.js
173+
174+
``` warning
175+
You can only use one of `mdi-v4` or `mdi-v5`
176+
```
172177

173178
# Codepen
174179
[UMD Example on Codepen](https://codepen.io/Hawkeye64/pen/vYYYewG)

demo/src/pages/Examples.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default {
8282
`https://cdn.jsdelivr.net/npm/@quasar/quasar-ui-qiconpicker@${version}/dist/icon-set/material-icons-outlined.umd.js`,
8383
`https://cdn.jsdelivr.net/npm/@quasar/quasar-ui-qiconpicker@${version}/dist/icon-set/material-icons-round.umd.js`,
8484
`https://cdn.jsdelivr.net/npm/@quasar/quasar-ui-qiconpicker@${version}/dist/icon-set/material-icons-sharp.umd.js`,
85-
`https://cdn.jsdelivr.net/npm/@quasar/quasar-ui-qiconpicker@${version}/dist/icon-set/mdi-v4.umd.js`,
85+
`https://cdn.jsdelivr.net/npm/@quasar/quasar-ui-qiconpicker@${version}/dist/icon-set/mdi-v5.umd.js`,
8686
`https://cdn.jsdelivr.net/npm/@quasar/quasar-ui-qiconpicker@${version}/dist/icon-set/themify.umd.js`,
8787
`https://cdn.jsdelivr.net/npm/@quasar/quasar-ui-qiconpicker@${version}/dist/icon-set/line-awesome.umd.js`
8888
@@ -92,7 +92,7 @@ export default {
9292
'https://fonts.googleapis.com/css?family=Roboto:300,400,500|Material+Icons|Material+Icons+Outlined|Material+Icons+Round|Material+Icons+Sharp',
9393
'https://cdn.jsdelivr.net/npm/@quasar/extras/fontawesome-v5/fontawesome-v5.css',
9494
'https://cdn.jsdelivr.net/npm/@quasar/extras/ionicons-v4/ionicons-v4.css',
95-
'https://cdn.jsdelivr.net/npm/@quasar/extras/mdi-v4/mdi-v4.css',
95+
'https://cdn.jsdelivr.net/npm/@quasar/extras/mdi-v5/mdi-v5.css',
9696
'https://cdn.jsdelivr.net/npm/@quasar/extras/themify/themify.css',
9797
'https://cdn.jsdelivr.net/npm/@quasar/extras/eva-icons/eva-icons.css',
9898
'https://cdn.jsdelivr.net/npm/@quasar/extras/line-awesome/line-awesome.css'

demo/src/store/common/state.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default {
99
{ label: 'Material Icons Outlined', value: 'material-icons-outlined' },
1010
{ label: 'Material Icons Round', value: 'material-icons-round' },
1111
{ label: 'Material Icons Sharp', value: 'material-icons-sharp' },
12-
{ label: 'MDI Icons (v4)', value: 'mdi-v4' },
12+
{ label: 'MDI Icons (v5)', value: 'mdi-v5' },
1313
{ label: 'Themify Icons', value: 'themify' },
1414
{ label: 'Line-awesome Icons', value: 'line-awesome' }
1515
]

ui/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ import '@quasar/quasar-ui-qiconpicker/dist/icon-set/material-icons-outlined.umd.
9292
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/material-icons-round.umd.js'
9393
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/material-icons-sharp.umd.js'
9494
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/material-icons.umd.js'
95-
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/mdi-v4.umd.js'
95+
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/mdi-v5.umd.js'
9696
import '@quasar/quasar-ui-qiconpicker/dist/icon-set/themify.umd.js'
9797
export default {
9898
name: 'App'

ui/dev/quasar.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = function (ctx) {
1717

1818
extras: [
1919
'ionicons-v4',
20-
'mdi-v4',
20+
'mdi-v5',
2121
'fontawesome-v5',
2222
'eva-icons',
2323
'themify',

ui/src/components/QIconPicker.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"material-icons-sharp",
2626
"ionicons-v4",
2727
"mdi-v4",
28+
"mdi-v5",
2829
"fontawesome-v5",
2930
"eva-icons",
3031
"themify"

ui/src/components/utils/props.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export default {
1010
'material-icons-sharp',
1111
'ionicons-v4',
1212
'mdi-v4',
13+
'mdi-v5',
1314
'fontawesome-v5',
1415
'eva-icons',
1516
'themify',

0 commit comments

Comments
 (0)