Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-08-15 07:01:52 +08:00
26 changed files with 203 additions and 144 deletions
+1 -2
View File
@@ -204,11 +204,10 @@ export default createComponent({
const title = titleRefs[this.currentIndex].$el;
const { lineWidth, lineHeight } = this;
const width = isDef(lineWidth) ? lineWidth : title.offsetWidth / 2;
const left = title.offsetLeft + title.offsetWidth / 2;
const lineStyle = {
width: addUnit(width),
width: addUnit(lineWidth),
backgroundColor: this.color,
transform: `translateX(${left}px) translateX(-50%)`,
};
+2
View File
@@ -10,6 +10,7 @@
padding: 0 @padding-base;
color: @tab-text-color;
font-size: @tab-font-size;
line-height: @tab-line-height;
cursor: pointer;
&--active {
@@ -118,6 +119,7 @@
bottom: 15px;
left: 0;
z-index: 1;
width: @tabs-bottom-bar-width;
height: @tabs-bottom-bar-height;
background-color: @tabs-bottom-bar-color;
border-radius: @tabs-bottom-bar-height;