Commit 647cb62d authored by Curtis Adam's avatar Curtis Adam

Merge branch '67-fix-info-button-bar-while-scrolling' into 'staging'

Resolve "Fix info button bar while scrolling"

Closes #67

See merge request arsnova/cards!99
parents 15458f12 b35a0dfb
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<template name="contactNavigation"> <template name="contactNavigation">
<nav id="{{#if displayAsFooter}}contact-nav-footer{{else}}contact-nav{{/if}}" class="nav nav-justified"> <nav id="contact-nav" class="nav nav-justified {{#if displayAsFooter}}position-sticky-bottom{{else}}position-sticky-top{{/if}}">
{{#unless currentUser}} {{#unless currentUser}}
{{#unless isActiveRoute 'home'}} {{#unless isActiveRoute 'home'}}
<li class="sm-12 md-2 inactive {{#if displayAsFooter}}footer-info-navigation{{/if}}"><a <li class="sm-12 md-2 inactive {{#if displayAsFooter}}footer-info-navigation{{/if}}"><a
......
...@@ -35,7 +35,7 @@ Template.contact.onCreated(function () { ...@@ -35,7 +35,7 @@ Template.contact.onCreated(function () {
Template.contactNavigation.helpers({ Template.contactNavigation.helpers({
displayAsFooter: function () { displayAsFooter: function () {
return (Route.isHome() || Route.isFirstTimeVisit() || Route.isMakingOf()); return (Route.isHome() || (Route.isFirstTimeVisit() && Route.isDemo()) || Route.isMakingOf());
} }
}); });
......
...@@ -5,22 +5,18 @@ ...@@ -5,22 +5,18 @@
} }
@media(min-width: 768px) { @media(min-width: 768px) {
#contact-nav, #contact-nav-footer { #contact-nav {
position: sticky; position: sticky;
position: -webkit-sticky; position: -webkit-sticky;
z-index: 1000; z-index: 1000;
} }
#theme-wrapper #contact-nav { #contact-nav {
top: 40px; top: 0;
}
#theme-wrapper-no-nav-welcome #contact-nav {
top: 15px;
} }
#theme-wrapper-no-nav #contact-nav, #contact-nav-footer { #theme-wrapper #contact-nav {
top: 0; top: 40px;
} }
} }
...@@ -36,7 +32,7 @@ ...@@ -36,7 +32,7 @@
} }
} }
#contact-nav a, #contact-nav-footer a { #contact-nav a {
border-radius: 0; border-radius: 0;
margin-bottom: 0; margin-bottom: 0;
outline: none; outline: none;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment