summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-06 16:19:08 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-10 15:09:08 -0600
commit4e334538478da577fabf070c493530189c7613cb (patch)
tree44392787702932c21e6269888cd82b25a24aa9a6
parent178be67df221d46c5053a72917860775b343bc7d (diff)
downloadgitlab-ce-4e334538478da577fabf070c493530189c7613cb.tar.gz
Set sidebar height to 100% if at top of page
-rw-r--r--app/assets/javascripts/sidebar.js.es62
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/sidebar.js.es6 b/app/assets/javascripts/sidebar.js.es6
index 6c3a1f3307a..d0ddb5be099 100644
--- a/app/assets/javascripts/sidebar.js.es6
+++ b/app/assets/javascripts/sidebar.js.es6
@@ -72,6 +72,8 @@
const diff = $navHeight - $('body').scrollTop();
if (diff > 0) {
$('.right-sidebar').outerHeight($(window).height() - diff);
+ } else {
+ $('.right-sidebar').outerHeight('100%');
}
}