update Poptip

update Poptip
This commit is contained in:
梁灏 2016-10-27 12:10:59 +08:00
parent 9b7840163d
commit 613f5243a9
6 changed files with 30 additions and 18 deletions

View file

@ -27,7 +27,9 @@
</div>
<div :class="[`${prefixCls}-inner`]" v-if="!confirm">
<div :class="[`${prefixCls}-title`]" v-if="showTitle" v-el:title><slot name="title">{{ title }}</slot></div>
<div :class="[`${prefixCls}-body`]"><slot name="content">{{ content }}</slot></div>
<div :class="[`${prefixCls}-body`]">
<div :class="[`${prefixCls}-body-content`]"><slot name="content">{{ content }}</slot></div>
</div>
</div>
</div>
</div>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -30,6 +30,13 @@
</style>
<template>
<div class="tooltip_out">
<Poptip>
<a>click 激活</a>
<div slot="title"><i>自定义标题</i></div>
<div slot="content">
<a>关闭提示框</a>
</div>
</Poptip>
<Poptip placement="right" width="300">
<Button type="ghost">click 激活</Button>
<div class="api" slot="content">

View file

@ -1,6 +1,6 @@
{
"name": "iview",
"version": "0.9.5-rc-8",
"version": "0.9.5-rc-9",
"title": "iView",
"description": "A high quality UI components Library with Vue.js",
"homepage": "http://www.iviewui.com",

View file

@ -25,7 +25,21 @@
}
&-body{
overflow: auto;
padding: 8px 16px;
&-content{
overflow: auto;
}
}
&-inner{
width: 100%;
background-color: #fff;
background-clip: padding-box;
border: 1px solid @border-color-split;
border-radius: @border-radius-small;
box-shadow: @shadow-base;
white-space: nowrap;
}
&-popper{
@ -66,17 +80,6 @@
}
}
&-inner{
width: 100%;
padding: 8px 16px;
background-color: #fff;
background-clip: padding-box;
border: 1px solid @border-color-split;
border-radius: @border-radius-small;
box-shadow: @shadow-base;
white-space: nowrap;
}
&-arrow{
&, &:after{
display: block;
@ -100,10 +103,10 @@
}
&-confirm &-inner{
white-space: normal;
padding: 16px 16px 8px;
}
&-confirm &-body{
padding: 16px 16px 8px;
.ivu-icon{
color: @warning-color;
line-height: 17px;
@ -117,7 +120,7 @@
&-confirm &-footer{
text-align: right;
padding: 16px 0 8px 0;
padding: 8px 16px 16px;
button {
margin-left: 4px;
}