diff options
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.html | 3 | ||||
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.scss | 39 |
2 files changed, 24 insertions, 18 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 8764d38c7..f39b5a94a 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -34,7 +34,6 @@ | |||
34 | <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" /> | 34 | <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" /> |
35 | </a> | 35 | </a> |
36 | <!-- Here will be the subscribe button --> | 36 | <!-- Here will be the subscribe button --> |
37 | <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help> | ||
38 | </div> | 37 | </div> |
39 | 38 | ||
40 | <div class="video-info-by"> | 39 | <div class="video-info-by"> |
@@ -42,6 +41,8 @@ | |||
42 | <span i18n>By {{ video.by }}</span> | 41 | <span i18n>By {{ video.by }}</span> |
43 | <img [src]="video.accountAvatarUrl" alt="Account avatar" /> | 42 | <img [src]="video.accountAvatarUrl" alt="Account avatar" /> |
44 | </a> | 43 | </a> |
44 | |||
45 | <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help> | ||
45 | </div> | 46 | </div> |
46 | </div> | 47 | </div> |
47 | 48 | ||
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 717b00eb1..5127687b2 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -115,29 +115,34 @@ | |||
115 | margin: -2px 2px 0 5px; | 115 | margin: -2px 2px 0 5px; |
116 | } | 116 | } |
117 | } | 117 | } |
118 | |||
119 | my-help { | ||
120 | display: inline-block; | ||
121 | } | ||
122 | } | 118 | } |
123 | 119 | ||
124 | .video-info-by a { | 120 | .video-info-by { |
125 | @include disable-default-a-behaviour; | ||
126 | 121 | ||
127 | display: inline; | 122 | a { |
128 | align-items: center; | 123 | @include disable-default-a-behaviour; |
129 | font-size: 13px; | ||
130 | color: #000; | ||
131 | 124 | ||
132 | span:hover { | 125 | display: inline; |
133 | opacity: 0.8; | 126 | align-items: center; |
134 | } | 127 | font-size: 13px; |
128 | color: #000; | ||
135 | 129 | ||
136 | img { | 130 | span:hover { |
137 | @include avatar(18px); | 131 | opacity: 0.8; |
132 | } | ||
133 | |||
134 | img { | ||
135 | @include avatar(18px); | ||
138 | 136 | ||
139 | margin-top: -2px; | 137 | margin-top: -2px; |
140 | margin-left: 7px; | 138 | margin-left: 7px; |
139 | } | ||
140 | } | ||
141 | |||
142 | my-help { | ||
143 | position: relative; | ||
144 | top: 1px; | ||
145 | margin-left: 2px; | ||
141 | } | 146 | } |
142 | } | 147 | } |
143 | 148 | ||