diff options
Diffstat (limited to 'client/src/app')
6 files changed, 28 insertions, 10 deletions
diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html index 600b7a365..f8b7fa583 100644 --- a/client/src/app/+video-channels/video-channels.component.html +++ b/client/src/app/+video-channels/video-channels.component.html | |||
@@ -7,7 +7,13 @@ | |||
7 | <div class="actor-info"> | 7 | <div class="actor-info"> |
8 | <div class="actor-names"> | 8 | <div class="actor-names"> |
9 | <div class="actor-display-name">{{ videoChannel.displayName }}</div> | 9 | <div class="actor-display-name">{{ videoChannel.displayName }}</div> |
10 | <div class="actor-name">{{ videoChannel.nameWithHost }}</div> | 10 | <div class="actor-name">{{ videoChannel.nameWithHost }} |
11 | <button ngxClipboard [cbContent]="videoChannel.nameWithHost" (click)="activateCopiedMessage()" | ||
12 | class="btn btn-outline-secondary btn-sm copy-button" | ||
13 | > | ||
14 | <span class="glyphicon glyphicon-copy"></span> | ||
15 | </button> | ||
16 | </div> | ||
11 | 17 | ||
12 | <my-subscribe-button #subscribeButton [videoChannel]="videoChannel"></my-subscribe-button> | 18 | <my-subscribe-button #subscribeButton [videoChannel]="videoChannel"></my-subscribe-button> |
13 | </div> | 19 | </div> |
diff --git a/client/src/app/+video-channels/video-channels.component.scss b/client/src/app/+video-channels/video-channels.component.scss index 711b1839d..d29575027 100644 --- a/client/src/app/+video-channels/video-channels.component.scss +++ b/client/src/app/+video-channels/video-channels.component.scss | |||
@@ -10,5 +10,11 @@ | |||
10 | 10 | ||
11 | .actor-name { | 11 | .actor-name { |
12 | flex-grow: 1; | 12 | flex-grow: 1; |
13 | |||
14 | .copy-button { | ||
15 | border: none; | ||
16 | padding: 5px; | ||
17 | margin-top: -2px; | ||
18 | } | ||
13 | } | 19 | } |
14 | } \ No newline at end of file | 20 | } \ No newline at end of file |
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts index d2975b67c..5ef46c58a 100644 --- a/client/src/app/+video-channels/video-channels.component.ts +++ b/client/src/app/+video-channels/video-channels.component.ts | |||
@@ -5,7 +5,7 @@ import { VideoChannelService } from '@app/shared/video-channel/video-channel.ser | |||
5 | import { RestExtractor } from '@app/shared' | 5 | import { RestExtractor } from '@app/shared' |
6 | import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators' | 6 | import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators' |
7 | import { Subscription } from 'rxjs' | 7 | import { Subscription } from 'rxjs' |
8 | import { AuthService } from '@app/core' | 8 | import { AuthService, Notifier } from '@app/core' |
9 | import { Hotkey, HotkeysService } from 'angular2-hotkeys' | 9 | import { Hotkey, HotkeysService } from 'angular2-hotkeys' |
10 | import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component' | 10 | import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component' |
11 | import { I18n } from '@ngx-translate/i18n-polyfill' | 11 | import { I18n } from '@ngx-translate/i18n-polyfill' |
@@ -25,6 +25,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { | |||
25 | constructor ( | 25 | constructor ( |
26 | private i18n: I18n, | 26 | private i18n: I18n, |
27 | private route: ActivatedRoute, | 27 | private route: ActivatedRoute, |
28 | private notifier: Notifier, | ||
28 | private authService: AuthService, | 29 | private authService: AuthService, |
29 | private videoChannelService: VideoChannelService, | 30 | private videoChannelService: VideoChannelService, |
30 | private restExtractor: RestExtractor, | 31 | private restExtractor: RestExtractor, |
@@ -62,4 +63,8 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { | |||
62 | isUserLoggedIn () { | 63 | isUserLoggedIn () { |
63 | return this.authService.isLoggedIn() | 64 | return this.authService.isLoggedIn() |
64 | } | 65 | } |
66 | |||
67 | activateCopiedMessage () { | ||
68 | this.notifier.success(this.i18n('Username copied')) | ||
69 | } | ||
65 | } | 70 | } |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 0c9519a20..79a28d258 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -17,7 +17,6 @@ menu { | |||
17 | padding: 0; | 17 | padding: 0; |
18 | height: 100%; | 18 | height: 100%; |
19 | overflow-x: hidden; | 19 | overflow-x: hidden; |
20 | overflow-y: auto; | ||
21 | color: var(--menuForegroundColor); | 20 | color: var(--menuForegroundColor); |
22 | display: flex; | 21 | display: flex; |
23 | flex-direction: column; | 22 | flex-direction: column; |
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.html b/client/src/app/videos/+video-watch/comment/video-comment.component.html index 80e8cae1d..04bb1f7a2 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.component.html +++ b/client/src/app/videos/+video-watch/comment/video-comment.component.html | |||
@@ -1,11 +1,12 @@ | |||
1 | <div class="root-comment"> | 1 | <div class="root-comment"> |
2 | <div class="left"> | 2 | <div class="left"> |
3 | <img | 3 | <a *ngIf="!comment.isDeleted" [href]="comment.account.url" target="_blank" rel="noopener noreferrer"> |
4 | *ngIf="!comment.isDeleted" | 4 | <img |
5 | class="comment-avatar" | 5 | class="comment-avatar" |
6 | [src]="comment.accountAvatarUrl" | 6 | [src]="comment.accountAvatarUrl" |
7 | alt="Avatar" | 7 | alt="Avatar" |
8 | /> | 8 | /> |
9 | </a> | ||
9 | 10 | ||
10 | <div class="vertical-border"></div> | 11 | <div class="vertical-border"></div> |
11 | </div> | 12 | </div> |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index a8400c196..ddf6cccea 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -155,9 +155,10 @@ $video-info-margin-left: 44px; | |||
155 | 155 | ||
156 | .video-info-date-views { | 156 | .video-info-date-views { |
157 | flex-grow: 1; | 157 | flex-grow: 1; |
158 | align-self: start; | ||
158 | margin-bottom: 10px; | 159 | margin-bottom: 10px; |
159 | margin-right: 10px; | 160 | margin-right: 10px; |
160 | font-size: 16px; | 161 | font-size: 1em; |
161 | } | 162 | } |
162 | 163 | ||
163 | .video-info-channel { | 164 | .video-info-channel { |