Skip to content
Merged
Changes from 1 commit
Commits
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
35 changes: 22 additions & 13 deletions src/components/Pivot/Pivot.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
@include ms-u-normalize;
font-size: $ms-font-size-m;
font-weight: $ms-font-weight-regular;
position: relative;
color: $ms-color-themePrimary;
white-space: nowrap;
}

.ms-Pivot-links {
Expand All @@ -37,6 +40,10 @@
cursor: pointer;
}

&:focus {
outline: none;
}

// Underline, not yet visible
&::before {
background-color: transparent;
Expand Down Expand Up @@ -77,12 +84,14 @@
}
}



.ms-Fabric.is-focusVisible .ms-Pivot-link {
&:focus {
outline: 1px solid $ms-color-neutralSecondaryAlt;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking--does this clash at all with the implementation below for the tabs component?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. When you use the focus-border mixin for the tabs it cancels this out.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha--thanks!

}
}

// @TODO: Determine if any of the styles below this are necessary anymore.


// Overflow (ellipsis)
.ms-Pivot-link.ms-Pivot-link--overflow {
color: $ms-color-neutralSecondary;
Expand Down Expand Up @@ -133,16 +142,16 @@
}
}


//== Modifier: Tabs
//
.ms-Pivot.ms-Pivot--tabs {

.ms-Pivot-link {
@include focus-border();
height: 40px;
background-color: $ms-color-neutralLighter;
line-height: 40px;
margin-right: -2px; // Remove space next to inline-block element
margin-right: 0px; // Remove space next to inline-block element

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be localized

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

padding: 0 10px;

&:hover:not(.is-selected):not(.ms-Pivot-link--overflow),
Expand Down Expand Up @@ -175,6 +184,14 @@
}
}

.ms-Fabric.is-focusVisible .ms-Pivot.ms-Pivot--tabs .ms-Pivot-link:focus {
&:before {
height: auto;
background: transparent;
transition: none;
}
}

// @TODO: Confirm that this component is not responsive.
//
// @media (min-width: $ms-screen-lg-min) {
Expand All @@ -199,11 +216,3 @@
}
}
}

// TODO: Remove override below.

.ms-Pivot {
position: relative;
color: $ms-color-themePrimary;
white-space: nowrap;
}