fix reactive file upload button

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 ff9cd37eacaa3fbceba03873b2361db4c5949576..e61509efd21576dce0771ab2c0f0d663140ac28c 100644 (file)
--- 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">
           <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>
               <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 ebe14c59e51e7413bdbe05f010de45cbff1e89ef..cdb7c828015e25f886c7e2c613d716855ac761cd 100644 (file)
--- 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);
 
   .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 5a66ecfd2246f44e6a56bbb212197601ba388bbf..7118e947178a6868f27b651897602d0d8cbb12a5 100644 (file)
--- 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);
     .actor-img-edit-button {
       @include peertube-button-file(21px);
       @include button-with-icon(19px);

+      @include orange-button;

     
       margin-top: 10px;
       margin-bottom: 5px;
     
       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 43e2ca614135b8dcac6c18d3775329a06eebe4b9..a7dd4bb10429de1cdcf06aeb6c35b66dbde15f7a 100644 (file)
--- 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>
   <my-small-loader [loading]="loading"></my-small-loader>
 
   <span class="button-label">{{ label }}</span>

+
+  <ng-content></ng-content>

 </span>
 </span>

diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 003936bc30200f0ee283dbdac5d87af5786cda78..c6822b714592003d0ab650d959a867fe06bd8152 100644 (file)
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -258,7 +258,6 @@
   min-height: 30px;
 
   @include peertube-button;
   min-height: 30px;
 
   @include peertube-button;

-  @include orange-button;

 
   input[type=file] {
     position: absolute;
 
   input[type=file] {
     position: absolute;