From 5cf383987cf3ad68163f440dade179ca70d6455a Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 30 Jan 2018 18:22:41 +0800 Subject: [PATCH] add divider --- components/divider/demo/horizontal.md | 23 ++++++++++ components/divider/demo/index.vue | 34 ++++++++++++++ components/divider/demo/vertical.md | 21 +++++++++ components/divider/index.en-US.md | 8 ++++ components/divider/index.vue | 28 ++++++++++++ components/divider/index.zh-CN.md | 6 +++ components/divider/style/index.js | 2 + components/divider/style/index.less | 65 +++++++++++++++++++++++++++ components/index.js | 2 + components/style.js | 1 + contributors.md | 3 +- examples/demo.js | 1 + 12 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 components/divider/demo/horizontal.md create mode 100644 components/divider/demo/index.vue create mode 100644 components/divider/demo/vertical.md create mode 100644 components/divider/index.en-US.md create mode 100644 components/divider/index.vue create mode 100644 components/divider/index.zh-CN.md create mode 100644 components/divider/style/index.js create mode 100644 components/divider/style/index.less diff --git a/components/divider/demo/horizontal.md b/components/divider/demo/horizontal.md new file mode 100644 index 000000000..bf9760081 --- /dev/null +++ b/components/divider/demo/horizontal.md @@ -0,0 +1,23 @@ + +#### 水平分割线 +默认为水平分割线,可在中间加入文字。 + + + +#### Horizontal +Divider default type is `horizontal`. Support inner text inside Divider. + + +```html + +``` diff --git a/components/divider/demo/index.vue b/components/divider/demo/index.vue new file mode 100644 index 000000000..b3a4a9197 --- /dev/null +++ b/components/divider/demo/index.vue @@ -0,0 +1,34 @@ + diff --git a/components/divider/demo/vertical.md b/components/divider/demo/vertical.md new file mode 100644 index 000000000..777540967 --- /dev/null +++ b/components/divider/demo/vertical.md @@ -0,0 +1,21 @@ + +#### 垂直分割线 +使用 `type="vertical"` 设置为行内的垂直分割线。 + + + +#### Vertical +Use `type="vertical"` make it vertical. + + +```html + +``` diff --git a/components/divider/index.en-US.md b/components/divider/index.en-US.md new file mode 100644 index 000000000..10b24a0f6 --- /dev/null +++ b/components/divider/index.en-US.md @@ -0,0 +1,8 @@ +## API + +### Divider + +| Property | Description | Type | Default | +| -------- | ----------- | ---- | ------- | +| dashed | whether line is dasded | Boolean | false | +| type | direction type of divider | enum: `horizontal` `vertical` | `horizontal` | diff --git a/components/divider/index.vue b/components/divider/index.vue new file mode 100644 index 000000000..5399a8c92 --- /dev/null +++ b/components/divider/index.vue @@ -0,0 +1,28 @@ + diff --git a/components/divider/index.zh-CN.md b/components/divider/index.zh-CN.md new file mode 100644 index 000000000..8d4c995c1 --- /dev/null +++ b/components/divider/index.zh-CN.md @@ -0,0 +1,6 @@ +## API + +| 参数 | 说明 | 类型 | 默认值 | +| --- | --- | --- | --- | +| dashed | 是否虚线 | Boolean | false | +| type | 水平还是垂直类型 | enum: `horizontal` `vertical` | `horizontal` | diff --git a/components/divider/style/index.js b/components/divider/style/index.js new file mode 100644 index 000000000..cf31ed80f --- /dev/null +++ b/components/divider/style/index.js @@ -0,0 +1,2 @@ +import '../../style/index.less' +import './index.less' diff --git a/components/divider/style/index.less b/components/divider/style/index.less new file mode 100644 index 000000000..9df8e8f32 --- /dev/null +++ b/components/divider/style/index.less @@ -0,0 +1,65 @@ +@import "../../style/themes/default"; +@import "../../style/mixins/index"; + +@divider-prefix-cls: ~"@{ant-prefix}-divider"; + +.@{divider-prefix-cls} { + .reset-component; + background: @border-color-split; + + &, // for compatiable + &-vertical { + margin: 0 8px; + display: inline-block; + height: 0.9em; + width: 1px; + vertical-align: middle; + position: relative; + top: -0.06em; + } + &-horizontal { + display: block; + height: 1px; + width: 100%; + margin: 24px 0; + } + &-horizontal&-with-text { + display: table; + white-space: nowrap; + text-align: center; + background: transparent; + font-weight: 500; + color: @heading-color; + font-size: @font-size-lg; + margin: 16px 0; + + &:before, + &:after { + content: ''; + display: table-cell; + position: relative; + top: 50%; + width: 50%; + border-top: 1px solid @border-color-split; + transform: translateY(50%); + } + } + + &-inner-text { + display: inline-block; + padding: 0 24px; + } + + &-dashed { + background: none; + border-top: 1px dashed @border-color-split; + } + + &-horizontal&-with-text&-dashed { + border-top: 0; + &:before, + &:after { + border-style: dashed none none; + } + } +} diff --git a/components/index.js b/components/index.js index 451c88b6b..610185856 100644 --- a/components/index.js +++ b/components/index.js @@ -53,3 +53,5 @@ export { default as Card } from './card' import Dropdown from './dropdown' const DropdownButton = Dropdown.Button export { Dropdown, DropdownButton } + +export { default as Divider } from './divider' diff --git a/components/style.js b/components/style.js index e417a51a1..a4554cf93 100644 --- a/components/style.js +++ b/components/style.js @@ -15,3 +15,4 @@ import './popover/style' import './popconfirm/style' import './menu/style' import './dropdown/style' +import './divider/style' diff --git a/contributors.md b/contributors.md index 537d823d1..6666ac201 100644 --- a/contributors.md +++ b/contributors.md @@ -11,6 +11,8 @@ ToolTip | done Popconfirm | done Popover | done Menu | done +Dropdown | done +Divider | done Carousel Mention Input | done |select完成后补全demo @@ -29,7 +31,6 @@ Col Affix Alert BackTop -Dropdown Layout message Modal diff --git a/examples/demo.js b/examples/demo.js index 63a72702f..8c8beddc1 100644 --- a/examples/demo.js +++ b/examples/demo.js @@ -17,4 +17,5 @@ export { default as tabs } from 'antd/tabs/demo/index.vue' export { default as tag } from 'antd/tag/demo/index.vue' export { default as tooltip } from 'antd/tooltip/demo/index.vue' export { default as dropdown } from 'antd/dropdown/demo/index.vue' +export { default as divider } from 'antd/divider/demo/index.vue'