Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Code Issues Activity

Merge pull request #4581 from TryGhost/revert-4544-notification-over-nav

Browse source 
Revert "Allow notifications to sit over the nav bar"
This commit is contained in:
Hannah Wolfe 2014-12-04 16:02:08 +00:00
commit 883ce4eb64
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/client/assets/sass/layouts/default.scss
View file

@ -38,6 +38,7 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
overflow: hidden; overflow: hidden;
z-index: 500; // Above the .global-nav when collapsed
transition: transform $settings-menu-transition cubic-bezier($settings-menu-bezier); transition: transform $settings-menu-transition cubic-bezier($settings-menu-bezier);
@media (max-width: 900px) { @media (max-width: 900px) {
@ -96,16 +97,6 @@
} }
} }
// A <span> that wraps the main {{outlet}} which created a new z-index stack, separate to the nav
.viewport-content {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 500; // Above the .global-nav when collapsed
}
// //
// The header bar // The header bar

4
core/client/templates/application.hbs
View file

@ -7,9 +7,7 @@
<main id="gh-main" class="viewport" role="main" {{bind-attr data-notification-count=topNotificationCount}}> <main id="gh-main" class="viewport" role="main" {{bind-attr data-notification-count=topNotificationCount}}>
{{gh-notifications location="top" notify="topNotificationChange"}} {{gh-notifications location="top" notify="topNotificationChange"}}
{{gh-notifications location="bottom"}} {{gh-notifications location="bottom"}}
<span class="viewport-content"> {{outlet}}
{{outlet}}
</span>
</main> </main>
{{outlet modal}} {{outlet modal}}