Commit 0f512d6a7337a28309a9d8493ab3a5ab9e3ea8dc
1 parent
9eba26fe
update Date Icons
Showing
5 changed files
with
18 additions
and
18 deletions
Show diff stats
src/components/date-picker/panel/Date/date-range.vue
| @@ -11,12 +11,12 @@ | @@ -11,12 +11,12 @@ | ||
| 11 | <div :class="[datePrefixCls + '-header']" v-show="currentView !== 'time'"> | 11 | <div :class="[datePrefixCls + '-header']" v-show="currentView !== 'time'"> |
| 12 | <span | 12 | <span |
| 13 | :class="iconBtnCls('prev', '-double')" | 13 | :class="iconBtnCls('prev', '-double')" |
| 14 | - @click="prevYear('left')"><Icon type="ios-arrow-left"></Icon></span> | 14 | + @click="prevYear('left')"><Icon type="ios-arrow-back"></Icon></span> |
| 15 | <span | 15 | <span |
| 16 | v-if="leftPickerTable === 'date-table'" | 16 | v-if="leftPickerTable === 'date-table'" |
| 17 | :class="iconBtnCls('prev')" | 17 | :class="iconBtnCls('prev')" |
| 18 | @click="prevMonth('left')" | 18 | @click="prevMonth('left')" |
| 19 | - v-show="currentView === 'date'"><Icon type="ios-arrow-left"></Icon></span> | 19 | + v-show="currentView === 'date'"><Icon type="ios-arrow-back"></Icon></span> |
| 20 | <date-panel-label | 20 | <date-panel-label |
| 21 | :date-panel-label="leftDatePanelLabel" | 21 | :date-panel-label="leftDatePanelLabel" |
| 22 | :current-view="leftDatePanelView" | 22 | :current-view="leftDatePanelView" |
| @@ -24,12 +24,12 @@ | @@ -24,12 +24,12 @@ | ||
| 24 | <span | 24 | <span |
| 25 | v-if="splitPanels || leftPickerTable !== 'date-table'" | 25 | v-if="splitPanels || leftPickerTable !== 'date-table'" |
| 26 | :class="iconBtnCls('next', '-double')" | 26 | :class="iconBtnCls('next', '-double')" |
| 27 | - @click="nextYear('left')"><Icon type="ios-arrow-right"></Icon></span> | 27 | + @click="nextYear('left')"><Icon type="ios-arrow-forward"></Icon></span> |
| 28 | <span | 28 | <span |
| 29 | v-if="splitPanels && leftPickerTable === 'date-table'" | 29 | v-if="splitPanels && leftPickerTable === 'date-table'" |
| 30 | :class="iconBtnCls('next')" | 30 | :class="iconBtnCls('next')" |
| 31 | @click="nextMonth('left')" | 31 | @click="nextMonth('left')" |
| 32 | - v-show="currentView === 'date'"><Icon type="ios-arrow-right"></Icon></span> | 32 | + v-show="currentView === 'date'"><Icon type="ios-arrow-forward"></Icon></span> |
| 33 | </div> | 33 | </div> |
| 34 | <component | 34 | <component |
| 35 | :is="leftPickerTable" | 35 | :is="leftPickerTable" |
| @@ -53,24 +53,24 @@ | @@ -53,24 +53,24 @@ | ||
| 53 | <span | 53 | <span |
| 54 | v-if="splitPanels || rightPickerTable !== 'date-table'" | 54 | v-if="splitPanels || rightPickerTable !== 'date-table'" |
| 55 | :class="iconBtnCls('prev', '-double')" | 55 | :class="iconBtnCls('prev', '-double')" |
| 56 | - @click="prevYear('right')"><Icon type="ios-arrow-left"></Icon></span> | 56 | + @click="prevYear('right')"><Icon type="ios-arrow-back"></Icon></span> |
| 57 | <span | 57 | <span |
| 58 | v-if="splitPanels && rightPickerTable === 'date-table'" | 58 | v-if="splitPanels && rightPickerTable === 'date-table'" |
| 59 | :class="iconBtnCls('prev')" | 59 | :class="iconBtnCls('prev')" |
| 60 | @click="prevMonth('right')" | 60 | @click="prevMonth('right')" |
| 61 | - v-show="currentView === 'date'"><Icon type="ios-arrow-left"></Icon></span> | 61 | + v-show="currentView === 'date'"><Icon type="ios-arrow-back"></Icon></span> |
| 62 | <date-panel-label | 62 | <date-panel-label |
| 63 | :date-panel-label="rightDatePanelLabel" | 63 | :date-panel-label="rightDatePanelLabel" |
| 64 | :current-view="rightDatePanelView" | 64 | :current-view="rightDatePanelView" |
| 65 | :date-prefix-cls="datePrefixCls"></date-panel-label> | 65 | :date-prefix-cls="datePrefixCls"></date-panel-label> |
| 66 | <span | 66 | <span |
| 67 | :class="iconBtnCls('next', '-double')" | 67 | :class="iconBtnCls('next', '-double')" |
| 68 | - @click="nextYear('right')"><Icon type="ios-arrow-right"></Icon></span> | 68 | + @click="nextYear('right')"><Icon type="ios-arrow-forward"></Icon></span> |
| 69 | <span | 69 | <span |
| 70 | v-if="rightPickerTable === 'date-table'" | 70 | v-if="rightPickerTable === 'date-table'" |
| 71 | :class="iconBtnCls('next')" | 71 | :class="iconBtnCls('next')" |
| 72 | @click="nextMonth('right')" | 72 | @click="nextMonth('right')" |
| 73 | - v-show="currentView === 'date'"><Icon type="ios-arrow-right"></Icon></span> | 73 | + v-show="currentView === 'date'"><Icon type="ios-arrow-forward"></Icon></span> |
| 74 | </div> | 74 | </div> |
| 75 | <component | 75 | <component |
| 76 | :is="rightPickerTable" | 76 | :is="rightPickerTable" |
src/components/date-picker/panel/Date/date.vue
| @@ -10,24 +10,24 @@ | @@ -10,24 +10,24 @@ | ||
| 10 | <div :class="[datePrefixCls + '-header']" v-show="currentView !== 'time'"> | 10 | <div :class="[datePrefixCls + '-header']" v-show="currentView !== 'time'"> |
| 11 | <span | 11 | <span |
| 12 | :class="iconBtnCls('prev', '-double')" | 12 | :class="iconBtnCls('prev', '-double')" |
| 13 | - @click="changeYear(-1)"><Icon type="ios-arrow-left"></Icon></span> | 13 | + @click="changeYear(-1)"><Icon type="ios-arrow-back"></Icon></span> |
| 14 | <span | 14 | <span |
| 15 | v-if="pickerTable === 'date-table'" | 15 | v-if="pickerTable === 'date-table'" |
| 16 | :class="iconBtnCls('prev')" | 16 | :class="iconBtnCls('prev')" |
| 17 | @click="changeMonth(-1)" | 17 | @click="changeMonth(-1)" |
| 18 | - v-show="currentView === 'date'"><Icon type="ios-arrow-left"></Icon></span> | 18 | + v-show="currentView === 'date'"><Icon type="ios-arrow-back"></Icon></span> |
| 19 | <date-panel-label | 19 | <date-panel-label |
| 20 | :date-panel-label="datePanelLabel" | 20 | :date-panel-label="datePanelLabel" |
| 21 | :current-view="pickerTable.split('-').shift()" | 21 | :current-view="pickerTable.split('-').shift()" |
| 22 | :date-prefix-cls="datePrefixCls"></date-panel-label> | 22 | :date-prefix-cls="datePrefixCls"></date-panel-label> |
| 23 | <span | 23 | <span |
| 24 | :class="iconBtnCls('next', '-double')" | 24 | :class="iconBtnCls('next', '-double')" |
| 25 | - @click="changeYear(+1)"><Icon type="ios-arrow-right"></Icon></span> | 25 | + @click="changeYear(+1)"><Icon type="ios-arrow-forward"></Icon></span> |
| 26 | <span | 26 | <span |
| 27 | v-if="pickerTable === 'date-table'" | 27 | v-if="pickerTable === 'date-table'" |
| 28 | :class="iconBtnCls('next')" | 28 | :class="iconBtnCls('next')" |
| 29 | @click="changeMonth(+1)" | 29 | @click="changeMonth(+1)" |
| 30 | - v-show="currentView === 'date'"><Icon type="ios-arrow-right"></Icon></span> | 30 | + v-show="currentView === 'date'"><Icon type="ios-arrow-forward"></Icon></span> |
| 31 | </div> | 31 | </div> |
| 32 | <div :class="[prefixCls + '-content']"> | 32 | <div :class="[prefixCls + '-content']"> |
| 33 | <component | 33 | <component |
src/components/date-picker/picker.vue
| @@ -259,8 +259,8 @@ | @@ -259,8 +259,8 @@ | ||
| 259 | }, | 259 | }, |
| 260 | iconType () { | 260 | iconType () { |
| 261 | let icon = 'ios-calendar-outline'; | 261 | let icon = 'ios-calendar-outline'; |
| 262 | - if (this.type === 'time' || this.type === 'timerange') icon = 'ios-clock-outline'; | ||
| 263 | - if (this.showClose) icon = 'ios-close'; | 262 | + if (this.type === 'time' || this.type === 'timerange') icon = 'ios-time-outline'; |
| 263 | + if (this.showClose) icon = 'ios-close-circle'; | ||
| 264 | return icon; | 264 | return icon; |
| 265 | }, | 265 | }, |
| 266 | transition () { | 266 | transition () { |
src/styles/components/date-picker.less
| @@ -190,7 +190,7 @@ | @@ -190,7 +190,7 @@ | ||
| 190 | &-arrow-double{ | 190 | &-arrow-double{ |
| 191 | margin-left: 10px; | 191 | margin-left: 10px; |
| 192 | i:after{ | 192 | i:after{ |
| 193 | - content: "\F3D2"; | 193 | + content: "\F3CF"; |
| 194 | } | 194 | } |
| 195 | } | 195 | } |
| 196 | } | 196 | } |
| @@ -199,7 +199,7 @@ | @@ -199,7 +199,7 @@ | ||
| 199 | &-arrow-double{ | 199 | &-arrow-double{ |
| 200 | margin-right: 10px; | 200 | margin-right: 10px; |
| 201 | i:after{ | 201 | i:after{ |
| 202 | - content: "\F3D3"; | 202 | + content: "\F3D1"; |
| 203 | } | 203 | } |
| 204 | } | 204 | } |
| 205 | } | 205 | } |
src/styles/components/page.less
| @@ -79,13 +79,13 @@ | @@ -79,13 +79,13 @@ | ||
| 79 | 79 | ||
| 80 | &-item-jump-prev:hover { | 80 | &-item-jump-prev:hover { |
| 81 | i:after { | 81 | i:after { |
| 82 | - content: "\F3D2"; | 82 | + content: "\F3CF"; |
| 83 | } | 83 | } |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | &-item-jump-next:hover { | 86 | &-item-jump-next:hover { |
| 87 | i:after { | 87 | i:after { |
| 88 | - content: "\F3D3"; | 88 | + content: "\F3D1"; |
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| 91 | 91 |