Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions core/css/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,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
5 changes: 3 additions & 2 deletions core/css/mobile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,16 @@
}

@media only screen and (max-width: 480px) {
#header .header-end > div > .menu {
#header .header-end .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
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ function clearAndCloseSearch() {
inset-inline: 0;
}
// Hide all other entries, especially the user menu as it might leak pixels
:global(.header-end:has(.local-unified-search--open) > :not(.unified-search-menu)) {
:global(.header-end:has(.local-unified-search--open) > :not(.unified-search-menu)),
:global(.header-end:has(.local-unified-search--open) .header-end__item:not(:has(.local-unified-search--open))) {
display: none;
}
}
Expand Down
18 changes: 13 additions & 5 deletions core/templates/layout.user.php
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('User menu')); ?>">

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.

Thats not the user menu, the user menu is the one on the very end.
This navigation should have a different label

Also the content within must have proper roles.

  • ul needs role = menubar
  • li needs role = none
  • button within need role = menuitem -> this needs to be fixed in NcHeaderButton

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

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