Merge branch 'feature/design' into develop

1 files changed, 15 insertions, 26 deletions

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 8a826e783..da4273dda 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,37 +1,26 @@
-<div class="container-fluid">
-  <div class="row header">
+<div>
+  <div class="header">
 
-    <div class="col-md-2 col-sm-3 col-xs-3 top-left-block" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
-      <div class="hamburger-block" (click)="toggleMenu()">
-        <span class="glyphicon glyphicon-menu-hamburger"></span>
-      </div>
+    <div class="top-left-block" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
+      <span class="icon icon-menu" (click)="toggleMenu()"></span>
 
-      <div id="peertube-title">
-        <a [routerLink]="['/videos/list']" title="Homepage"></a>
-      </div>
+      <a id="peertube-title" [routerLink]="['/videos/list']" title="Homepage">
+        <span class="icon icon-logo"></span>
+        PeerTube
+      </a>
     </div>
 
-    <!-- Used for the fixed title -->
-    <div class="col-md-2 col-sm-3 col-xs-3 fake-title-block"></div>
-
-    <!-- We need to reset col-md-* because my-search is in fixed position -->
-    <my-search class="col-md-10 col-sm-9 col-xs-9"></my-search>
-  </div>
-
-  <div class="row">
-    <div class="col-md-2 col-sm-3 col-xs-3 title-menu-left">
-
-      <div class="title-menu-left-block menu">
-        <my-menu *ngIf="isMenuDisplayed && isInAdmin() === false"></my-menu>
-        <my-menu-admin *ngIf="isMenuDisplayed && isInAdmin() === true"></my-menu-admin>
-      </div>
+    <div class="header-right">
+      <my-header></my-header>
     </div>
+  </div>
 
-    <!-- Used for the fixed menu -->
-    <div class="fake-menu col-md-2 col-sm-3 col-xs-3">
+  <div class="sub-header-container">
+    <div *ngIf="isMenuDisplayed" class="title-menu-left">
+        <my-menu></my-menu>
     </div>
 
-    <div class="main-col" [ngClass]="getMainColClasses()">
+    <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
 
       <div class="main-row">
         <router-outlet></router-outlet>