diff options
Diffstat (limited to 'client/src/app/menu')
-rw-r--r-- | client/src/app/menu/avatar-notification.component.html | 2 | ||||
-rw-r--r-- | client/src/app/menu/avatar-notification.component.ts | 1 | ||||
-rw-r--r-- | client/src/app/menu/language-chooser.component.ts | 2 | ||||
-rw-r--r-- | client/src/app/menu/menu.component.html | 10 | ||||
-rw-r--r-- | client/src/app/menu/menu.component.scss | 3 |
5 files changed, 9 insertions, 9 deletions
diff --git a/client/src/app/menu/avatar-notification.component.html b/client/src/app/menu/avatar-notification.component.html index 7975afba5..df2a102a3 100644 --- a/client/src/app/menu/avatar-notification.component.html +++ b/client/src/app/menu/avatar-notification.component.html | |||
@@ -30,7 +30,7 @@ | |||
30 | </div> | 30 | </div> |
31 | 31 | ||
32 | <my-user-notifications | 32 | <my-user-notifications |
33 | [ignoreLoadingBar]="true" [infiniteScroll]="false" itemsPerPage="10" | 33 | [ignoreLoadingBar]="true" [infiniteScroll]="false" [itemsPerPage]="10" |
34 | [markAllAsReadSubject]="markAllAsReadSubject" (notificationsLoaded)="onNotificationLoaded()" | 34 | [markAllAsReadSubject]="markAllAsReadSubject" (notificationsLoaded)="onNotificationLoaded()" |
35 | ></my-user-notifications> | 35 | ></my-user-notifications> |
36 | 36 | ||
diff --git a/client/src/app/menu/avatar-notification.component.ts b/client/src/app/menu/avatar-notification.component.ts index 989a11849..c447f031c 100644 --- a/client/src/app/menu/avatar-notification.component.ts +++ b/client/src/app/menu/avatar-notification.component.ts | |||
@@ -6,7 +6,6 @@ import { Notifier, UserNotificationSocket } from '@app/core' | |||
6 | import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' | 6 | import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' |
7 | import { NavigationEnd, Router } from '@angular/router' | 7 | import { NavigationEnd, Router } from '@angular/router' |
8 | import { filter } from 'rxjs/operators' | 8 | import { filter } from 'rxjs/operators' |
9 | import { UserNotificationsComponent } from '@app/shared' | ||
10 | 9 | ||
11 | @Component({ | 10 | @Component({ |
12 | selector: 'my-avatar-notification', | 11 | selector: 'my-avatar-notification', |
diff --git a/client/src/app/menu/language-chooser.component.ts b/client/src/app/menu/language-chooser.component.ts index 4a6e4c75a..43f622dfb 100644 --- a/client/src/app/menu/language-chooser.component.ts +++ b/client/src/app/menu/language-chooser.component.ts | |||
@@ -21,7 +21,7 @@ export class LanguageChooserComponent { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | show () { | 23 | show () { |
24 | this.modalService.open(this.modal) | 24 | this.modalService.open(this.modal, { centered: true }) |
25 | } | 25 | } |
26 | 26 | ||
27 | buildLanguageLink (lang: { id: string }) { | 27 | buildLanguageLink (lang: { id: string }) { |
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index 675fb597d..790a8af00 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html | |||
@@ -8,10 +8,10 @@ | |||
8 | <a *ngIf="user.account" [routerLink]="[ '/accounts', user.account.nameWithHost ]" class="logged-in-display-name">{{ user.account?.displayName }}</a> | 8 | <a *ngIf="user.account" [routerLink]="[ '/accounts', user.account.nameWithHost ]" class="logged-in-display-name">{{ user.account?.displayName }}</a> |
9 | <a *ngIf="!user.account" routerLink="/my-account/settings" class="logged-in-display-name">{{ user.account?.displayName }}</a> | 9 | <a *ngIf="!user.account" routerLink="/my-account/settings" class="logged-in-display-name">{{ user.account?.displayName }}</a> |
10 | 10 | ||
11 | <div ngxClipboard [cbContent]="user.account?.nameWithHost" class="logged-in-username">{{ user.username }}</div> | 11 | <div class="logged-in-username">{{ user.username }}</div> |
12 | </div> | 12 | </div> |
13 | 13 | ||
14 | <div class="logged-in-more" ngbDropdown placement="bottom-right auto"> | 14 | <div class="logged-in-more" ngbDropdown placement="bottom-right auto" container="body"> |
15 | <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon> | 15 | <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon> |
16 | 16 | ||
17 | <div ngbDropdownMenu> | 17 | <div ngbDropdownMenu> |
@@ -48,7 +48,7 @@ | |||
48 | </div> | 48 | </div> |
49 | 49 | ||
50 | <div *ngIf="isLoggedIn" class="panel-block"> | 50 | <div *ngIf="isLoggedIn" class="panel-block"> |
51 | <div i18n class="block-title">My library</div> | 51 | <div i18n class="block-title">MY LIBRARY</div> |
52 | 52 | ||
53 | <a routerLink="/my-account/videos" routerLinkActive="active"> | 53 | <a routerLink="/my-account/videos" routerLinkActive="active"> |
54 | <my-global-icon iconName="videos"></my-global-icon> | 54 | <my-global-icon iconName="videos"></my-global-icon> |
@@ -73,7 +73,7 @@ | |||
73 | </div> | 73 | </div> |
74 | 74 | ||
75 | <div class="panel-block"> | 75 | <div class="panel-block"> |
76 | <div i18n class="block-title">Videos</div> | 76 | <div i18n class="block-title">VIDEOS</div> |
77 | 77 | ||
78 | <a routerLink="/videos/overview" routerLinkActive="active"> | 78 | <a routerLink="/videos/overview" routerLinkActive="active"> |
79 | <my-global-icon iconName="globe"></my-global-icon> | 79 | <my-global-icon iconName="globe"></my-global-icon> |
@@ -102,7 +102,7 @@ | |||
102 | </div> | 102 | </div> |
103 | 103 | ||
104 | <div class="panel-block"> | 104 | <div class="panel-block"> |
105 | <div class="block-title" i18n>More</div> | 105 | <div class="block-title" i18n>MORE</div> |
106 | 106 | ||
107 | <a *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active"> | 107 | <a *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active"> |
108 | <my-global-icon iconName="administration"></my-global-icon> | 108 | <my-global-icon iconName="administration"></my-global-icon> |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index b05173751..40c9a2b25 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -6,7 +6,8 @@ | |||
6 | height: calc(100vh - #{$header-height}); | 6 | height: calc(100vh - #{$header-height}); |
7 | padding: 0; | 7 | padding: 0; |
8 | width: $menu-width; | 8 | width: $menu-width; |
9 | z-index: 10000; | 9 | z-index: z(menu); |
10 | scrollbar-color: var(--actionButtonColor) var(--menuBackgroundColor); | ||
10 | } | 11 | } |
11 | 12 | ||
12 | menu { | 13 | menu { |