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.scss | 2 | ||||
-rw-r--r-- | client/src/app/menu/menu.component.html | 18 | ||||
-rw-r--r-- | client/src/app/menu/menu.component.scss | 1 |
4 files changed, 17 insertions, 6 deletions
diff --git a/client/src/app/menu/avatar-notification.component.html b/client/src/app/menu/avatar-notification.component.html index 1b6e6dcf8..8ffec46da 100644 --- a/client/src/app/menu/avatar-notification.component.html +++ b/client/src/app/menu/avatar-notification.component.html | |||
@@ -25,7 +25,7 @@ | |||
25 | </div> | 25 | </div> |
26 | </div> | 26 | </div> |
27 | 27 | ||
28 | <div *ngIf="!loaded" class="loader"> | 28 | <div *ngIf="!loaded" class="loader mt-4"> |
29 | <my-loader [loading]="!loaded"></my-loader> | 29 | <my-loader [loading]="!loaded"></my-loader> |
30 | </div> | 30 | </div> |
31 | 31 | ||
diff --git a/client/src/app/menu/avatar-notification.component.scss b/client/src/app/menu/avatar-notification.component.scss index 713ac7cb9..2ca7f24dc 100644 --- a/client/src/app/menu/avatar-notification.component.scss +++ b/client/src/app/menu/avatar-notification.component.scss | |||
@@ -45,7 +45,7 @@ | |||
45 | align-items: center; | 45 | align-items: center; |
46 | padding: 0 10px; | 46 | padding: 0 10px; |
47 | font-size: 16px; | 47 | font-size: 16px; |
48 | height: 50px; | 48 | min-height: 50px; |
49 | 49 | ||
50 | a { | 50 | a { |
51 | @include disable-default-a-behaviour; | 51 | @include disable-default-a-behaviour; |
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index 3f406586e..848f9949f 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html | |||
@@ -5,8 +5,10 @@ | |||
5 | <my-avatar-notification [user]="user"></my-avatar-notification> | 5 | <my-avatar-notification [user]="user"></my-avatar-notification> |
6 | 6 | ||
7 | <div class="logged-in-info"> | 7 | <div class="logged-in-info"> |
8 | <a routerLink="/my-account/settings" 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 | <div class="logged-in-username">{{ user.username }}</div> | 9 | <a *ngIf="!user.account" routerLink="/my-account/settings" class="logged-in-display-name">{{ user.account?.displayName }}</a> |
10 | |||
11 | <div ngxClipboard [cbContent]="user.account?.nameWithHost" class="logged-in-username">{{ user.username }}</div> | ||
10 | </div> | 12 | </div> |
11 | 13 | ||
12 | <div class="logged-in-more" ngbDropdown placement="bottom-right auto"> | 14 | <div class="logged-in-more" ngbDropdown placement="bottom-right auto"> |
@@ -14,13 +16,21 @@ | |||
14 | 16 | ||
15 | <div ngbDropdownMenu> | 17 | <div ngbDropdownMenu> |
16 | <a *ngIf="user.account" [routerLink]="[ '/accounts', user.account.nameWithHost ]" class="dropdown-item"> | 18 | <a *ngIf="user.account" [routerLink]="[ '/accounts', user.account.nameWithHost ]" class="dropdown-item"> |
17 | <my-global-icon iconName="go"></my-global-icon> <ng-container i18n>My public profile</ng-container> | 19 | <my-global-icon iconName="go"></my-global-icon> <ng-container i18n>Public profile</ng-container> |
18 | </a> | 20 | </a> |
19 | 21 | ||
22 | <div class="dropdown-divider"></div> | ||
23 | |||
20 | <a routerLink="/my-account" class="dropdown-item"> | 24 | <a routerLink="/my-account" class="dropdown-item"> |
21 | <my-global-icon iconName="user"></my-global-icon> <ng-container i18n>My account</ng-container> | 25 | <my-global-icon iconName="user"></my-global-icon> <ng-container i18n>Account settings</ng-container> |
22 | </a> | 26 | </a> |
23 | 27 | ||
28 | <a routerLink="/my-account/video-channels" class="dropdown-item"> | ||
29 | <my-global-icon iconName="folder"></my-global-icon> <ng-container i18n>Channels settings</ng-container> | ||
30 | </a> | ||
31 | |||
32 | <div class="dropdown-divider"></div> | ||
33 | |||
24 | <a (click)="logout($event)" class="dropdown-item" href="#"> | 34 | <a (click)="logout($event)" class="dropdown-item" href="#"> |
25 | <my-global-icon iconName="sign-out"></my-global-icon> <ng-container i18n>Log out</ng-container> | 35 | <my-global-icon iconName="sign-out"></my-global-icon> <ng-container i18n>Log out</ng-container> |
26 | </a> | 36 | </a> |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 79a28d258..2963d4d19 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -69,6 +69,7 @@ menu { | |||
69 | font-size: 13px; | 69 | font-size: 13px; |
70 | color: #C6C6C6; | 70 | color: #C6C6C6; |
71 | max-width: 140px; | 71 | max-width: 140px; |
72 | cursor: pointer; | ||
72 | } | 73 | } |
73 | } | 74 | } |
74 | 75 | ||