-
-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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)) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you drop this? The local search bar is Deck-only and Deck already replaced it with its own filter input, so it's getting removed from the header anyway. No point patching selectors on it. |
||
| :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; | ||
| } | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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')); ?>"> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. Also the content within must have proper roles.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @susnux The user menu is already in
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's the issue though: wrapping it means nav inside nav. Fine to have the outer one, but then AccountMenu shouldn't set |
||
| <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']) ?>"> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dropping to a descendant selector means any nested
.menuin the header matches now, not just the toggle's own. Can you do the same two-selector thing as below?