From ae2dd04617d3983af1d42e5fddaddf9dc64eebcb Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 10 Aug 2020 09:42:50 +0200
Subject: [PATCH] Correctly fix sub menu

---
 client/src/app/+about/about.component.html        |  2 +-
 .../account-videos/account-videos.component.scss  |  3 ---
 .../account-videos/account-videos.component.ts    |  3 +--
 .../my-account-video-channels.component.scss      |  4 ----
 .../video-channel-videos.component.scss           |  3 ---
 .../video-channel-videos.component.ts             |  3 +--
 .../misc/top-menu-dropdown.component.html         |  2 +-
 .../misc/top-menu-dropdown.component.ts           |  2 +-
 client/src/sass/application.scss                  | 15 +++++++++++----
 9 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100644 client/src/app/+accounts/account-videos/account-videos.component.scss
 delete mode 100644 client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.scss

diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.html
index da16b933d..04a62240c 100644
--- a/client/src/app/+about/about.component.html
+++ b/client/src/app/+about/about.component.html
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="sub-menu">
+  <div class="sub-menu sub-menu-fixed">
 
     <div class="links">
       <a i18n routerLink="instance" routerLinkActive="active" class="title-page title-page-about">Instance</a>
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.scss b/client/src/app/+accounts/account-videos/account-videos.component.scss
deleted file mode 100644
index 2ba85c031..000000000
--- a/client/src/app/+accounts/account-videos/account-videos.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.title-page-single {
-  margin-top: 0;
-}
\ No newline at end of file
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts
index dd47589c1..5a9241f8e 100644
--- a/client/src/app/+accounts/account-videos/account-videos.component.ts
+++ b/client/src/app/+accounts/account-videos/account-videos.component.ts
@@ -12,8 +12,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
   selector: 'my-account-videos',
   templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html',
   styleUrls: [
-    '../../shared/shared-video-miniature/abstract-video-list.scss',
-    './account-videos.component.scss'
+    '../../shared/shared-video-miniature/abstract-video-list.scss'
   ]
 })
 export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
diff --git a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss
index cbd999fbd..f2f42459f 100644
--- a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss
+++ b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss
@@ -46,10 +46,6 @@ input[type=text] {
         color: $grey-actor-name;
         margin-left: 5px;
       }
-
-      .video-channel-followers {
-
-      }
     }
   }
 
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.scss b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.scss
deleted file mode 100644
index 2ba85c031..000000000
--- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.title-page-single {
-  margin-top: 0;
-}
\ No newline at end of file
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
index 267c328f2..599d38da9 100644
--- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
+++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
@@ -12,8 +12,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
   selector: 'my-video-channel-videos',
   templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html',
   styleUrls: [
-    '../../shared/shared-video-miniature/abstract-video-list.scss',
-    './video-channel-videos.component.scss'
+    '../../shared/shared-video-miniature/abstract-video-list.scss'
   ]
 })
 export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
diff --git a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html
index 02faa9bd5..e4bc39a58 100644
--- a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html
+++ b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html
@@ -1,4 +1,4 @@
-<div class="sub-menu" [ngClass]="{ 'no-scroll': isModalOpened }">
+<div class="sub-menu sub-menu-fixed" [ngClass]="{ 'no-scroll': isModalOpened }">
   <ng-container *ngFor="let menuEntry of menuEntries; index as id">
 
     <a *ngIf="menuEntry.routerLink && isDisplayed(menuEntry)" [routerLink]="menuEntry.routerLink" routerLinkActive="active" class="title-page title-page-settings">{{ menuEntry.label }}</a>
diff --git a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts
index c3cd22307..43a9aa352 100644
--- a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts
+++ b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts
@@ -1,5 +1,5 @@
 import { Subscription } from 'rxjs'
-import { filter, take } from 'rxjs/operators'
+import { filter } from 'rxjs/operators'
 import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { NavigationEnd, Router } from '@angular/router'
 import { MenuService, ScreenService } from '@app/core'
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index f4e4d8977..1dbdd4064 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -145,16 +145,23 @@ label {
   .sub-menu {
     background-color: pvar(--submenuColor);
     width: 100%;
-    height: $sub-menu-height;
     display: flex;
     align-items: center;
     padding-left: $not-expanded-horizontal-margins;
     padding-right: $not-expanded-horizontal-margins;
-    position: fixed;
-    z-index: #{z('header') - 1};
 
     & + .margin-content {
-      padding-top: $sub-menu-height + $sub-menu-margin-bottom;
+      padding-top: $sub-menu-margin-bottom;
+    }
+
+    &.sub-menu-fixed {
+      height: $sub-menu-height;
+      position: fixed;
+      z-index: #{z('header') - 1};
+
+      & + .margin-content {
+        padding-top: $sub-menu-height + $sub-menu-margin-bottom;
+      }
     }
   }
 
-- 
2.41.0