Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Tabs): update scrollable container tabs selectors #7184

Merged
merged 2 commits into from
Oct 30, 2020
Merged

fix(Tabs): update scrollable container tabs selectors #7184

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29ce52e
fix(Tabs): update scrollable container tabs selectors
emyarod Oct 30, 2020
c15233b
Merge branch 'master' into 7183-container-tabs-selectors
joshblack Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions packages/components/src/components/tabs/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@
min-height: rem(40px);
color: $text-01;

.#{$prefix}--tabs--scrollable--container {
&.#{$prefix}--tabs--scrollable--container {
min-height: rem(48px);
}

Expand Down Expand Up @@ -493,12 +493,12 @@
background-image: linear-gradient(to right, transparent, $ui-01);
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs__overflow-indicator--left {
background-image: linear-gradient(to left, transparent, $ui-03);
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs__overflow-indicator--right {
background-image: linear-gradient(to right, transparent, $ui-03);
}
Expand Down Expand Up @@ -526,11 +526,12 @@
);
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs__overflow-indicator--left {
background-image: linear-gradient(to left, rgba($ui-03, 0), $ui-03);
}
.#{$prefix}--tabs--scrollable--container

&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs__overflow-indicator--right {
background-image: linear-gradient(to right, rgba($ui-03, 0), $ui-03);
}
Expand All @@ -555,7 +556,7 @@
display: none;
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tab--overflow-nav-button {
width: $carbon--spacing-09;
margin: 0;
Expand Down Expand Up @@ -584,23 +585,23 @@
margin-left: rem(1px);
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item {
background-color: $ui-03;
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item
+ .#{$prefix}--tabs--scrollable__nav-item {
margin-left: 0;
// Draws the border without affecting the inner-content
box-shadow: rem(-1px) 0 0 0 $ui-04;
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item
+ .#{$prefix}--tabs--scrollable__nav-item.#{$prefix}--tabs--scrollable__nav-item--selected,
.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item.#{$prefix}--tabs--scrollable__nav-item--selected
+ .#{$prefix}--tabs--scrollable__nav-item {
box-shadow: none;
Expand All @@ -616,7 +617,7 @@
//-----------------------------
// Item Hover
//-----------------------------
.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item:hover {
background-color: $hover-selected-ui;
}
Expand All @@ -631,9 +632,9 @@
cursor: not-allowed;
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item.#{$prefix}--tabs--scrollable__nav-item--disabled,
.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item.#{$prefix}--tabs--scrollable__nav-item--disabled:hover {
background-color: $disabled-02;
}
Expand All @@ -657,9 +658,9 @@
border-bottom: 2px solid $interactive-04;
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item--selected,
.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item--selected:hover {
background-color: $ui-01;

Expand All @@ -669,7 +670,7 @@
}
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item--selected
.#{$prefix}--tabs--scrollable__nav-link {
// height - vertical padding
Expand All @@ -678,9 +679,9 @@
box-shadow: inset 0 2px 0 0 $interactive-04;
}

.#{$prefix}--tabs--scrollable--light.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--light.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item--selected,
.#{$prefix}--tabs--scrollable--light.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--light.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item--selected:hover {
background-color: $ui-background;
}
Expand Down Expand Up @@ -711,7 +712,7 @@
}
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-link {
height: rem(48px);
padding: $spacing-03 $spacing-05;
Expand All @@ -729,7 +730,7 @@
border-bottom: $tab-underline-color-hover;
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item
.#{$prefix}--tabs--scrollable__nav-link {
border-bottom: none;
Expand Down Expand Up @@ -781,7 +782,7 @@
border-bottom-color: $ui-03;
}

.#{$prefix}--tabs--scrollable--container
&.#{$prefix}--tabs--scrollable--container
.#{$prefix}--tabs--scrollable__nav-item--disabled
.#{$prefix}--tabs--scrollable__nav-link {
color: $disabled-03;
Expand Down