Skip to content

Commit c7a0cbc

Browse files
committed
fix(BaseNavigation): menu item buttons not centered
See: FE-109
1 parent 8eace4b commit c7a0cbc

File tree

2 files changed

+40
-35
lines changed

2 files changed

+40
-35
lines changed

frontend/.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"conventionalCommits.scopes": [
3+
"BaseNavigation",
34
"BaseNavigationLeft",
45
"BcButton",
56
"BcDataWrapper",
@@ -86,7 +87,7 @@
8687
"useStripeProvider",
8788
"useWindowSize",
8889
"variables.scss",
89-
"vscode"
90+
"vscode"
9091
],
9192
"editor.codeActionsOnSave": {
9293
"source.fixAll.eslint": "always"

frontend/layers/base/app/components/BaseNavigation.vue

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,30 @@ const v1Domain = useV1Domain()
2020

2121
<template>
2222
<nav class="p-2xl">
23-
<div class="max-w-8xl mx-auto grid grid-cols-[auto_1fr_auto] gap-2xl items-center">
24-
<BaseButtonIcon
25-
screenreader-text="base.common.open_navigation"
26-
class="sm:hidden"
27-
name="menu-2"
28-
variant="secondary"
29-
@click="handleClick"
30-
/>
31-
<NuxtLink
32-
to="/"
33-
class="flex gap-sm p-md rounded-full focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand-300 w-fit"
34-
>
35-
<BaseScreenreaderOnly screenreader-text="base.beaconchain_homepage" />
36-
<TheLogoMark
37-
width="1.25rem"
38-
class="aspect-square"
23+
<div class="max-w-8xl mx-auto grid gap-2xl [&>*]:[grid-area:1/1]">
24+
<span class="flex gap-2xl items-center">
25+
<BaseButtonIcon
26+
screenreader-text="base.common.open_navigation"
27+
class="sm:hidden"
28+
name="menu-2"
29+
variant="secondary"
30+
@click="handleClick"
3931
/>
40-
<TheLogoType
41-
class="hidden md:inline"
42-
width="6.25rem"
43-
/>
44-
</NuxtLink>
32+
<NuxtLink
33+
to="/"
34+
class="flex gap-sm p-md rounded-full focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand-300 w-fit"
35+
>
36+
<BaseScreenreaderOnly screenreader-text="base.beaconchain_homepage" />
37+
<TheLogoMark
38+
width="1.25rem"
39+
class="aspect-square"
40+
/>
41+
<TheLogoType
42+
class="hidden md:inline"
43+
width="6.25rem"
44+
/>
45+
</NuxtLink>
46+
</span>
4547
<ul class="hidden sm:flex gap-xl justify-center">
4648
<li
4749
v-for="{ icon, label, to } in items"
@@ -54,19 +56,21 @@ const v1Domain = useV1Domain()
5456
/>
5557
</li>
5658
</ul>
57-
<BaseButtonIcon
58-
v-if="hasSession"
59-
variant="secondary"
60-
screenreader-text="base.action.open_user_menu"
61-
name="user"
62-
@click="navigateTo(`${v1Domain}/user/settings`, { external: true })"
63-
/>
64-
<BaseButton
65-
v-else
66-
@click="navigateToV1Login"
67-
>
68-
{{ $t('base.common.log_in') }}
69-
</BaseButton>
59+
<span class="justify-self-end">
60+
<BaseButtonIcon
61+
v-if="hasSession"
62+
variant="secondary"
63+
screenreader-text="base.action.open_user_menu"
64+
name="user"
65+
@click="navigateTo(`${v1Domain}/user/settings`, { external: true })"
66+
/>
67+
<BaseButton
68+
v-else
69+
@click="navigateToV1Login"
70+
>
71+
{{ $t('base.common.log_in') }}
72+
</BaseButton>
73+
</span>
7074
</div>
7175
</nav>
7276
</template>

0 commit comments

Comments
 (0)