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

Jump to bottom

refactor(tabs): refactor css vars #1068

Merged
merged 3 commits into from
Jan 8, 2019
Merged

refactor(tabs): refactor css vars #1068

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0130d9
refactor(tabs): refactor css vars
mcoker Dec 5, 2018
b6e25fe
add max-width to tabs list
mcoker Dec 14, 2018
47cd377
separate combined padding values
mcoker Dec 30, 2018
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
110 changes: 36 additions & 74 deletions src/patternfly/components/Tabs/tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
@import "../../patternfly-utilities";

.pf-c-tabs-container {
display: flex;
flex-direction: column;
align-items: flex-start;
}

// Tabs
.pf-c-tabs {
// Primary Tab items
--pf-c-tabs__item--BackgroundColor: var(--pf-global--BackgroundColor--100);
--pf-c-tabs__item--BorderColor: var(--pf-global--BorderColor--light-200);
--pf-c-tabs__item--BorderTopWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__item--BorderRightWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__item--BorderBottomWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__item--BorderLeftWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__item--BorderWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__item--m-current--ZIndex: var(--pf-global--ZIndex--sm);
--pf-c-tabs__item--m-current--Color: var(--pf-global--active-color--100);
--pf-c-tabs__item--m-current--BorderTopWidth: pf-size-prem(2);
--pf-c-tabs__item--m-current--BorderTopWidth: var(--pf-global--BorderWidth--md);

// Secondary Tab items
--pf-c-tabs__item--hover--Color: var(--pf-global--Color--dark-200);
Expand All @@ -30,12 +20,6 @@

// Scroll buttons
--pf-c-tabs__scroll-button--Width: var(--pf-global--spacer--xl);
--pf-c-tabs__scroll-button--BackgroundColor: var(--pf-global--BackgroundColor--100);
--pf-c-tabs__scroll-button--BorderColor: var(--pf-global--BorderColor--light-200);
--pf-c-tabs__scroll-button--BorderTopWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__scroll-button--BorderRightWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__scroll-button--BorderBottomWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__scroll-button--BorderLeftWidth: var(--pf-global--BorderWidth--sm);
--pf-c-tabs__scroll-button--ZIndex: var(--pf-global--ZIndex--md);

position: relative;
Expand Down Expand Up @@ -65,35 +49,19 @@
right: 0;
bottom: 0;
left: 0;
margin-left: var(--pf-c-tabs__item--BorderLeftWidth);
margin-left: var(--pf-c-tabs__item--BorderWidth);
content: "";
border-top: var(--pf-c-tabs__item--m-current--BorderTopWidth) solid var(--pf-c-tabs__item--m-current--Color);
}
}

// Scroll button hover state
&:not(.pf-m-start-current) .pf-c-tabs__scroll-button:nth-of-type(1):hover,
&:not(.pf-m-end-current) .pf-c-tabs__scroll-button:nth-of-type(2):hover {
::after {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
margin-left: var(--pf-c-tabs__item--BorderLeftWidth);
content: "";
border-top: var(--pf-c-tabs__item--m-current--BorderTopWidth) solid var(--pf-c-tabs__item--hover--Color);
}
}

