From a0dedc02ca870a31298eb35d5105a1ebc34dbb4a Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Mon, 16 Dec 2019 22:13:07 +0100 Subject: (consistency) channel nameWithHost copy button, comment avatar link --- .../src/app/+video-channels/video-channels.component.html | 8 +++++++- .../src/app/+video-channels/video-channels.component.scss | 6 ++++++ client/src/app/+video-channels/video-channels.component.ts | 7 ++++++- client/src/app/menu/menu.component.scss | 1 - .../+video-watch/comment/video-comment.component.html | 13 +++++++------ .../src/app/videos/+video-watch/video-watch.component.scss | 3 ++- 6 files changed, 28 insertions(+), 10 deletions(-) (limited to 'client/src') 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 @@
{{ videoChannel.displayName }}
-
{{ videoChannel.nameWithHost }}
+
{{ videoChannel.nameWithHost }} + +
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 @@ .actor-name { flex-grow: 1; + + .copy-button { + border: none; + padding: 5px; + margin-top: -2px; + } } } \ 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 import { RestExtractor } from '@app/shared' import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators' import { Subscription } from 'rxjs' -import { AuthService } from '@app/core' +import { AuthService, Notifier } from '@app/core' import { Hotkey, HotkeysService } from 'angular2-hotkeys' import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component' import { I18n } from '@ngx-translate/i18n-polyfill' @@ -25,6 +25,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { constructor ( private i18n: I18n, private route: ActivatedRoute, + private notifier: Notifier, private authService: AuthService, private videoChannelService: VideoChannelService, private restExtractor: RestExtractor, @@ -62,4 +63,8 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { isUserLoggedIn () { return this.authService.isLoggedIn() } + + activateCopiedMessage () { + this.notifier.success(this.i18n('Username copied')) + } } 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 { padding: 0; height: 100%; overflow-x: hidden; - overflow-y: auto; color: var(--menuForegroundColor); display: flex; 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 @@
- Avatar + + Avatar +
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; .video-info-date-views { flex-grow: 1; + align-self: start; margin-bottom: 10px; margin-right: 10px; - font-size: 16px; + font-size: 1em; } .video-info-channel { -- cgit v1.2.3