update some style

update some style
This commit is contained in:
梁灏 2016-11-07 14:16:20 +08:00
parent 034412553a
commit 7d5431d85a
9 changed files with 86 additions and 13 deletions

View file

@ -1,10 +1,12 @@
<template> <template>
<input <div :class="wrapClasses">
:class="classes" <input
:type="type" :class="classes"
:placeholder="placeholder" :type="type"
:name="name" :placeholder="placeholder"
v-model="value"> :name="name"
v-model="value">
</div>
</template> </template>
<script> <script>
import { oneOf } from '../../utils/assist'; import { oneOf } from '../../utils/assist';
@ -36,6 +38,9 @@
} }
}, },
computed: { computed: {
wrapClasses () {
},
classes () { classes () {
return [ return [
`${prefixCls}`, `${prefixCls}`,

View file

@ -45,7 +45,6 @@ const iview = {
Col, Col,
Collapse, Collapse,
Icon, Icon,
Input,
InputNumber, InputNumber,
LoadingBar, LoadingBar,
Message, Message,

View file

@ -26,7 +26,7 @@
background-color: @tooltip-bg; background-color: @tooltip-bg;
border-radius: @border-radius-small; border-radius: @border-radius-small;
box-shadow: @shadow-base; box-shadow: @shadow-base;
white-space:nowrap; white-space: nowrap;
} }
&-arrow{ &-arrow{

View file

@ -32,7 +32,7 @@
&:after { &:after {
content: ''; content: '';
display: table; display: table;
width: 5px; width: 4px;
height: 8px; height: 8px;
position: absolute; position: absolute;
top: 1px; top: 1px;
@ -75,7 +75,7 @@
&:after { &:after {
content: ''; content: '';
display: table; display: table;
width: 5px; width: 4px;
height: 8px; height: 8px;
position: absolute; position: absolute;
top: 1px; top: 1px;

View file

@ -38,6 +38,7 @@ li + li {
<li><a v-link="'/switch'">Switch</a></li> <li><a v-link="'/switch'">Switch</a></li>
<li><a v-link="'/alert'">Alert</a></li> <li><a v-link="'/alert'">Alert</a></li>
<li><a v-link="'/tag'">Tag</a></li> <li><a v-link="'/tag'">Tag</a></li>
<li><a v-link="'/input'">Input</a></li>
</ul> </ul>
</nav> </nav>
<router-view></router-view> <router-view></router-view>

View file

@ -80,6 +80,11 @@ router.map({
component: function (resolve) { component: function (resolve) {
require(['./routers/tag.vue'], resolve); require(['./routers/tag.vue'], resolve);
} }
},
'/input': {
component: function (resolve) {
require(['./routers/input.vue'], resolve);
}
} }
}); });

26
test/routers/input.vue Normal file
View file

@ -0,0 +1,26 @@
<template>
<i-input></i-input>
</template>
<script>
import { Input } from 'iview';
export default {
components: {
iInput: Input
},
props: {
},
data () {
return {
}
},
computed: {
},
methods: {
}
}
</script>

View file

@ -106,7 +106,6 @@
} }
}, },
ready () { ready () {
this.info2();
// Message.config({ // Message.config({
// top: 50, // top: 50,
// duration: 8 // duration: 8

View file

@ -27,9 +27,47 @@
padding: 8px 16px; padding: 8px 16px;
text-align: left; text-align: left;
} }
.tip{
width: 24px;
position: fixed;
top: 10px;
right: 10px;
}
.tip-inner{
width: 24px;
height: 24px;
line-height: 22px;
text-align: center;
background: #fff;
border: 1px solid #3399ff;
color: #3399ff;
border-radius: 50%;
cursor: pointer;
}
.tip-content{
width: 200px;
height: 100px;
white-space: normal;
}
</style> </style>
<template> <template>
<div class="tooltip_out"> <div class="tooltip_out">
<!--<Poptip class="tip" placement="left-start" trigger="hover">-->
<!--<div class="tip-inner">-->
<!--<Icon type="information"></Icon>-->
<!--</div>-->
<!--<div class="tip-content" slot="content">-->
<!--<p>iView 最新版本为 0.9.7该版本对很多组件 UI 进行了调整</p>-->
<!--</div>-->
<!--</Poptip>-->
<Tooltip class="tip" placement="left-start" trigger="hover">
<div class="tip-inner">
<Icon type="information"></Icon>
</div>
<div class="tip-content" slot="content">
<p>iView 最新版本为 0.9.7该版本对很多组件 UI 进行了调整</p>
</div>
</Tooltip>
<Poptip> <Poptip>
<a>click 激活</a> <a>click 激活</a>
<div slot="title"><i>自定义标题</i></div> <div slot="title"><i>自定义标题</i></div>
@ -105,10 +143,10 @@
</div> </div>
</template> </template>
<script> <script>
import { Tooltip, Button, Row, iCol, Poptip, iSelect, iOption, Message } from 'iview'; import { Tooltip, Button, Row, iCol, Poptip, iSelect, iOption, Message, Icon } from 'iview';
export default { export default {
components: { Tooltip, iButton: Button, Row, iCol, Poptip, iSelect, iOption, Message }, components: { Tooltip, iButton: Button, Row, iCol, Poptip, iSelect, iOption, Message, Icon },
props: { props: {
}, },