From 6c808af9a28b8c35191009bbce8052a967363dd1 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Wed, 1 Jul 2020 16:55:32 +0200
Subject: [PATCH] fix reactive file upload button

---
 .../my-account-video-playlist-edit.component.html               | 1 +
 .../+videos/+video-edit/video-add-components/video-send.scss    | 1 +
 .../shared/shared-main/account/actor-avatar-info.component.scss | 1 +
 client/src/app/shared/shared-main/buttons/button.component.html | 2 ++
 client/src/sass/include/_mixins.scss                            | 1 -
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html
index ff9cd37ea..e61509efd 100644
--- a/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html
+++ b/client/src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html
@@ -70,6 +70,7 @@
           <label i18n>Channel</label>
           <div class="peertube-select-container">
             <select formControlName="videoChannelId" class="form-control">
+              <option i18n value="undefined" disabled>Channel to bind the playlist to</option>
               <option></option>
               <option *ngFor="let channel of userVideoChannels" [value]="channel.id">{{ channel.label }}</option>
             </select>
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-send.scss b/client/src/app/+videos/+video-edit/video-add-components/video-send.scss
index ebe14c59e..cdb7c8280 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-send.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-send.scss
@@ -42,5 +42,6 @@ $width-size: 190px;
 
   .button-file {
     @include peertube-button-file(max-content);
+    @include orange-button;
   }
 }
diff --git a/client/src/app/shared/shared-main/account/actor-avatar-info.component.scss b/client/src/app/shared/shared-main/account/actor-avatar-info.component.scss
index 5a66ecfd2..7118e9471 100644
--- a/client/src/app/shared/shared-main/account/actor-avatar-info.component.scss
+++ b/client/src/app/shared/shared-main/account/actor-avatar-info.component.scss
@@ -17,6 +17,7 @@
     .actor-img-edit-button {
       @include peertube-button-file(21px);
       @include button-with-icon(19px);
+      @include orange-button;
     
       margin-top: 10px;
       margin-bottom: 5px;
diff --git a/client/src/app/shared/shared-main/buttons/button.component.html b/client/src/app/shared/shared-main/buttons/button.component.html
index 43e2ca614..a7dd4bb10 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.html
+++ b/client/src/app/shared/shared-main/buttons/button.component.html
@@ -3,4 +3,6 @@
   <my-small-loader [loading]="loading"></my-small-loader>
 
   <span class="button-label">{{ label }}</span>
+
+  <ng-content></ng-content>
 </span>
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 003936bc3..c6822b714 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -258,7 +258,6 @@
   min-height: 30px;
 
   @include peertube-button;
-  @include orange-button;
 
   input[type=file] {
     position: absolute;