7 files changed, 47 insertions, 12 deletions

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index cb1f4e4ef..da4273dda 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -16,11 +16,8 @@
   </div>
 
   <div class="sub-header-container">
-    <div class="title-menu-left">
-
-      <div class="title-menu-left-block menu">
-        <my-menu *ngIf="isMenuDisplayed"></my-menu>
-      </div>
+    <div *ngIf="isMenuDisplayed" class="title-menu-left">
+        <my-menu></my-menu>
     </div>
 
     <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index 10af9debe..008c6d1f0 100644
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -61,6 +61,8 @@
     }
 
     @media screen and (max-width: 500px) {
+      width: 70px;
+
       #peertube-title {
         display: none;
       }
diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html
index aa72fb68a..c853d2b1b 100644
--- a/client/src/app/header/header.component.html
+++ b/client/src/app/header/header.component.html
@@ -6,5 +6,5 @@
 
 <a class="upload-button" routerLink="/videos/upload">
   <span class="icon icon-upload"></span>
-  Upload
+  <span class="upload-button-label">Upload</span>
 </a>
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss
index ed8695eab..5f64ede98 100644
--- a/client/src/app/header/header.component.scss
+++ b/client/src/app/header/header.component.scss
@@ -6,6 +6,14 @@
   &::placeholder {
     color: #000;
   }
+
+  @media screen and (max-width: 800px) {
+    width: calc(100% - 150px);
+  }
+
+  @media screen and (max-width: 400px) {
+    width: calc(100% - 70px);
+  }
 }
 
 .icon.icon-search {
@@ -34,4 +42,17 @@
     vertical-align: middle;
     margin-right: 6px;
   }
+
+  @media screen and (max-width: 400px) {
+    margin-right: 10px;
+    padding: 0 10px;
+
+    .icon.icon-upload {
+      margin-right: 0;
+    }
+
+    .upload-button-label {
+      display: none;
+    }
+  }
 }
diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html
index 5d07a276b..5761f2c81 100644
--- a/client/src/app/shared/video/abstract-video-list.html
+++ b/client/src/app/shared/video/abstract-video-list.html
@@ -4,6 +4,7 @@
   </div>
 
   <div
+    class="videos"
     infiniteScroll
     [infiniteScrollUpDistance]="1.5"
     [infiniteScrollDistance]="0.5"
diff --git a/client/src/app/shared/video/abstract-video-list.scss b/client/src/app/shared/video/abstract-video-list.scss
index e69de29bb..52797bc6c 100644
--- a/client/src/app/shared/video/abstract-video-list.scss
+++ b/client/src/app/shared/video/abstract-video-list.scss
@@ -0,0 +1,7 @@
+.videos {
+  text-align: center;
+
+  my-video-miniature {
+    text-align: left;
+  }
+}
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 5a4aa4cd9..f7d83c5c3 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -107,8 +107,8 @@ label {
   font-weight: bold;
 }
 
-// On small screen, menu is absolute and displayed over the page
-@media screen and (max-width: 500px) {
+// On small screen, menu is absolute
+@media screen and (max-width: 800px) {
   .title-menu-left {
     width: 120px;
     position: absolute !important;
@@ -116,11 +116,18 @@ label {
   }
 
   .main-col {
-    width: 100% !important;
-  }
+    margin-left: 0;
 
-  .fake-menu {
-    display: none;
+    &, &.expanded {
+      .margin-content {
+        //display: flex;
+        //flex-direction: column;
+        //align-items: center;
+        //justify-content: center;
+        margin-left: auto;
+        margin-right: auto;
+      }
+    }
   }
 }