From a949f676368b2ea885a5f76f09c831c8a13a3c39 Mon Sep 17 00:00:00 2001
From: Kim <1877318+kimsible@users.noreply.github.com>
Date: Fri, 24 Jul 2020 23:29:39 +0200
Subject: correct regressions on sub-menu for account and admin (#3004)

---
 .../shared/shared-main/misc/top-menu-dropdown.component.scss   |  6 ------
 client/src/sass/application.scss                               | 10 +++++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'client/src')

diff --git a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.scss b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.scss
index 655c38489..84dd7dce3 100644
--- a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.scss
+++ b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.scss
@@ -1,12 +1,6 @@
 @import '_variables';
 @import '_mixins';
 
-:host {
-  display: block;
-  height: $sub-menu-height;
-  margin-bottom: $sub-menu-margin-bottom;
-}
-
 .parent-entry {
   span[role=button] {
     cursor: pointer;
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index c76e5db7b..ea89ca9ce 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -136,6 +136,10 @@ label {
     flex-grow: 1;
   }
 
+  my-top-menu-dropdown + .margin-content {
+    padding-top: $sub-menu-height + $sub-menu-margin-bottom;
+  }
+
   .sub-menu {
     background-color: pvar(--submenuColor);
     width: 100%;
@@ -145,7 +149,11 @@ label {
     padding-left: $not-expanded-horizontal-margins;
     padding-right: $not-expanded-horizontal-margins;
     position: fixed;
-    z-index: 1;
+    z-index: #{z('header') - 1};
+
+    & + .margin-content {
+      margin-top: $sub-menu-margin-bottom;
+    }
   }
 
   // Override some properties if the main content is expanded (no menu on the left)
-- 
cgit v1.2.3