Skip to content

Commit

Permalink
fix: tabs inkbar border lost
Browse files Browse the repository at this point in the history
  • Loading branch information
xrkffgg committed Jun 1, 2020
1 parent 03fad91 commit 9c3faa8
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
14 changes: 7 additions & 7 deletions components/tabs/style/card.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@import './index';

.@{tab-prefix-cls}-card {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
margin: 0;
padding: @tabs-card-horizontal-padding;
Expand All @@ -25,15 +25,15 @@
// ========================== Top & Bottom ==========================
&.@{tab-prefix-cls}-top,
&.@{tab-prefix-cls}-bottom {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab:not(:last-of-type) {
margin-right: @tabs-card-gutter;
}
}
}

&.@{tab-prefix-cls}-top {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
border-radius: @border-radius-base @border-radius-base 0 0;

Expand All @@ -44,7 +44,7 @@
}
}
&.@{tab-prefix-cls}-bottom {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
border-radius: 0 0 @border-radius-base @border-radius-base;

Expand All @@ -58,15 +58,15 @@
// ========================== Left & Right ==========================
&.@{tab-prefix-cls}-left,
&.@{tab-prefix-cls}-right {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab:not(:last-of-type) {
margin-bottom: @tabs-card-gutter;
}
}
}

&.@{tab-prefix-cls}-left {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
border-radius: @border-radius-base 0 0 @border-radius-base;

Expand All @@ -77,7 +77,7 @@
}
}
&.@{tab-prefix-cls}-right {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
border-radius: 0 @border-radius-base @border-radius-base 0;

Expand Down
2 changes: 1 addition & 1 deletion components/tabs/style/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
overflow: hidden;

// ========================== Navigation ==========================
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
position: relative;
display: flex;
flex: none;
Expand Down
22 changes: 11 additions & 11 deletions components/tabs/style/position.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
&-bottom {
flex-direction: column;

> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
margin: @tabs-bar-margin;

&::before {
Expand Down Expand Up @@ -54,7 +54,7 @@
}

&-top {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
&::before {
bottom: 0;
}
Expand All @@ -66,7 +66,7 @@
}

&-bottom {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
order: 1;
margin-top: @margin-md;
margin-bottom: 0;
Expand All @@ -80,15 +80,15 @@
}
}

> .@{tab-prefix-cls}-content-holder {
.@{tab-prefix-cls}-content-holder {
order: 0;
}
}

// ========================== Left & Right ==========================
&-left,
&-right {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
flex-direction: column;
min-width: 50px;

Expand Down Expand Up @@ -148,37 +148,37 @@
}

&-left {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-ink-bar {
right: 0;
}
}

> .@{tab-prefix-cls}-content-holder {
.@{tab-prefix-cls}-content-holder {
margin-left: -@border-width-base;
border-left: @border-width-base @border-style-base @border-color-split;

> .@{tab-prefix-cls}-content > .@{tab-prefix-cls}-tabpane {
.@{tab-prefix-cls}-content > .@{tab-prefix-cls}-tabpane {
padding-left: @padding-lg;
}
}
}

&-right {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
order: 1;

.@{tab-prefix-cls}-ink-bar {
left: 0;
}
}

> .@{tab-prefix-cls}-content-holder {
.@{tab-prefix-cls}-content-holder {
order: 0;
margin-right: -@border-width-base;
border-right: @border-width-base @border-style-base @border-color-split;

> .@{tab-prefix-cls}-content > .@{tab-prefix-cls}-tabpane {
.@{tab-prefix-cls}-content > .@{tab-prefix-cls}-tabpane {
padding-right: @padding-lg;
}
}
Expand Down
12 changes: 6 additions & 6 deletions components/tabs/style/rtl.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.@{tab-prefix-cls}-rtl {
direction: rtl;

> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
margin: @tabs-horizontal-margin-rtl;

Expand All @@ -30,19 +30,19 @@
}

&.@{tab-prefix-cls}-left {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
order: 1;
}
> .@{tab-prefix-cls}-content-holder {
.@{tab-prefix-cls}-content-holder {
order: 0;
}
}

&.@{tab-prefix-cls}-right {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
order: 0;
}
> .@{tab-prefix-cls}-content-holder {
.@{tab-prefix-cls}-content-holder {
order: 1;
}
}
Expand All @@ -51,7 +51,7 @@
&.@{tab-prefix-cls}-card {
&.@{tab-prefix-cls}-top,
&.@{tab-prefix-cls}-bottom {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
button.@{tab-prefix-cls}-tab:not(:last-of-type) {
margin: 0 0 0 @tabs-card-gutter;
}
Expand Down
8 changes: 4 additions & 4 deletions components/tabs/style/size.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.@{tab-prefix-cls} {
&-small {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
padding: @tabs-horizontal-padding-sm;
font-size: @tabs-title-font-size-sm;
Expand All @@ -13,7 +13,7 @@
}

&-large {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
padding: @tabs-horizontal-padding-lg;
font-size: @tabs-title-font-size-lg;
Expand All @@ -23,15 +23,15 @@

&-card {
&.@{tab-prefix-cls}-small {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
padding: @tabs-card-horizontal-padding-sm;
}
}
}

&.@{tab-prefix-cls}-large {
> .@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-nav {
.@{tab-prefix-cls}-tab {
padding: @tabs-card-horizontal-padding-lg;
}
Expand Down

0 comments on commit 9c3faa8

Please sign in to comment.