diff --git a/src/components/divider/divider.vue b/src/components/divider/divider.vue index 05c05b9..f7c5ce0 100644 --- a/src/components/divider/divider.vue +++ b/src/components/divider/divider.vue @@ -23,9 +23,9 @@ }, orientation: { type: String, - default: 'left', + default: 'center', validator (value) { - return oneOf(value, ['left', 'right']); + return oneOf(value, ['left', 'right', 'center']); } }, dashed: { diff --git a/src/styles/components/divider.less b/src/styles/components/divider.less index be93d98..0139392 100644 --- a/src/styles/components/divider.less +++ b/src/styles/components/divider.less @@ -1,143 +1,96 @@ - - @divider-prefix-cls: ~"@{css-prefix}divider"; -@font-size-base : 14px; -@font-size-lg : @font-size-base + 2px; -@heading-color : fade(#000, 85%); - -.reset-component() { - font-family: @font-family; - font-size: @font-size-base; - line-height: @line-height-base; - color: @text-color; - box-sizing: border-box; - margin: 0; - padding: 0; - list-style: none; -} - .@{divider-prefix-cls} { - .reset-component; - background: @border-color-split; + .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%); + &, // for compatiable + &-vertical { + margin: 0 8px; + display: inline-block; + height: 0.9em; + width: 1px; + vertical-align: middle; + position: relative; + top: -0.06em; } - } - &-inner-text { - display: inline-block; - padding: 0 24px; - } - &-horizontal&-with-text-left { - display: table; - white-space: nowrap; - text-align: center; - background: transparent; - font-weight: 500; - color: @heading-color; - font-size: @font-size-base; - margin: 16px 0; - - &:before { - content: ''; - display: table-cell; - position: relative; - top: 50%; - width: 5%; - border-top: 1px solid @border-color-split; - transform: translateY(50%); + &-horizontal { + display: block; + height: 1px; + width: 100%; + margin: 24px 0; + clear: both; } - &:after { - content: ''; - display: table-cell; - position: relative; - top: 50%; - width: 95%; - border-top: 1px solid @border-color-split; - transform: translateY(50%); + &-horizontal&-with-text-center, + &-horizontal&-with-text-left, + &-horizontal&-with-text-right { + display: table; + white-space: nowrap; + text-align: center; + background: transparent; + font-weight: 500; + color: @title-color; + font-size: @font-size-large; + 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 10px; - } - } - &-horizontal&-with-text-right { - display: table; - white-space: nowrap; - text-align: center; - background: transparent; - font-weight: 500; - color: @heading-color; - font-size: @font-size-base; - margin: 16px 0; + &-horizontal&-with-text-left, + &-horizontal&-with-text-right { + font-size: @font-size-base; + .@{divider-prefix-cls}-inner-text { + display: inline-block; + padding: 0 10px; + } + } - &:before { - content: ''; - display: table-cell; - position: relative; - top: 50%; - width: 95%; - border-top: 1px solid @border-color-split; - transform: translateY(50%); + &-horizontal&-with-text-left { + &:before { + top: 50%; + width: 5%; + } + &:after { + top: 50%; + width: 95%; + } } - &:after { - content: ''; - display: table-cell; - position: relative; - top: 50%; - width: 5%; - border-top: 1px solid @border-color-split; - transform: translateY(50%); + + &-horizontal&-with-text-right { + &:before { + top: 50%; + width: 95%; + } + &:after { + top: 50%; + width: 5%; + } } + &-inner-text { - display: inline-block; - padding: 0 10px; + display: inline-block; + padding: 0 24px; + } + + &-dashed { + background: none; + border-top: 1px dashed @border-color-split; } - } - &-dashed { - background: none; - border-top: 1px dashed @border-color-split; - } - &-horizontal&-with-text&-dashed { - border-top: 0; - &:before, - &:after { - border-style: dashed none none; + &-horizontal&-with-text&-dashed, + &-horizontal&-with-text-left&-dashed, + &-horizontal&-with-text-right&-dashed { + border-top: 0; + &:before, + &:after { + border-style: dashed none none; + } } - } } \ No newline at end of file diff --git a/src/styles/custom.less b/src/styles/custom.less index 954efb9..8839709 100644 --- a/src/styles/custom.less +++ b/src/styles/custom.less @@ -24,6 +24,7 @@ @text-color : #495060; @font-size-base : 14px; @font-size-small : 12px; +@font-size-large : 16px; @line-height-base : 1.5; @line-height-computed : floor((@font-size-base * @line-height-base)); @border-radius-base : 6px; diff --git a/src/styles/mixins/common.less b/src/styles/mixins/common.less index 10de304..ea175c3 100644 --- a/src/styles/mixins/common.less +++ b/src/styles/mixins/common.less @@ -25,3 +25,14 @@ color: @subsidiary-color; transition: all @transition-time @ease-in-out; } + +.reset-component() { + font-family: @font-family; + font-size: @font-size-base; + line-height: @line-height-base; + color: @text-color; + box-sizing: border-box; + margin: 0; + padding: 0; + list-style: none; +} \ No newline at end of file -- libgit2 0.21.4