// Primary with secondary tabs style
& + &.pf-m-tabs-secondary,
& + .pf-m-tabs-secondary & {
margin-top: calc(-1 * var(--pf-c-tabs__item--BorderTopWidth));
border-top: var(--pf-c-tabs__item--BorderTopWidth) solid var(--pf-c-tabs__item--BorderColor);
+ &.pf-m-tabs-secondary {
margin-top: calc(-1 * var(--pf-c-tabs__item--BorderWidth));
border-top: var(--pf-c-tabs__item--BorderWidth) solid var(--pf-c-tabs__item--BorderColor);

.pf-c-tabs__scroll-button {
margin-top: calc(-1 * var(--pf-c-tabs__item--BorderTopWidth));
margin-top: calc(-1 * var(--pf-c-tabs__item--BorderWidth));
}
}

Expand Down Expand Up @@ -126,50 +94,28 @@
.pf-c-tabs__list {
position: relative;
display: flex;
max-width: 100%;
overflow-x: auto;
-webkit-overflow-scrolling: touch;

// Right border on last tab
.pf-c-tabs__item:last-of-type .pf-c-tabs__button::before {
border-right-width: var(--pf-c-tabs__item--BorderRightWidth);
border-right-width: var(--pf-c-tabs__item--BorderWidth);
}
}

// Tab items
.pf-c-tabs__item {
flex: none;

// Tab button
.pf-c-tabs__button {
position: relative;
padding-top: var(--pf-c-tabs__button--PaddingTop);
padding-right: var(--pf-c-tabs__button--PaddingRight);
padding-bottom: var(--pf-c-tabs__button--PaddingBottom);
padding-left: var(--pf-c-tabs__button--PaddingLeft);
user-select: none;
border: initial;

// Tab button borders
&::before {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
content: "";
border: solid var(--pf-c-tabs__item--BorderColor);
border-width: var(--pf-c-tabs__item--BorderTopWidth) 0 var(--pf-c-tabs__item--BorderBottomWidth) var(--pf-c-tabs__item--BorderLeftWidth);
}
}

// Tab item hover state
&:not(.pf-m-current):hover .pf-c-tabs__button::after {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
margin-left: var(--pf-c-tabs__item--BorderLeftWidth);
margin-left: var(--pf-c-tabs__item--BorderWidth);
content: "";
border-top: var(--pf-c-tabs__item--m-current--BorderTopWidth) solid var(--pf-c-tabs__item--hover--Color);
}
Expand All @@ -189,21 +135,17 @@
right: 0;
bottom: 0;
left: 0;
margin-left: var(--pf-c-tabs__item--BorderLeftWidth);
margin-left: var(--pf-c-tabs__item--BorderWidth);
content: "";
border-top: var(--pf-c-tabs__item--m-current--BorderTopWidth) solid var(--pf-c-tabs__item--m-current--Color);
}
}

// Secondary tab states
.pf-m-tabs-secondary & .pf-c-tabs__button {
// Remove current state
// Remove current state and hover state
&::before,
&::after {
content: none;
}

// Remove hover state
&::after,
&:hover::after {
content: none;
}
Expand All @@ -215,6 +157,27 @@
}
}


// Tab button
.pf-c-tabs__button {
position: relative;
padding: var(--pf-c-tabs__button--PaddingTop) var(--pf-c-tabs__button--PaddingRight) var(--pf-c-tabs__button--PaddingBottom) var(--pf-c-tabs__button--PaddingLeft);
user-select: none;
border: 0;

// Tab button borders
&::before {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
content: "";
border: solid var(--pf-c-tabs__item--BorderColor);
border-width: var(--pf-c-tabs__item--BorderWidth) 0 var(--pf-c-tabs__item--BorderWidth) var(--pf-c-tabs__item--BorderWidth);
}
}

.pf-c-tabs__scroll-item {
position: absolute;
top: 0;
Expand All @@ -238,7 +201,7 @@
z-index: var(--pf-c-tabs__scroll-button--ZIndex);
width: var(--pf-c-tabs__scroll-button--Width);
line-height: 1;
background-color: var(--pf-c-tabs__scroll-button--BackgroundColor);
background-color: var(--pf-c-tabs__item--BackgroundColor);
border: initial;

// Align right scroll button
Expand All @@ -254,8 +217,7 @@
bottom: 0;
left: 0;
content: "";
border: solid var(--pf-c-tabs__scroll-button--BorderColor);
border-width: var(--pf-c-tabs__scroll-button--BorderTopWidth) var(--pf-c-tabs__scroll-button--BorderRightWidth) var(--pf-c-tabs__scroll-button--BorderBottomWidth) var(--pf-c-tabs__scroll-button--BorderLeftWidth);
border: var(--pf-c-tabs__item--BorderWidth) solid var(--pf-c-tabs__item--BorderColor);
}

// Scroll button hover state
Expand Down