From e3bfc2e44737df6d8bdee9e32f9d66af1691b931 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 6 Nov 2014 13:00:21 +1100 Subject: [PATCH] correct positioning of user card on sites with custom headers fix regression (can not click on links in card) --- app/assets/javascripts/discourse/views/user-card.js.es6 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6 index 05d58fc1ff3..91649c483a0 100644 --- a/app/assets/javascripts/discourse/views/user-card.js.es6 +++ b/app/assets/javascripts/discourse/views/user-card.js.es6 @@ -31,7 +31,8 @@ export default Discourse.View.extend(CleansUp, { if (self.get('controller.visible')) { var $target = $(e.target); if ($target.closest('[data-user-card]').data('userCard') || - $target.closest('a.mention').length > 0) { + $target.closest('a.mention').length > 0 || + $target.closest('#user-card').length > 0) { return; } @@ -75,6 +76,8 @@ export default Discourse.View.extend(CleansUp, { position.left += overage; position.top += target.height() + 5; } + + position.top -= $('#main-outlet').offset().top; self.$().css(position); } }