OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Move subscription helper in the account line

pull/837/head
Chocobozzz 2018-07-30 11:55:58 +02:00
parent 6af6cf831f
commit b7f5b52475
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/app/videos/+video-watch/video-watch.component.html
View File

@ -34,7 +34,6 @@
<img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" /> <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
</a> </a>
<!-- Here will be the subscribe button --> <!-- Here will be the subscribe button -->
<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>
</div> </div>
<div class="video-info-by"> <div class="video-info-by">
@ -42,6 +41,8 @@
<span i18n>By {{ video.by }}</span> <span i18n>By {{ video.by }}</span>
<img [src]="video.accountAvatarUrl" alt="Account avatar" /> <img [src]="video.accountAvatarUrl" alt="Account avatar" />
</a> </a>
<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>
</div> </div>
</div> </div>

39
client/src/app/videos/+video-watch/video-watch.component.scss
View File

@ -115,29 +115,34 @@
margin: -2px 2px 0 5px; margin: -2px 2px 0 5px;
} }
} }
my-help {
display: inline-block;
}
} }
.video-info-by a { .video-info-by {
@include disable-default-a-behaviour;
display: inline; a {
align-items: center; @include disable-default-a-behaviour;
font-size: 13px;
color: #000;
span:hover { display: inline;
opacity: 0.8; align-items: center;
font-size: 13px;
color: #000;
span:hover {
opacity: 0.8;
}
img {
@include avatar(18px);
margin-top: -2px;
margin-left: 7px;
}
} }
img { my-help {
@include avatar(18px); position: relative;
top: 1px;
margin-top: -2px; margin-left: 2px;
margin-left: 7px;
} }
} }