Skip to content

fix: make top nav bar right elements within a nav #63239

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

Open
kristian-zendato wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −9
Open

fix: make top nav bar right elements within a nav #63239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 1 files
+29 −0 .github/dependabot.yml
15 changes: 15 additions & 0 deletions core/css/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,21 @@
flex: 1 0;
}
}

// List wrapper for notifications / contacts / account (and injected entries)
&__items {
display: inline-flex;
align-items: center;
justify-content: flex-end;
list-style: none;
margin: 0;
padding: 0;
}

&__item {
display: flex;
align-items: center;
}
}

// Public layout related headers
Expand Down
6 changes: 4 additions & 2 deletions core/css/mobile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,17 @@
}

@media only screen and (max-width: 480px) {
#header .header-end > div > .menu {
#header .header-end > div > .menu,
#header .header-end__item > div > .menu {
max-width: calc(100vw - 10px);
position: fixed;
&::after {
display: none !important;
}
}
/* Arrow directly child of menutoggle */
#header .header-end > div {
#header .header-end > div,
#header .header-end__item > div {
&.openedMenu {
&::after {
display: block;
Expand Down
1 change: 0 additions & 1 deletion core/src/views/AccountMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<NcHeaderMenu
id="user-menu"
class="account-menu"
is-nav
:aria-label="t('core', 'Settings menu')"
:description="avatarDescription">
<template #trigger>
Expand Down
18 changes: 13 additions & 5 deletions core/templates/layout.user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,19 @@
<div class="header-center">
<div id="unified-search"></div>
</div>
<div class="header-end">
<div id="notifications"></div>
<div id="contactsmenu"></div>
<div id="user-menu"></div>
</div>
<nav class="header-end" aria-label="<?php p($l->t('Header menu')); ?>">
<ul class="header-end__items" role="toolbar">
Comment on lines +78 to +79

@susnux susnux Aug 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

After looking again at the overall structure of the new waffle menu I think there are more problems:

  1. the dashboard link (the logo) should be within the same <nav> as the waffle menu
  2. I do not think the <nav> here makes sense if we use toolbar because this is not a navigation we do not navigate anywhere but we just open menus or other actions.
  3. toolbar still requires custom TAB handling

1 is unrelated to this PR but we should still at some point fix it
2 I guess just use ´

@ShGKme ShGKme Aug 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I agree.

@ShGKme ShGKme Aug 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

What about keeping it a general list? What is the problem with keeping it general buttons? Especially if this is about just 3-4 buttons, not a large menu.

<li class="header-end__item" role="none">
<div id="notifications"></div>
</li>
<li class="header-end__item" role="none">
<div id="contactsmenu"></div>
</li>
<li class="header-end__item" role="none">
<div id="user-menu"></div>
</li>
</ul>
</nav>
</header>

<div id="content" class="app-<?php p($_['appid']) ?>">
Expand Down
Loading