Enlarge right column in video-edit on small screens

4 files changed, 59 insertions, 13 deletions

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 152b069d2..d59394538 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
@@ -6,7 +6,7 @@
 
       <ng-template ngbNavContent>
         <div class="row">
-          <div class="col-md-8">
+          <div class="col-video-edit">
             <div class="form-group">
               <label i18n for="name">Title</label>
               <input type="text" id="name" class="form-control" formControlName="name" />
@@ -54,7 +54,7 @@
             </div>
           </div>
 
-          <div class="col-md-4">
+          <div class="col-video-edit">
             <div class="form-group">
               <label i18n>Channel</label>
               <div class="peertube-select-container">
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 1b7bc56b4..de800b03f 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
@@ -1,5 +1,11 @@
-@import '_variables';
-@import '_mixins';
+// Bootstrap grid utilities require functions, variables and mixins
+@import 'node_modules/bootstrap/scss/functions';
+@import 'node_modules/bootstrap/scss/variables';
+@import 'node_modules/bootstrap/scss/mixins';
+@import 'node_modules/bootstrap/scss/grid';
+
+@import 'variables';
+@import 'mixins';
 
 label {
   font-weight: $font-regular;
@@ -54,6 +60,7 @@ my-peertube-checkbox {
 
   .captions-header {
     text-align: right;
+    margin-bottom: 1rem;
 
     .create-caption {
       @include create-button;
@@ -68,6 +75,7 @@ my-peertube-checkbox {
     a.caption-entry-label {
       @include disable-default-a-behaviour;
 
+      flex-grow: 1;
       color: #000;
 
       &:hover {
@@ -153,4 +161,49 @@ p-calendar {
   }
 }
 
-@include ng2-tags
+::ng-deep my-markdown-textarea {
+  .root {
+    @include media-breakpoint-down(xl) {
+      flex-direction: column !important;
+    }
+
+    textarea {
+      max-width: 100%;
+    }
+  }
+}
+
+@include ng2-tags;
+
+// columns for the video
+.col-video-edit {
+  @include make-col-ready();
+
+  @include media-breakpoint-up(md) {
+    @include make-col(7);
+
+    & + .col-video-edit {
+      @include make-col(5);
+    }
+  }
+
+  @include media-breakpoint-up(xl) {
+    @include make-col(8);
+
+    & + .col-video-edit {
+      @include make-col(4);
+    }
+  }
+}
+
+:host-context(.expanded) {
+  .col-video-edit {
+    @include media-breakpoint-up(md) {
+      @include make-col(8);
+  
+      & + .col-video-edit {
+        @include make-col(4);
+      }
+    }
+  }
+}
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 1979d0061..ebe14c59e 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
@@ -43,10 +43,4 @@ $width-size: 190px;
   .button-file {
     @include peertube-button-file(max-content);
   }
-
-  .button-file-extension {
-    display: block;
-    font-size: 12px;
-    margin-top: 5px;
-  }
 }
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
index be3a9662b..b4e1ceeca 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
@@ -2,11 +2,10 @@
   <div class="first-step-block">
     <my-global-icon class="upload-icon" iconName="upload"></my-global-icon>
 
-    <div class="button-file form-control">
+    <div class="button-file form-control" [ngbTooltip]="'(extensions: ' + videoExtensions + ')'" container="body">
       <span i18n>Select the file to upload</span>
       <input #videofileInput type="file" name="videofile" id="videofile" [accept]="videoExtensions" (change)="fileChange()" autofocus />
     </div>
-    <span class="button-file-extension">({{ videoExtensions }})</span>
 
     <div class="form-group form-group-channel">
       <label i18n for="first-step-channel">Channel</label>