drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update Divider style

Browse source
This commit is contained in:
梁灏 2018-06-20 11:47:36 +08:00
parent e9ad2b7a94
commit a0141266d4
4 changed files with 95 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/divider/divider.vue
View file

@ -23,9 +23,9 @@
}, },
orientation: { orientation: {
type: String, type: String,
default: 'left', default: 'center',
validator (value) { validator (value) {
return oneOf(value, ['left', 'right']); return oneOf(value, ['left', 'right', 'center']);
} }
}, },
dashed: { dashed: {

209
src/styles/components/divider.less
View file

@ -1,143 +1,96 @@
@divider-prefix-cls: ~"@{css-prefix}divider"; @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} { .@{divider-prefix-cls} {
.reset-component; .reset-component;
background: @border-color-split; background: @border-color-split;
&, // for compatiable &, // for compatiable
&-vertical { &-vertical {
margin: 0 8px; margin: 0 8px;
display: inline-block; display: inline-block;
height: 0.9em; height: 0.9em;
width: 1px; width: 1px;
vertical-align: middle; vertical-align: middle;
position: relative; position: relative;
top: -0.06em; top: -0.06em;
} }
&-horizontal { &-horizontal {
display: block; display: block;
height: 1px; height: 1px;
width: 100%; width: 100%;
margin: 24px 0; margin: 24px 0;
} clear: both;
&-horizontal&-with-text { }
display: table; &-horizontal&-with-text-center,
white-space: nowrap; &-horizontal&-with-text-left,
text-align: center; &-horizontal&-with-text-right {
background: transparent; display: table;
font-weight: 500; white-space: nowrap;
color: @heading-color; text-align: center;
font-size: @font-size-lg; background: transparent;
margin: 16px 0; 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%);
}
}
&:before, &-horizontal&-with-text-left,
&:after { &-horizontal&-with-text-right {
content: ''; font-size: @font-size-base;
display: table-cell; .@{divider-prefix-cls}-inner-text {
position: relative; display: inline-block;
top: 50%; padding: 0 10px;
width: 50%; }
border-top: 1px solid @border-color-split;
transform: translateY(50%);
} }
}
&-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 { &-horizontal&-with-text-left {
content: ''; &:before {
display: table-cell; top: 50%;
position: relative; width: 5%;
top: 50%; }
width: 5%; &:after {
border-top: 1px solid @border-color-split; top: 50%;
transform: translateY(50%); width: 95%;
}
} }
&:after {
content: ''; &-horizontal&-with-text-right {
display: table-cell; &:before {
position: relative; top: 50%;
top: 50%; width: 95%;
width: 95%; }
border-top: 1px solid @border-color-split; &:after {
transform: translateY(50%); top: 50%;
width: 5%;
}
} }
&-inner-text { &-inner-text {
display: inline-block; display: inline-block;
padding: 0 10px; padding: 0 24px;
} }
}
&-horizontal&-with-text-right { &-dashed {
display: table; background: none;
white-space: nowrap; border-top: 1px dashed @border-color-split;
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: 95%;
border-top: 1px solid @border-color-split;
transform: translateY(50%);
} }
&:after { &-horizontal&-with-text&-dashed,
content: ''; &-horizontal&-with-text-left&-dashed,
display: table-cell; &-horizontal&-with-text-right&-dashed {
position: relative; border-top: 0;
top: 50%; &:before,
width: 5%; &:after {
border-top: 1px solid @border-color-split; border-style: dashed none none;
transform: translateY(50%); }
} }
&-inner-text {
display: inline-block;
padding: 0 10px;
}
}
&-dashed {
background: none;
border-top: 1px dashed @border-color-split;
}
&-horizontal&-with-text&-dashed {
border-top: 0;
&:before,
&:after {
border-style: dashed none none;
}
}
} }

1
src/styles/custom.less
View file

@ -24,6 +24,7 @@
@text-color : #495060; @text-color : #495060;
@font-size-base : 14px; @font-size-base : 14px;
@font-size-small : 12px; @font-size-small : 12px;
@font-size-large : 16px;
@line-height-base : 1.5; @line-height-base : 1.5;
@line-height-computed : floor((@font-size-base * @line-height-base)); @line-height-computed : floor((@font-size-base * @line-height-base));
@border-radius-base : 6px; @border-radius-base : 6px;

11
src/styles/mixins/common.less
View file

@ -25,3 +25,14 @@
color: @subsidiary-color; color: @subsidiary-color;
transition: all @transition-time @ease-in-out; 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;
}