Updating offset for sticky toolbar

DesignSafe-CI · Dec 2, 2016 · e76ad33 · e76ad33
1 parent 039bbd3
commit e76ad33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/designsafe/common_settings.py b/designsafe/common_settings.py
@@ -28,6 +28,7 @@
 SESSION_COOKIE_DOMAIN = os.environ.get('SESSION_COOKIE_DOMAIN')
 # SESSION_ENGINE = 'redis_sessions.session'
 # SESSION_REDIS_HOST = 'redis'
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.environ.get('DJANGO_DEBUG', 'False') == 'True'

diff --git a/designsafe/static/scripts/ng-designsafe/directives/ng-designsafe-directives.js b/designsafe/static/scripts/ng-designsafe/directives/ng-designsafe-directives.js
@@ -198,11 +198,13 @@
       link: function (scope, element, attrs) {
         var topClass = attrs.dsFixTop; // get CSS class from directive's attribute value
 
-		var offsetTop = $('.site-banner').height();
+        var navbar = $('.navbar-ds');
+		var offsetTop = 0;
         $win.on('scroll', function (e) {
-            offsetTop = $('.site-banner').height();
-          if ($win.scrollTop() >= offsetTop) {
+            offsetTop = $('.site-banner').height() + (navbar.height() / 2);
+           if ($win.scrollTop() >= offsetTop) {
             element.addClass(topClass);
+			element.css({top: navbar.position().top + navbar.height()});
           } else {
             element.removeClass(topClass);
           }