From e998cf3cc757b58f06adae7a367e88b494c609d2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 15 May 2018 16:23:44 +0200
Subject: [PATCH] Fix some components after Angular 6 upgrade

---
 client/package.json                                         | 2 +-
 client/src/app/shared/misc/help.component.scss              | 1 +
 .../app/videos/+video-edit/shared/video-edit.component.html | 2 +-
 .../app/videos/+video-edit/shared/video-edit.component.scss | 4 ----
 .../app/videos/+video-edit/shared/video-edit.component.ts   | 1 -
 client/src/sass/application.scss                            | 4 ++++
 client/yarn.lock                                            | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/package.json b/client/package.json
index b9e2feb05..cd975dd0b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -65,7 +65,7 @@
     "linkifyjs": "^2.1.5",
     "lodash-es": "^4.17.4",
     "markdown-it": "^8.4.0",
-    "ngx-bootstrap": "2.0.3",
+    "ngx-bootstrap": "2.0.5",
     "ngx-chips": "1.9.2",
     "ngx-clipboard": "11.0.0",
     "ngx-pipes": "^2.1.7",
diff --git a/client/src/app/shared/misc/help.component.scss b/client/src/app/shared/misc/help.component.scss
index 0df8b86fa..fe64a270d 100644
--- a/client/src/app/shared/misc/help.component.scss
+++ b/client/src/app/shared/misc/help.component.scss
@@ -9,6 +9,7 @@
   background-image: url('../../../assets/images/global/help.svg');
   background-color: #fff;
   border: none;
+  margin: 5px;
 }
 
 /deep/ {
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html
index 77b554ad5..7e1be4467 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html
@@ -14,7 +14,7 @@
         <div class="form-group">
           <label class="label-tags">Tags</label> <span>(press Enter to add)</span>
           <tag-input
-            [ngModel]="tags" [validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
+            [validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
             formControlName="tags" maxItems="5" modelAsStrings="true"
           ></tag-input>
         </div>
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
index 58ed5ab98..1295cf098 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
@@ -5,10 +5,6 @@
   @include peertube-select-container(auto);
 }
 
-.form-group-checkbox {
-  my-help { margin-left: 5px }
-}
-
 .video-edit {
   height: 100%;
 
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index eab0a898e..af4438bd2 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -30,7 +30,6 @@ export class VideoEditComponent implements OnInit {
   @Input() videoPrivacies = []
   @Input() userVideoChannels = []
 
-  tags: string[] = []
   videoCategories = []
   videoLicences = []
   videoLanguages = []
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 2e1e5bf65..8331c9fa3 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -227,6 +227,10 @@ p-table {
     width: 250px !important;
     padding: 0 !important;
     text-align: center;
+
+    my-edit-button + my-delete-button {
+      margin-left: 5px;
+    }
   }
 
   p-paginator {
diff --git a/client/yarn.lock b/client/yarn.lock
index 0c08fc354..ee4af2e51 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -5464,9 +5464,9 @@ ng2-material-dropdown@0.10.0:
   dependencies:
     tslib "^1.9.0"
 
-ngx-bootstrap@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-2.0.3.tgz#b8ca4be305be4e2e99f60d941cc8a3e906f198d7"
+ngx-bootstrap@2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/ngx-bootstrap/-/ngx-bootstrap-2.0.5.tgz#83aab39d1e4fe811fad2b34f7927f9ce19d68daa"
 
 ngx-chips@1.9.2:
   version "1.9.2"
-- 
2.25.1