Client: fixed header and menu

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index f1eb6e021808de5ed196647edf46648a9029207d..061ebe134f1643ab426931bc6e9f0a4467ea925a 100644 (file)
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -11,6 +11,10 @@
       </div>
     </div>
 
+    <!-- Used for the fixed menu -->
+    <div class="col-md-2 col-sm-3 col-xs-3">
+    </div>
+
     <div class="col-md-10 col-sm-9 col-xs-9 main-col">
       <div class="header">
         <my-search></my-search>
@@ -19,12 +23,12 @@
       <div class="main-row">
         <router-outlet></router-outlet>
       </div>
+
+      <footer>
+        PeerTube, CopyLeft 2015-2017
+      </footer>
     </div>
   </div>
-
-  <footer>
-    PeerTube, CopyLeft 2015-2017
-  </footer>
 </div>
 
 <my-confirm></my-confirm>

diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..dc4dcf28bcb2aa6eb2730afb0817361654f7420b 100644 (file)
--- a/client/src/app/app.component.scss
+++ b/client/src/app/app.component.scss
@@ -0,0 +1,39 @@
+.title-menu-left {
+  height: calc(100vh - #{$header-height});
+  padding-right: 0;
+
+  .title-menu-left-block {
+    margin-left: -15px;
+
+    &.menu {
+      height: 100%;
+    }
+  }
+
+  #peertube-title {
+    background-color: #fff;
+    border-right: 1px solid $header-border-color;
+    font-size: 25px;
+    line-height: $header-height;
+    text-align: center;
+    margin-top: 0;
+    margin-bottom: 0;
+
+    a {
+      color: inherit !important;
+
+      &:hover {
+        color: inherit !important;
+        text-decoration: none !important;
+      }
+    }
+  }
+}
+
+footer {
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
+  padding: 10px;
+  text-align: center;
+  font-size: small;
+  margin: 30px 10px 0 10px;
+}

diff --git a/client/src/app/videos/video-watch/video-watch.component.scss b/client/src/app/videos/video-watch/video-watch.component.scss
index cd9d71fb4752837554331f767e2af2378765cb0b..abd2832df7337a846db89974e4b82213ef4bb3ae 100644 (file)
--- a/client/src/app/videos/video-watch/video-watch.component.scss
+++ b/client/src/app/videos/video-watch/video-watch.component.scss
@@ -45,7 +45,7 @@
   }
 
   .video-small-blocks {
-    height: 150px;
+    height: $video-watch-info-height;
     color: $video-watch-info-color;
     border-color: $video-watch-border-color;
     border-width: 1px 0px;

diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss
index d89fbb5e0c13bdb6a386630921b274bfe532eae7..bb6799665ecf4268ddefcd8b8062eb56b02f22d4 100644 (file)
--- a/client/src/sass/_variables.scss
+++ b/client/src/sass/_variables.scss
@@ -15,4 +15,4 @@ $video-miniature-other-infos: #686767;
 $video-watch-border-color: #eceef4;
 $video-watch-title-height: 90px;
 $video-watch-info-color: #8e909b;
-$video-watch-info-height: 150px;
+$video-watch-info-height: 120px;

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index d65cd8c64abbdd0a55ef5a1e69aa88433b32a782..571372c2b22ea9283520d531bd62d762c9113bf0 100644 (file)
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -24,6 +24,11 @@ input.readonly {
 .header {
   height: $header-height;
 
+  my-search {
+    position: fixed;
+    z-index: 1000;
+  }
+
   .search-col {
     height: 100%;
     margin-left: -15px;
@@ -31,6 +36,10 @@ input.readonly {
   }
 }
 
+.title-menu-left {
+  position: fixed;
+}
+
 .main-col {
   padding: 0;
 
@@ -51,38 +60,6 @@ input.readonly {
   }
 }
 
-.title-menu-left {
-  height: calc(100vh - #{$header-height});
-  padding-right: 0;
-
-  .title-menu-left-block {
-    margin-left: -15px;
-
-    &.menu {
-      height: 100%;
-    }
-  }
-
-  #peertube-title {
-    background-color: #fff;
-    border-right: 1px solid $header-border-color;
-    font-size: 25px;
-    line-height: $header-height;
-    text-align: center;
-    margin-top: 0;
-    margin-bottom: 0;
-
-    a {
-      color: inherit !important;
-
-      &:hover {
-        color: inherit !important;
-        text-decoration: none !important;
-      }
-    }
-  }
-}
-
 /* some fixes for ng2-smart-table */
 ng2-smart-table {
   thead tr {
@@ -103,11 +80,3 @@ ng2-smart-table {
     font-family: 'Glyphicons Halflings' !important;
   }
 }
-
-footer {
-  border-top: 1px solid rgba(0, 0, 0, 0.2);
-  padding-top: 10px;
-  text-align: center;
-  font-size: small;
-  margin-top: 30px;
-}