Commit 69d21e7ab2b6f710ee519069f702df84805a3e91

Authored by jingsam
2 parents ba746f71 e3a12bd3

Merge branch 'master' of github.com:jingsam/iview

@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 </a> 4 </a>
5 </p> 5 </p>
6 6
7 -# iView [![](https://img.shields.io/travis/iview/iview.svg?style=flat-square)](https://travis-ci.org/iview/iview) [![iView](https://img.shields.io/npm/v/iview.svg?style=flat-square)](https://www.npmjs.org/package/iview) [![NPM downloads](http://img.shields.io/npm/dm/iview.svg?style=flat-square)](https://npmjs.org/package/iview) 7 +# iView [![](https://img.shields.io/travis/iview/iview.svg?style=flat-square)](https://travis-ci.org/iview/iview) [![iView](https://img.shields.io/npm/v/iview.svg?style=flat-square)](https://www.npmjs.org/package/iview) [![NPM downloads](http://img.shields.io/npm/dm/iview.svg?style=flat-square)](https://npmjs.org/package/iview) [![Join the chat at https://gitter.im/iview/iview](https://badges.gitter.im/iview/iview.svg)](https://gitter.im/iview/iview?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
8 8
9 ### A high quality UI Components Library with Vue.js 9 ### A high quality UI Components Library with Vue.js
10 10
1 { 1 {
2 "name": "iview", 2 "name": "iview",
3 - "version": "0.9.5", 3 + "version": "0.9.7-rc-1",
4 "title": "iView", 4 "title": "iView",
5 "description": "A high quality UI components Library with Vue.js", 5 "description": "A high quality UI components Library with Vue.js",
6 "homepage": "http://www.iviewui.com", 6 "homepage": "http://www.iviewui.com",
src/components/base/notification/notice.vue
1 <template> 1 <template>
2 <div :class="classes" :style="style" :transition="transitionName"> 2 <div :class="classes" :style="style" :transition="transitionName">
3 <div :class="[baseClass + '-content']" v-el:content>{{{ content }}}</div> 3 <div :class="[baseClass + '-content']" v-el:content>{{{ content }}}</div>
4 - <a :class="[baseClass + '-close]" @click="close" v-if="closable"> 4 + <a :class="[baseClass + '-close']" @click="close" v-if="closable">
5 <i class="ivu-icon ivu-icon-ios-close-empty"></i> 5 <i class="ivu-icon ivu-icon-ios-close-empty"></i>
6 </a> 6 </a>
7 </div> 7 </div>
src/components/modal/modal.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div :class="wrapClasses"> 2 <div :class="wrapClasses">
3 <div :class="maskClasses" v-show="visible" @click="mask" transition="fade"></div> 3 <div :class="maskClasses" v-show="visible" @click="mask" transition="fade"></div>
4 <div :class="classes" :style="styles" v-show="visible" transition="ease"> 4 <div :class="classes" :style="styles" v-show="visible" transition="ease">
5 - <div :class="[prefixCls + '-content]"> 5 + <div :class="[prefixCls + '-content']">
6 <a :class="[prefixCls + '-close']" v-if="closable" @click="close"> 6 <a :class="[prefixCls + '-close']" v-if="closable" @click="close">
7 <slot name="close"> 7 <slot name="close">
8 <Icon type="ios-close-empty"></Icon> 8 <Icon type="ios-close-empty"></Icon>