Skip to content

Commit e9bf615

Browse files
committed
Further work for icon sets
1 parent 366e62c commit e9bf615

File tree

4 files changed

+26
-9
lines changed

4 files changed

+26
-9
lines changed

icons/material.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,33 @@ export default {
5050
hidePass: 'visibility_off',
5151
clear: 'cancel'
5252
},
53+
pagination: {
54+
first: 'first_page',
55+
prev: 'keyboard_arrow_left',
56+
next: 'keyboard_arrow_right',
57+
last: 'last_page'
58+
},
5359
rating: {
5460
icon: 'grade'
5561
},
5662
select: {
5763
dropdown: 'arrow_drop_down'
5864
},
65+
stepper: {
66+
done: 'check',
67+
active: 'edit',
68+
error: 'warning'
69+
},
5970
tabs: {
6071
left: 'chevron_left',
6172
right: 'chevron_right'
6273
},
74+
table: {
75+
arrowUp: 'arrow_upward',
76+
warning: 'warning',
77+
prevPage: 'chevron_left',
78+
nextPage: 'chevron_right'
79+
},
6380
uploader: {
6481
done: 'done',
6582
clear: 'clear',

src/components/pagination/QPagination.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
22
<div class="q-pagination" :class="{disabled: disable}">
3-
<q-btn :disable="value === min" :color="color" flat small @click="set(min)" icon="first_page"></q-btn>
4-
<q-btn :disable="value === min" :color="color" flat small @click="setByOffset(-1)" icon="keyboard_arrow_left"></q-btn>
3+
<q-btn :disable="value === min" :color="color" flat small round @click="set(min)" :icon="$q.icon.pagination.first"></q-btn>
4+
<q-btn :disable="value === min" :color="color" flat small round @click="setByOffset(-1)" :icon="$q.icon.pagination.prev"></q-btn>
55

66
<q-input
77
ref="input"
8-
class="inline"
8+
class="inline no-margin"
99
type="number"
1010
v-model="newPage"
1111
:min="min"
@@ -18,8 +18,8 @@
1818
@blur="__update"
1919
></q-input>
2020

21-
<q-btn :disable="value === max" :color="color" flat small @click="setByOffset(1)" icon="keyboard_arrow_right"></q-btn>
22-
<q-btn :disable="value === max" :color="color" flat small @click="set(max)" icon="last_page"></q-btn>
21+
<q-btn :disable="value === max" :color="color" flat small round @click="setByOffset(1)" :icon="$q.icon.pagination.next"></q-btn>
22+
<q-btn :disable="value === max" :color="color" flat small round @click="set(max)" :icon="$q.icon.pagination.last"></q-btn>
2323
</div>
2424
</template>
2525

src/components/table/QTh.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default {
4949

5050
child[action](
5151
h(QIcon, {
52-
props: { name: 'arrow_upward' },
52+
props: { name: ctx.parent.$q.icon.table.arrowUp },
5353
staticClass: col.__iconClass
5454
})
5555
)

src/components/table/table-bottom.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default {
1111
: (this.loader ? this.loaderLabel || this.$q.i18n.table.loader : this.noDataLabel || this.$q.i18n.table.noData)
1212

1313
return h('div', { staticClass: 'q-table-bottom row items-center q-table-nodata' }, [
14-
h(QIcon, {props: {name: 'warning'}}),
14+
h(QIcon, {props: { name: this.$q.icon.table.warning }}),
1515
message
1616
])
1717
}
@@ -69,7 +69,7 @@ export default {
6969
props: {
7070
color: this.color,
7171
round: true,
72-
icon: 'chevron_left',
72+
icon: this.$q.icon.table.prevPage,
7373
small: true,
7474
flat: true,
7575
disable: page === 1
@@ -84,7 +84,7 @@ export default {
8484
props: {
8585
color: this.color,
8686
round: true,
87-
icon: 'chevron_right',
87+
icon: this.$q.icon.table.nextPage,
8888
small: true,
8989
flat: true,
9090
disable: this.lastRowIndex === 0 || page * rowsPerPage >= this.computedRowsNumber

0 commit comments

Comments
 (0)