diff --git a/example/docs/zh-CN/components/timeline.md b/example/docs/zh-CN/components/timeline.md index 959c19ba..8d917636 100644 --- a/example/docs/zh-CN/components/timeline.md +++ b/example/docs/zh-CN/components/timeline.md @@ -111,6 +111,44 @@ export default { } } +::: + +::: title 水平方向 +::: + +::: demo + + + + + +::: + +::: title Timeline 属性 +::: + +::: table + +| 属性 | 描述 | 可选值 | +|-----------|------|-----| +| direction | 排列方向 | `horizontal` `vertical` | ::: @@ -119,10 +157,10 @@ export default { ::: table -| | | | -| ------ | -------- | --- | +| 属性 | 描述 | 可选值 | +|--------|------|-----| | simple | 简单模式 | -- | -| title | 标题 | -- | +| title | 标题 | -- | ::: @@ -131,9 +169,9 @@ export default { ::: table -| | | | -| ------ | -------- | --- | -| dot | 节点 | -- | +| 插槽名 | 描述 | | +|-----|-----| --- | +| dot | 节点 | -- | ::: diff --git a/src/component/tab/index.less b/src/component/tab/index.less index d594101d..2d81f5cc 100644 --- a/src/component/tab/index.less +++ b/src/component/tab/index.less @@ -111,6 +111,10 @@ border-left-color: #FFF; } +.layui-tab-brief>.layui-tab-head{ + background-color: #FFF; +} + .layui-tab-brief>.layui-tab-head>.layui-tab-title .layui-this { color: @global-primary-color; } @@ -154,10 +158,6 @@ box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.1); } -.layui-tab-card>.layui-tab-head>.layui-tab-title { - background-color: @global-neutral-color-1; -} - .layui-tab-card>.layui-tab-head>.layui-tab-title li { margin-right: -1px; margin-left: -1px; diff --git a/src/component/timeline/index.less b/src/component/timeline/index.less index 54046aa9..11b6dd49 100644 --- a/src/component/timeline/index.less +++ b/src/component/timeline/index.less @@ -59,3 +59,42 @@ .layui-timeline-item:before { background-color: #eee; } + +.layui-timeline-horizontal .layui-timeline-item { + display: inline-block; + width: 25%; + text-align: center; + padding-top: 10px; + vertical-align: top; +} + +.layui-timeline-horizontal .layui-timeline-axis { + left: 47%; + top: -4px; +} + +.layui-timeline-horizontal .layui-timeline-item:before { + left: 0px; + top: 5px; + width: 100%; + height: 1px; +} + +.layui-timeline-horizontal .layui-timeline-item:first-child:before { + display: block; +} + +.layui-timeline-horizontal .layui-timeline-item:last-child:before { + display: block; +} + +.layui-timeline-horizontal .layui-timeline-content { + padding: 15px; +} + +.layui-timeline-horizontal .layui-timeline-title { + text-align: center; + position: relative; + margin-bottom: 10px; + line-height: 22px; +} diff --git a/src/component/timeline/index.vue b/src/component/timeline/index.vue index 0278c135..36e503f2 100644 --- a/src/component/timeline/index.vue +++ b/src/component/timeline/index.vue @@ -6,10 +6,24 @@ export default {