Skip to content

Commit ec4ab84

Browse files
committed
fix: CSS fix to properly highlight the correct active page / link in the Nav; improve dropdown open / close animation
1 parent 26c4ced commit ec4ab84

3 files changed

Lines changed: 30 additions & 18 deletions

File tree

packages/uikit-workshop/src/sass/scss/01-abstracts/_mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
@mixin accordionPanel() {
7474
overflow: hidden;
7575
max-height: 0;
76-
transition: max-height $pl-animate-quick ease-out;
76+
transition: all $pl-animate-quick ease-out;
7777

7878
/**
7979
* Active styles for when the accordion panel is open

packages/uikit-workshop/src/sass/scss/05-themes/_light-theme.scss

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,6 @@
4545
}
4646
}
4747

48-
/**
49-
* All Nav links inside of subnav dropdown
50-
*/
51-
52-
/**
53-
* Last sublist item
54-
*/
55-
.pl-c-nav__sublist > .pl-c-nav__item:last-child .pl-c-nav__link {
56-
@media all and (min-width: $pl-bp-med) {
57-
border-bottom-left-radius: $pl-border-radius-med;
58-
border-bottom-right-radius: $pl-border-radius-med;
59-
}
60-
}
61-
6248
/**
6349
* Size input
6450
*/

packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.scss

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,23 @@ pl-nav {
198198
.pl-c-body--theme-sidebar & {
199199
width: 100%;
200200
}
201+
202+
&:not(.pl-c-nav__link--title).pl-is-active {
203+
box-shadow: inset 4px 0 0 #6c79d9;
204+
205+
// move the "active" border style to the bottom on ONLY the top level links (ex. "All")
206+
@media all and (min-width: $pl-bp-med) {
207+
&.pl-c-nav__link--pattern {
208+
.pl-c-body--theme-horizontal & {
209+
box-shadow: inset 0 -4px 0 #6c79d9;
210+
}
211+
212+
.pl-c-nav__sublist & {
213+
box-shadow: inset 4px 0 0 #6c79d9;
214+
}
215+
}
216+
}
217+
}
201218
}
202219

203220
.pl-c-nav__link,
@@ -244,7 +261,6 @@ pl-nav {
244261

245262
&.pl-is-active {
246263
box-shadow: inset 4px 0 0 #6c79d9;
247-
pointer-events: none;
248264
}
249265
}
250266

@@ -257,9 +273,16 @@ pl-nav {
257273
}
258274

259275
.pl-c-nav__link--pattern {
260-
padding-left: 0.75rem;
276+
padding-left: 1.45rem;
261277
padding-right: 0.75rem;
262278
flex-grow: 1;
279+
font-size: .8rem;
280+
281+
@media all and (min-width: $pl-bp-med) {
282+
.pl-c-body--theme-horizontal & {
283+
padding-left: 0.75rem;
284+
}
285+
}
263286
}
264287

265288
.pl-c-nav__link-text {
@@ -306,8 +329,9 @@ pl-nav {
306329
border-width: 1px;
307330
box-shadow: 0 2px 5px rgba(0,0,0,.1);
308331
transition: all .2s ease;
309-
transform: translateY(12px);
332+
transform: translateY(-12px);
310333
z-index: 1;
334+
transition: all $pl-animate-quick ease-out;
311335

312336
.pl-c-body--theme-sidebar & {
313337
border-width: 0;
@@ -333,6 +357,7 @@ pl-nav {
333357
@include listReset();
334358
@include accordionPanel();
335359
visibility: hidden;
360+
opacity: 0;
336361

337362
@media all and (min-width: $pl-bp-med) {
338363
.pl-c-body--theme-sidebar & {
@@ -558,6 +583,7 @@ pl-nav {
558583
visibility: visible;
559584
max-height: none;
560585
transform: translateY(0);
586+
opacity: 1;
561587

562588
.pl-c-body--theme-horizontal & {
563589
overflow: auto;

0 commit comments

Comments
 (0)