Commit 9eba26feaa85c1093914f2457af6cc620464eaa3
1 parent
021bbec2
update Select Icons
Showing
5 changed files
with
7 additions
and
8 deletions
Show diff stats
src/components/select/select-head.vue
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <div @click="onHeaderClick"> | 2 | <div @click="onHeaderClick"> |
| 3 | <div class="ivu-tag ivu-tag-checked" v-for="item in selectedMultiple"> | 3 | <div class="ivu-tag ivu-tag-checked" v-for="item in selectedMultiple"> |
| 4 | <span class="ivu-tag-text">{{ item.label }}</span> | 4 | <span class="ivu-tag-text">{{ item.label }}</span> |
| 5 | - <Icon type="ios-close-empty" @click.native.stop="removeTag(item)"></Icon> | 5 | + <Icon type="ios-close" @click.native.stop="removeTag(item)"></Icon> |
| 6 | </div> | 6 | </div> |
| 7 | <span | 7 | <span |
| 8 | :class="singleDisplayClasses" | 8 | :class="singleDisplayClasses" |
| @@ -25,8 +25,8 @@ | @@ -25,8 +25,8 @@ | ||
| 25 | @blur="onInputFocus" | 25 | @blur="onInputFocus" |
| 26 | 26 | ||
| 27 | ref="input"> | 27 | ref="input"> |
| 28 | - <Icon type="ios-close" :class="[prefixCls + '-arrow']" v-if="resetSelect" @click.native.stop="onClear"></Icon> | ||
| 29 | - <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']" v-if="!resetSelect && !remote && !disabled"></Icon> | 28 | + <Icon type="ios-close-circle" :class="[prefixCls + '-arrow']" v-if="resetSelect" @click.native.stop="onClear"></Icon> |
| 29 | + <Icon type="ios-arrow-down" :class="[prefixCls + '-arrow']" v-if="!resetSelect && !remote && !disabled"></Icon> | ||
| 30 | </div> | 30 | </div> |
| 31 | </template> | 31 | </template> |
| 32 | <script> | 32 | <script> |
src/components/select/select.vue
| @@ -71,7 +71,6 @@ | @@ -71,7 +71,6 @@ | ||
| 71 | </div> | 71 | </div> |
| 72 | </template> | 72 | </template> |
| 73 | <script> | 73 | <script> |
| 74 | - import Icon from '../icon'; | ||
| 75 | import Drop from './dropdown.vue'; | 74 | import Drop from './dropdown.vue'; |
| 76 | import {directive as clickOutside} from 'v-click-outside-x'; | 75 | import {directive as clickOutside} from 'v-click-outside-x'; |
| 77 | import TransferDom from '../../directives/transfer-dom'; | 76 | import TransferDom from '../../directives/transfer-dom'; |
| @@ -141,7 +140,7 @@ | @@ -141,7 +140,7 @@ | ||
| 141 | export default { | 140 | export default { |
| 142 | name: 'iSelect', | 141 | name: 'iSelect', |
| 143 | mixins: [ Emitter, Locale ], | 142 | mixins: [ Emitter, Locale ], |
| 144 | - components: { FunctionalOptions, Drop, Icon, SelectHead }, | 143 | + components: { FunctionalOptions, Drop, SelectHead }, |
| 145 | directives: { clickOutside, TransferDom }, | 144 | directives: { clickOutside, TransferDom }, |
| 146 | props: { | 145 | props: { |
| 147 | value: { | 146 | value: { |
src/styles/components/select.less
| @@ -249,7 +249,7 @@ | @@ -249,7 +249,7 @@ | ||
| 249 | .ivu-icon(); | 249 | .ivu-icon(); |
| 250 | //float: right; | 250 | //float: right; |
| 251 | font-size: 24px; | 251 | font-size: 24px; |
| 252 | - content: '\F3FD'; | 252 | + content: '\F3FF'; |
| 253 | color: @selected-color; | 253 | color: @selected-color; |
| 254 | position: absolute; | 254 | position: absolute; |
| 255 | top: 2px; | 255 | top: 2px; |
src/styles/components/tag.less
src/styles/mixins/content.less
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | overflow: hidden; | 29 | overflow: hidden; |
| 30 | cursor: pointer; | 30 | cursor: pointer; |
| 31 | 31 | ||
| 32 | - .@{icon-prefix-cls}-ios-close-empty { | 32 | + .@{icon-prefix-cls}-ios-close { |
| 33 | .close-base(@top, @icon-font-size); | 33 | .close-base(@top, @icon-font-size); |
| 34 | } | 34 | } |
| 35 | } | 35 | } |
| 36 | \ No newline at end of file | 36 | \ No newline at end of file |