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

UnderlineNav bug fix #2047

Merged
merged 4 commits into from
Apr 28, 2022
Merged

UnderlineNav bug fix #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbe1cf4
fix selector (bad merge?)
langermank Apr 28, 2022
03a9cc2
Create ninety-bobcats-do.md
langermank Apr 28, 2022
186f008
lint
langermank Apr 28, 2022
27016ea
Merge branch 'pcss20-patch' of https://github.com/primer/css into pcs…
langermank Apr 28, 2022
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
5 changes: 5 additions & 0 deletions .changeset/ninety-bobcats-do.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/css": major
---

UnderlineNav bug fix
99 changes: 49 additions & 50 deletions src/navigation/underline-nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// stylelint-disable selector-max-specificity
$nav-height: $spacer-3 * 3 !default; // 48px

.UnderlineNav {
Expand All @@ -10,6 +9,17 @@ $nav-height: $spacer-3 * 3 !default; // 48px
box-shadow: inset 0 -1px 0 var(--color-border-muted);
-webkit-overflow-scrolling: auto;
justify-content: space-between;

.Counter {
margin-left: $spacer-2;
color: var(--color-fg-default);
background-color: var(--color-neutral-muted);

&--primary {
color: var(--color-fg-on-emphasis);
background-color: var(--color-neutral-emphasis);
}
}
}

.UnderlineNav-body {
Expand Down Expand Up @@ -41,65 +51,54 @@ $nav-height: $spacer-3 * 3 !default; // 48px
color: var(--color-fg-default);
text-decoration: none;
border-bottom-color: var(--color-neutral-muted);
outline-offset: -8px;
outline-offset: -2px;
transition: border-bottom-color 0.12s ease-out;
}

// renders a visibly hidden "copy" of the label in bold, reserving box space for when label becomes bold on selected
[data-content]::before {
display: block;
height: 0;
font-weight: $font-weight-bold;
visibility: hidden;
content: attr(data-content);
}

// increase touch target area
&::before {
@include minTouchTarget($min-height: $nav-height);
}
// renders a visibly hidden "copy" of the label in bold, reserving box space for when label becomes bold on selected
[data-content]::before {
display: block;
height: 0;
font-weight: $font-weight-bold;
visibility: hidden;
content: attr(data-content);
}

// hover state was "sticking" on mobile after click
@media (pointer: fine) {
&:hover {
color: var(--color-fg-default);
text-decoration: none;
background: var(--color-action-list-item-default-hover-bg);
transition: background 0.12s ease-out;
}
}
// increase touch target area
&::before {
@include minTouchTarget($min-height: $nav-height);
}

&.selected,
&[role='tab'][aria-selected='true'],
&[aria-current]:not([aria-current='false']) {
font-weight: $font-weight-bold;
// hover state was "sticking" on mobile after click
@media (pointer: fine) {
&:hover {
color: var(--color-fg-default);
border-bottom-color: var(--color-primer-border-active);
outline-offset: -8px;

// current/selected underline
&::after {
position: absolute;
right: 50%;
// 48px total height / 2 (24px) + 1px
bottom: calc(50% - 25px);
width: 100%;
height: 2px;
content: '';
background: var(--color-primer-border-active);
border-radius: $border-radius;
transform: translate(50%, -50%);
}
text-decoration: none;
background: var(--color-action-list-item-default-hover-bg);
transition: background 0.12s ease-out;
}
}

.Counter {
margin-left: $spacer-2;
&.selected,
&[role='tab'][aria-selected='true'],
&[aria-current]:not([aria-current='false']) {
font-weight: $font-weight-bold;
color: var(--color-fg-default);
background-color: var(--color-neutral-muted);
border-bottom-color: var(--color-primer-border-active);
outline-offset: -8px;

&--primary {
color: var(--color-fg-on-emphasis);
background-color: var(--color-neutral-emphasis);
// current/selected underline
&::after {
position: absolute;
right: 50%;
// 48px total height / 2 (24px) + 1px
bottom: calc(50% - 25px);
width: 100%;
height: 2px;
content: '';
background: var(--color-primer-border-active);
border-radius: $border-radius;
transform: translate(50%, -50%);
}
}
}
Expand Down