From f5d9558f66ba7b92c6f6ed21796e490a33149dd7 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Sat, 29 Sep 2018 13:42:17 +0200
Subject: [PATCH] various display improvements

---
 .../my-account-video-channel-edit.component.scss              | 4 ++++
 client/src/app/app.component.html                             | 2 +-
 client/src/app/search/search.component.html                   | 2 +-
 .../videos/+video-watch/comment/video-comments.component.html | 2 +-
 client/src/sass/application.scss                              | 1 -
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
index 833fda450..bfecbaba0 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
@@ -14,6 +14,10 @@ my-actor-avatar-info {
   @include peertube-input-group(340px);
 }
 
+.input-group-append {
+  height: 30px;
+}
+
 input[type=text] {
   @include peertube-input-text(340px);
 
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 87de874bb..958c131f7 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -29,7 +29,7 @@
       </div>
 
       <footer class="row">
-        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a> -
+        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a>&nbsp;-&nbsp;
         <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2018</a>
       </footer>
     </div>
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html
index 216905cf0..61a05895e 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/search/search.component.html
@@ -9,7 +9,7 @@
       </div>
 
       <div
-        class="results-filter-button" (click)="isSearchFilterCollapsed = !isSearchFilterCollapsed" role="button"
+        class="results-filter-button ml-auto" (click)="isSearchFilterCollapsed = !isSearchFilterCollapsed" role="button"
         [attr.aria-expanded]="!isSearchFilterCollapsed" aria-controls="collapseBasic"
       >
         <span class="icon icon-filter"></span>
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html
index 9919ac615..5aebd7f24 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html
@@ -5,7 +5,7 @@
     </div>
     <my-help
       *ngIf="video.commentsEnabled === true" helpType="custom" i18n-customHtml
-      customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or 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 find back the video. Direct commenting capabilities are being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/224'>#224</a>."></my-help>
+      customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or 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 find back the video."></my-help>
   </div>
 
   <ng-template [ngIf]="video.commentsEnabled === true">
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index e2271d7d9..2356f9837 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -244,7 +244,6 @@ label {
   }
 
   .inputs {
-    margin-top: 40px;
     margin-bottom: 0;
     text-align: right;
 
-- 
2.41.0