Merge branch 'carbon-1' into carbon

This commit is contained in:
Leopoldthecoder
2017-09-01 10:56:25 +08:00
46 changed files with 241 additions and 102 deletions

View File

@@ -3,7 +3,7 @@
<div class="el-message-box__wrapper" tabindex="-1" v-show="visible" @click.self="handleWrapperClick">
<div class="el-message-box" :class="customClass">
<div class="el-message-box__header" v-if="title !== undefined">
<div class="el-message-box__title">{{ title || t('el.messagebox.title') }}</div>
<div class="el-message-box__title">{{ title }}</div>
<button type="button" class="el-message-box__headerbtn" aria-label="Close"
v-if="showClose" @click="handleAction('cancel')">
<i class="el-message-box__close el-icon-close"></i>