From b7f5b524756e8a30c396ae40a262884766ef6554 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 30 Jul 2018 11:55:58 +0200
Subject: Move subscription helper in the account line

---
 .../videos/+video-watch/video-watch.component.html |  3 +-
 .../videos/+video-watch/video-watch.component.scss | 39 ++++++++++++----------
 2 files changed, 24 insertions(+), 18 deletions(-)

(limited to 'client/src/app/videos')

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 @@
               <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
             </a>
             <!-- 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 class="video-info-by">
@@ -42,6 +41,8 @@
               <span i18n>By {{ video.by }}</span>
               <img [src]="video.accountAvatarUrl" alt="Account avatar" />
             </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>
 
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 @@
             margin: -2px 2px 0 5px;
           }
         }
-
-        my-help {
-          display: inline-block;
-        }
       }
 
-      .video-info-by a {
-        @include disable-default-a-behaviour;
+      .video-info-by {
 
-        display: inline;
-        align-items: center;
-        font-size: 13px;
-        color: #000;
+        a {
+          @include disable-default-a-behaviour;
 
-        span:hover {
-          opacity: 0.8;
-        }
+          display: inline;
+          align-items: center;
+          font-size: 13px;
+          color: #000;
 
-        img {
-          @include avatar(18px);
+          span:hover {
+            opacity: 0.8;
+          }
+
+          img {
+            @include avatar(18px);
 
-          margin-top: -2px;
-          margin-left: 7px;
+            margin-top: -2px;
+            margin-left: 7px;
+          }
+        }
+
+        my-help {
+          position: relative;
+          top: 1px;
+          margin-left: 2px;
         }
       }
 
-- 
cgit v1.2.3