Improve responsive on video watch

client/src/app/app.component.scss

@@ -42,7 +42,7 @@
 
       &.icon-menu {
         background-image: url('../assets/images/header/menu.svg');
-        margin: 0 18px 0 24px;
+        margin: 0 18px 0 20px;
       }
     }
 

client/src/app/header/header.component.scss

@@ -10,7 +10,7 @@
     color: #000;
   }
 
-  @media screen and (max-width: 600px) {
+  @media screen and (max-width: 800px) {
     width: calc(100% - 150px);
   }
 

client/src/app/videos/+video-watch/video-watch.component.html

@@ -9,10 +9,27 @@
   <!-- Video information -->
   <div *ngIf="video" class="margin-content video-bottom">
     <div class="video-info">
-      <div class="video-info-name-actions">
+      <div class="video-info-first-row">
+        <div>
           <div class="video-info-name">{{ video.name }}</div>
 
-        <div class="video-info-actions">
+          <div class="video-info-date-views">
+            {{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
+          </div>
+
+          <div class="video-info-channel">
+            {{ video.channel.displayName }}
+            <!-- Here will be the subscribe button -->
+          </div>
+
+          <div class="video-info-by">
+            By {{ video.by }}
+            <img [src]="getAvatarPath()" alt="Account avatar" />
+          </div>
+        </div>
+
+        <div class="video-actions-rates">
+          <div class="video-actions">
             <div
                 *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
                 class="action-button action-button-like"
@@ -70,12 +87,6 @@
               </ul>
             </div>
           </div>
-      </div>
-
-      <div class="video-info-date-views-bar">
-        <div class="video-info-date-views">
-          {{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
-        </div>
 
           <div
               class="video-info-likes-dislikes-bar"
@@ -83,15 +94,6 @@
             <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
           </div>
         </div>
-
-      <div class="video-info-channel">
-        {{ video.channel.displayName }}
-        <!-- Here will be the subscribe button -->
-      </div>
-
-      <div class="video-info-by">
-        By {{ video.by }}
-        <img [src]="getAvatarPath()" alt="Account avatar" />
       </div>
 
       <div class="video-info-description">

client/src/app/videos/+video-watch/video-watch.component.scss

@@ -39,21 +39,54 @@
     flex-grow: 1;
     margin-right: 28px;
 
-    .video-info-name-actions {
+    .video-info-first-row {
       display: flex;
-      align-items: center;
+
+      & > div {
+        flex-grow: 1;
+      }
 
       .video-info-name {
         margin-right: 30px;
+        height: 40px; // Align with the action buttons
         font-size: 27px;
         font-weight: $font-semibold;
         flex-grow: 1;
       }
 
-      .video-info-actions {
+      .video-info-date-views {
+        font-size: 16px;
+        margin-bottom: 10px;
+        flex-grow: 1;
+      }
+
+      .video-info-channel {
+        font-weight: $font-semibold;
+        font-size: 15px;
+      }
+
+      .video-info-by {
+        display: flex;
+        align-items: center;
+        font-size: 13px;
+
+        img {
+          @include avatar(18px);
+
+          margin-left: 7px;
+        }
+      }
+
+      .video-actions-rates {
+        display: flex;
+        flex-direction: column;
+        align-items: end;
+
+        .video-actions {
+          height: 40px; // Align with the title
           min-width: 215px;
           display: flex;
-        justify-content: end;
+          align-items: center;
 
           .action-button:not(:first-child), .action-more {
             margin-left: 10px;
@@ -141,16 +174,6 @@
             }
           }
         }
-    }
-
-    .video-info-date-views-bar {
-      display: flex;
-
-      .video-info-date-views {
-        font-size: 16px;
-        margin-bottom: 10px;
-        flex-grow: 1;
-      }
 
         .video-info-likes-dislikes-bar {
           height: 5px;
@@ -164,22 +187,6 @@
           }
         }
       }
-
-    .video-info-channel {
-      font-weight: $font-semibold;
-      font-size: 15px;
-    }
-
-    .video-info-by {
-      display: flex;
-      align-items: center;
-      font-size: 13px;
-
-      img {
-        @include avatar(18px);
-
-        margin-left: 7px;
-      }
     }
 
     .video-info-description {
@@ -203,8 +210,7 @@
       }
     }
 
-    .video-attributes {
+    .video-attributes .video-attribute {
-      .video-attribute {
       font-size: 13px;
       display: block;
       margin-bottom: 12px;
@@ -217,7 +223,6 @@
       }
     }
   }
-  }
 
   .other-videos {
     .title-page {
@@ -246,14 +251,21 @@
     .video-info {
       margin-right: 0;
 
-      .video-info-name-actions {
+      .video-info-first-row {
-        align-items: left;
         flex-direction: column;
         margin-bottom: 30px;
+
+        .video-actions-rates {
+          margin-top: 20px;
+          align-items: left;
+
+          .video-info-likes-dislikes-bar {
+            margin-top: 10px;
+          }
+        }
       }
 
-      .video-info-date-views-bar {
+      .video-info-date-views {
-        align-items: left;
         flex-direction: column;
         margin-bottom: 30px;
 
@@ -261,12 +273,27 @@
           margin-top: 0;
         }
       }
+
+      .video-attributes .video-attribute {
+        margin-bottom: 5px;
+      }
     }
   }
 }
 
-@media screen and (max-width: 800px) {
+@media screen and (max-width: 600px) {
   .video-bottom {
     margin: 20px 0 0 0;
+
+    .video-info {
+
+      .video-info-first-row {
+
+        .video-info-name {
+          font-size: 20px;
+          height: auto;
+        }
+      }
+    }
   }
 }

client/src/sass/application.scss

@@ -360,6 +360,17 @@ table {
   }
 }
 
+@media screen and (max-width: 900px) {
+  .main-col {
+    &, &.expanded {
+      .margin-content {
+        margin-left: 50px;
+        margin-right: 50px;
+      }
+    }
+  }
+}
+
 // On small screen, menu is absolute
 @media screen and (max-width: 600px) {
   .title-menu-left {