fix Timeline custom head bug

fix Timeline custom head bug
This commit is contained in:
梁灏 2016-09-22 18:28:19 +08:00
parent 385cfebab6
commit c649968a4a
5 changed files with 10 additions and 53 deletions

View file

@ -1,9 +1,7 @@
<template> <template>
<li :class="itemClasses"> <li :class="itemClasses">
<div :class="tailClasses"></div> <div :class="tailClasses"></div>
<div :class="headClasses" :style="customColor"> <div :class="headClasses" :style="customColor" v-el:dot><slot name="dot"></slot></div>
<slot name="dot"></slot>
</div>
<div :class="contentClasses"> <div :class="contentClasses">
<slot></slot> <slot></slot>
</div> </div>
@ -25,7 +23,7 @@
} }
}, },
ready () { ready () {
this.dot = this.$children.length ? true : false; this.dot = this.$els.dot.innerHTML.length ? true : false;
}, },
computed: { computed: {
itemClasses () { itemClasses () {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -8,6 +8,7 @@
<br><br> <br><br>
<Timeline> <Timeline>
<Timeline-item> <Timeline-item>
<Icon type="close-circled" slot="dot"></Icon>
<p class="time">1976</p> <p class="time">1976</p>
<p class="content">Apple I 问世</p> <p class="content">Apple I 问世</p>
</Timeline-item> </Timeline-item>
@ -15,49 +16,7 @@
<p class="time">1984</p> <p class="time">1984</p>
<p class="content">发布 Macintosh</p> <p class="content">发布 Macintosh</p>
</Timeline-item> </Timeline-item>
<Timeline-item>
<p class="time">2007</p>
<p class="content">发布 iPhone</p>
</Timeline-item>
<Timeline-item>
<p class="time">2010</p>
<p class="content">发布 iPad</p>
</Timeline-item>
<Timeline-item>
<p class="time">2011年10月5日</p>
<p class="content">史蒂夫·乔布斯去世</p>
</Timeline-item>
</Timeline> </Timeline>
<br><br><br>
<Timeline>
<Timeline-item color="green">发布1.0版本</Timeline-item>
<Timeline-item color="green">发布2.0版本</Timeline-item>
<Timeline-item color="red">严重故障</Timeline-item>
<Timeline-item color="blue">发布3.0版本</Timeline-item>
</Timeline>
<br><br><br>
<Timeline pending>
<Timeline-item>发布1.0版本</Timeline-item>
<Timeline-item>发布2.0版本</Timeline-item>
<Timeline-item>发布3.0版本</Timeline-item>
<Timeline-item><a href="#">查看更多</a></Timeline-item>
</Timeline>
<br><br><br>
<Timeline>
<Timeline-item color="green">
<Icon type="trophy" slot="dot"></Icon>
<span>发布里程碑版本</span>
</Timeline-item>
<Timeline-item>发布1.0版本</Timeline-item>
<Timeline-item>发布2.0版本</Timeline-item>
<Timeline-item>发布3.0版本</Timeline-item>
</Timeline>
<br><br><br>
<Timeline pending>
<Timeline-item>发布1.0版本</Timeline-item>
<Timeline-item>发布2.0版本</Timeline-item>
</Timeline>
<br><br><br>
</div> </div>
</template> </template>
<script> <script>
@ -70,9 +29,9 @@
Button, Button,
Progress, Progress,
ButtonGroup, ButtonGroup,
Icon,
Timeline, Timeline,
TimelineItem TimelineItem,
Icon
}, },
props: { props: {

View file

@ -7,7 +7,7 @@
padding: 0; padding: 0;
&-item { &-item {
margin: 0; margin: 0 !important;
padding: 0 0 12px 0; padding: 0 0 12px 0;
list-style: none; list-style: none;
position: relative; position: relative;
@ -62,10 +62,10 @@
} }
&-content { &-content {
padding: 0 0 10px 24px; padding: 1px 1px 10px 24px;
font-size: @font-size-base; font-size: @font-size-base;
position: relative; position: relative;
top: -4px; top: -5px;
} }
&:last-child { &:last-child {