diff --git a/bower.json b/bower.json index 12e7e956b6..31afcb3c36 100644 --- a/bower.json +++ b/bower.json @@ -37,7 +37,8 @@ "JavaScriptButtons": "git://github.com/paypal/JavaScriptButtons.git#master", "Angular-At-Directive": "git://github.com/snicker/Angular-At-Directive#master", "js-emoji": "git://github.com/snicker/js-emoji#master", - "gemoji": "git://github.com/github/gemoji" + "gemoji": "git://github.com/github/gemoji", + "sticky": "*" }, "resolutions": { "jquery": "~2.0.3", diff --git a/public/js/controllers/rootCtrl.js b/public/js/controllers/rootCtrl.js index 53e73029c8..aa2b3de391 100644 --- a/public/js/controllers/rootCtrl.js +++ b/public/js/controllers/rootCtrl.js @@ -7,6 +7,12 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ function($scope, $rootScope, $location, User, $http, $state, $stateParams, Notification, Groups) { var user = User.user; + var initSticky = _.once(function(){ + if (window.env.IS_MOBILE) return; + $('.header-wrap').sticky({topSpacing:0}); + }) + $rootScope.$on('userUpdated',initSticky); + $rootScope.modals = {}; $rootScope.modals.achievements = {}; $rootScope.User = User; diff --git a/public/manifest.json b/public/manifest.json index eeadddec82..dee320860c 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -17,6 +17,7 @@ "bower_components/Angular-At-Directive/src/caret.js", "bower_components/angular-bindonce/bindonce.js", "bower_components/js-emoji/emoji.js", + "bower_components/sticky/jquery.sticky.js", "bower_components/bootstrap/docs/assets/js/bootstrap.js", "bower_components/angular-bootstrap/ui-bootstrap.js", diff --git a/views/shared/header/header.jade b/views/shared/header/header.jade index 9244b1c0ff..fe987be28a 100644 --- a/views/shared/header/header.jade +++ b/views/shared/header/header.jade @@ -1,4 +1,4 @@ -.header-wrap(ng-controller='HeaderCtrl', data-spy="affix", data-offset-top="148") +.header-wrap(ng-controller='HeaderCtrl') a.label.undo-button(x-bind='click:undo', ng-show='_undo') Undo div(ng-if='!user.preferences.hideHeader') include menu