mirrors/element
1
0
Fork 0
mirror of https://github.com/ElemeFE/element.git synced 2025-12-19 12:04:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 1.2-merge1

Browse Source 
# Conflicts:
#	package.json
#	src/utils/popup/index.js
#	yarn.lock
This commit is contained in:
Leopoldthecoder
2017-02-09 17:33:42 +08:00
parent 9dee785465 4c69a540ca
commit 3243b8fc98
187 changed files with 829 additions and 3352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/dialog/src/component.vue
View File

@@ -7,7 +7,9 @@
ref="dialog"
:style="style">
<div class="el-dialog__header">
<span class="el-dialog__title">{{title}}</span>
<slot name="title">
<span class="el-dialog__title">{{title}}</span>
</slot>
<div class="el-dialog__headerbtn">
<i v-if="showClose" class="el-dialog__close el-icon el-icon-close" @click='close()'></i>
</div>