X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=b095e44d6d2acfe2586173ff1065b7ddb2ea2c8a;hb=0727cab0dfd3d53e5e9c88bfbda6bc0e090d4f12;hp=deccb2810d636f95fc29f3d416a42481df4906e3;hpb=d7c152a4917092414b995d408b7ac126171e4301;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index deccb2810..b095e44d6 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,32 +1,38 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-2 col-sm-3 col-xs-3 title-menu-left">
-      <div id="peertube-title" class="title-menu-left-block header">
-        <a [routerLink]="['/videos/list']" title="Homepage"></a>
-      </div>
+<div>
+  <div class="header">
 
-      <div class="title-menu-left-block menu">
-        <my-menu *ngIf="isInAdmin() === false"></my-menu>
-        <my-menu-admin *ngIf="isInAdmin() === true"></my-menu-admin>
-      </div>
+    <div class="top-left-block" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
+      <span class="icon icon-menu" (click)="toggleMenu()"></span>
+
+      <a id="peertube-title" [routerLink]="['/videos/list']" title="Homepage">
+        <span class="icon icon-logo"></span>
+        PeerTube
+      </a>
     </div>
 
-    <!-- Used for the fixed menu -->
-    <div class="col-md-2 col-sm-3 col-xs-3">
+    <div class="header-right">
+      <my-header></my-header>
     </div>
+  </div>
 
-    <div class="col-md-10 col-sm-9 col-xs-9 main-col">
-      <div class="row header">
-        <!-- 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 class="sub-header-container">
+    <div class="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>
+
+    <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
 
       <div class="main-row">
         <router-outlet></router-outlet>
       </div>
 
       <footer class="row">
-        PeerTube, CopyLeft 2015-2017
+        <a href="https://github.com/Chocobozzz/PeerTube" title="PeerTube on Github">PeerTube</a> -
+        <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube licence">CopyLeft 2015-2017</a>
       </footer>
     </div>
   </div>