Skip to content

Commit 327f25e

Browse files
authored
fix(navigation): final minor fixes (#2081)
1 parent c8930e8 commit 327f25e

File tree

3 files changed

+53
-22
lines changed

3 files changed

+53
-22
lines changed

.changeset/young-views-join.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@stackoverflow/stacks": patch
3+
---
4+
5+
Navigation: adjust margin top of navigation title

packages/stacks-classic/lib/components/navigation/navigation.less

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
--_na-item-fs: unset;
99
--_na-item-p: calc(var(--su12) - var(--su1)) var(--su16);
1010
--_na-item-ws: nowrap;
11-
--_na-item-bg-hover: var(--black-150);
11+
--_na-item-bg-hover: var(--black-100);
1212
--_na-item-fc-hover: var(--_na-item-fc);
1313
--_na-item-selected-bg: none;
1414
--_na-item-selected-fc: var(--black-600);
1515
--_na-item-selected-bg-hover: var(--_na-item-bg-hover);
1616
--_na-item-selected-h: var(--su-static2);
1717
--_na-item-text-ta: center;
18-
--_na-title-mt: var(--su16);
18+
--_na-title-mt: var(--su24);
1919
--_na-after-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12'%3E%3Cpath d='M11.35 4.35 6 9.71.65 4.35l.7-.7L6 8.29l4.65-4.64z'/%3E%3C/svg%3E");
2020
--_na-after-bg-color: var(--black-400);
2121

@@ -149,10 +149,14 @@
149149
--_na-title-mt: 0;
150150
}
151151

152+
& .s-btn {
153+
color: var(--black-400);
154+
}
155+
152156
margin-top: var(--_na-title-mt);
153157
font-size: var(--fs-fine);
154158
color: var(--black-400);
155-
padding: var(--su16) var(--su8);
159+
padding: calc(var(--su16) + var(--su2)) var(--su8);
156160
}
157161

158162
& &--icon {

packages/stacks-svelte/src/components/Navigation/Navigation.stories.svelte

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
IconHomeFill,
2424
IconJobs,
2525
IconJobsFill,
26-
IconChevron16Up,
26+
IconChevronUp,
2727
IconQuestion,
2828
IconQuestionFill,
2929
IconChallenge,
@@ -40,6 +40,7 @@
4040
IconHelpFill,
4141
IconStar,
4242
IconStarFill,
43+
IconCompose,
4344
} from "@stackoverflow/stacks-icons/icons";
4445
const { Story } = defineMeta({
4546
title: "Components/Navigation",
@@ -342,29 +343,50 @@
342343
(item) => item.group === group
343344
)}
344345
{@const isCollapsed = tCollapsed[group]}
345-
<NavigationTitle title={group} class="bc-black-200 bt ps-relative">
346+
{@const selectedItem = groupItems.find(
347+
(item) => tSelected === item.text
348+
)}
349+
<NavigationTitle
350+
title={group}
351+
class={`bc-black-200 bt ps-relative ${isCollapsed && !selectedItem ? "mbn24" : ""}`}
352+
>
346353
{#snippet trailing()}
347-
<Button
348-
class="ps-absolute r0"
349-
size="xs"
350-
weight="clear"
351-
onclick={() => (tCollapsed[group] = !tCollapsed[group])}
352-
aria-label={`${isCollapsed ? "Expand" : "Collapse"} ${group} Section`}
353-
>
354-
<span
355-
style:display="inline-block"
356-
style:transform="rotate({isCollapsed ? 180 : 0}deg)"
357-
style:transition="transform 0.2s ease"
354+
<div class="ps-absolute r0 as-center d-flex ai-center">
355+
{#if !isCollapsed && group === "Resources"}
356+
<Button
357+
class="p6"
358+
weight="clear"
359+
aria-label="Edit Section"
360+
>
361+
<Icon src={IconCompose} />
362+
</Button>
363+
{/if}
364+
{#if isCollapsed && groupItems.some((i) => i.activity)}
365+
<ActivityIndicator
366+
label="There is one or more activity in this section"
367+
/>
368+
{/if}
369+
<Button
370+
class="p6"
371+
weight="clear"
372+
onclick={() =>
373+
(tCollapsed[group] = !tCollapsed[group])}
374+
aria-label={`${isCollapsed ? "Expand" : "Collapse"} ${group} Section`}
358375
>
359-
<Icon src={IconChevron16Up} />
360-
</span>
361-
</Button>
376+
<span
377+
style:display="inline-block"
378+
style:transform="rotate({isCollapsed
379+
? 180
380+
: 0}deg)"
381+
style:transition="transform 0.2s ease"
382+
>
383+
<Icon src={IconChevronUp} />
384+
</span>
385+
</Button>
386+
</div>
362387
{/snippet}
363388
</NavigationTitle>
364389

365-
{@const selectedItem = groupItems.find(
366-
(item) => tSelected === item.text
367-
)}
368390
{@const selectedIndex = groupItems.findIndex(
369391
(item) => tSelected === item.text
370392
)}

0 commit comments

Comments
 (0)