From 1a085582a8649e6182d647abf80d2749e225ac17 Mon Sep 17 00:00:00 2001 From: flynnduism Date: Wed, 14 Jul 2021 12:18:12 -0700 Subject: [PATCH] (#142) fix account menu appearing behind contents Signed-off-by: flynnduism --- Hippo/Views/Shared/_AppLayout.cshtml | 10 ----- Hippo/Views/Shared/_Layout.cshtml | 55 ++++++++++------------------ Hippo/assets/styles/hippo.scss | 8 ++-- 3 files changed, 24 insertions(+), 49 deletions(-) diff --git a/Hippo/Views/Shared/_AppLayout.cshtml b/Hippo/Views/Shared/_AppLayout.cshtml index f073f9c8f..31f8b5671 100644 --- a/Hippo/Views/Shared/_AppLayout.cshtml +++ b/Hippo/Views/Shared/_AppLayout.cshtml @@ -25,16 +25,6 @@ -
- -
-
-
- @RenderBody() -
-
-
-
diff --git a/Hippo/Views/Shared/_Layout.cshtml b/Hippo/Views/Shared/_Layout.cshtml index 25ee82dbf..4ed409a29 100644 --- a/Hippo/Views/Shared/_Layout.cshtml +++ b/Hippo/Views/Shared/_Layout.cshtml @@ -11,46 +11,31 @@ - @if (User.Identity.IsAuthenticated) { - + -
-
- - -
-
-
-
- @ViewBag.Title -
+
+
+ + +
+
+
+
+ @ViewBag.Title
- -
-
- @RenderBody() -
-
- -
- -
- - } else { - -
- -
-
-
- @RenderBody() -
+
+ +
+
+ @RenderBody()
-
-
- } +
+ +
+ +
diff --git a/Hippo/assets/styles/hippo.scss b/Hippo/assets/styles/hippo.scss index 732cf3b36..11ce6b057 100644 --- a/Hippo/assets/styles/hippo.scss +++ b/Hippo/assets/styles/hippo.scss @@ -94,13 +94,13 @@ body { .wrapper { position: relative; - min-height: 100vh; + min-height: calc(100vh - #{$navHeight}); overflow: hidden; } .main { - padding: calc(#{$navHeight} * 0.925) 2rem 7em calc(#{$sidebarWidth} + 2rem); - min-height: calc(100vh - 96px); + padding: calc(#{$navHeight}) 2rem 7em calc(#{$sidebarWidth} + 2rem); + min-height: calc(100vh - 7em); transition: 0.2s all ease-out; overflow: hidden; @@ -154,7 +154,7 @@ body { left: 0; width: 100%; height: $navHeight; - z-index: 20; + z-index: 1920; } .navbar {