borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace <menu> by <nav> for left menu

Browse Source
This commit is contained in:
Chocobozzz 2023-10-06 10:45:42 +02:00
parent 7938f1d5e6
commit 2861397f9d
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/menu/menu.component.html
View File

@ -1,5 +1,5 @@
<div class="menu-wrapper"> <div class="menu-wrapper">
<menu [ngClass]="{ 'is-logged-in': isLoggedIn }"> <nav [ngClass]="{ 'is-logged-in': isLoggedIn }">
<div class="top-menu"> <div class="top-menu">
<div *ngIf="isLoggedIn" class="logged-in-block"> <div *ngIf="isLoggedIn" class="logged-in-block">
<div> <div>
@ -156,7 +156,7 @@
</div> </div>
</div> </div>
</div> </div>
</menu> </nav>
</div> </div>
<my-language-chooser #languageChooserModal></my-language-chooser> <my-language-chooser #languageChooserModal></my-language-chooser>

4
client/src/app/menu/menu.component.scss
View File

@ -50,7 +50,7 @@ $footer-links-base-opacity: .8;
scrollbar-color: pvar(--actionButtonColor) pvar(--menuBackgroundColor); scrollbar-color: pvar(--actionButtonColor) pvar(--menuBackgroundColor);
} }
menu { nav {
@include ellipsis; @include ellipsis;
background-color: pvar(--menuBackgroundColor); background-color: pvar(--menuBackgroundColor);
@ -365,7 +365,7 @@ my-actor-avatar {
.menu-wrapper { .menu-wrapper {
width: 100% !important; width: 100% !important;
menu { nav {
overflow-y: auto; overflow-y: auto;
} }
} }

8
client/src/app/menu/menu.component.ts
View File

@ -229,7 +229,7 @@ export class MenuComponent implements OnInit, OnDestroy {
// Lock menu scroll when menu scroll to avoid fleeing / detached dropdown // Lock menu scroll when menu scroll to avoid fleeing / detached dropdown
onMenuScrollEvent () { onMenuScrollEvent () {
document.querySelector('menu').scrollTo(0, 0) document.querySelector('nav').scrollTo(0, 0)
} }
onDropdownOpenChange (opened: boolean) { onDropdownOpenChange (opened: boolean) {
@ -243,10 +243,10 @@ export class MenuComponent implements OnInit, OnDestroy {
if (opened) { if (opened) {
window.addEventListener('scroll', onWindowScroll) window.addEventListener('scroll', onWindowScroll)
document.querySelector('menu').scrollTo(0, 0) // Reset menu scroll to easy lock document.querySelector('nav').scrollTo(0, 0) // Reset menu scroll to easy lock
document.querySelector('menu').addEventListener('scroll', this.onMenuScrollEvent) document.querySelector('nav').addEventListener('scroll', this.onMenuScrollEvent)
} else { } else {
document.querySelector('menu').removeEventListener('scroll', this.onMenuScrollEvent) document.querySelector('nav').removeEventListener('scroll', this.onMenuScrollEvent)
} }
} }