Skip to content
This repository has been archived by the owner on Oct 28, 2024. It is now read-only.

(#142) fix account menu appearing behind contents #152

Merged
merged 1 commit into from
Jul 14, 2021
Merged

(#142) fix account menu appearing behind contents #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Hippo/Views/Shared/_AppLayout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@
</main>
<partial name="_Footer" />
</div>
<div class="wrapper">

<main class="main logged-out" id="main">
<div class="columns is-multiline">
<div class="column is-12">
@RenderBody()
</div>
</div>
</main>
</div>
<script src="~/lib/jquery/dist/jquery.min.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="~/js/app.js"></script>
Expand Down
55 changes: 20 additions & 35 deletions Hippo/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,31 @@
<link href="~/styles/hippo.css" rel="stylesheet" />
</head>
<body>
@if (User.Identity.IsAuthenticated) {
<partial name="_NavTopbar" />
<partial name="_NavTopbar" />

<div class="wrapper">
<main class="main no-app" id="main">
<partial name="_NavBreadcrumb" />

<div class="level mt-2 mr-2 content-title">
<div class="level-left">
<div class="level-item">
<div class="title has-text-primary">
<span><text>@ViewBag.Title</text></span>
</div>
<div class="wrapper">
<main class="main no-app" id="main">
<partial name="_NavBreadcrumb" />

<div class="level mt-2 mr-2 content-title">
<div class="level-left">
<div class="level-item">
<div class="title has-text-primary">
<span><text>@ViewBag.Title</text></span>
</div>
</div>
</div>

<div class="columns is-multiline">
<div class="column is-12">
@RenderBody()
</div>
</div>

</main>
<partial name="_Footer" />
</div>

} else {

<div class="wrapper">

<main class="main logged-out" id="main">
<div class="columns is-multiline">
<div class="column is-12">
@RenderBody()
</div>
</div>

<div class="columns is-multiline">
<div class="column is-12">
@RenderBody()
</div>
</main>
</div>
}
</div>

</main>
<partial name="_Footer" />
</div>

<script src="~/lib/jquery/dist/jquery.min.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.min.js"></script>
Expand Down
8 changes: 4 additions & 4 deletions Hippo/assets/styles/hippo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -154,7 +154,7 @@ body {
left: 0;
width: 100%;
height: $navHeight;
z-index: 20;
z-index: 1920;
}

.navbar {
Expand Down