Merge branch 'master' into development

* master:
  safer
  while use locally, no need of ribbon
This commit is contained in:
Stéphane Goetz 2016-01-25 14:49:46 +01:00
commit 9785ea25a7

View File

@ -108,12 +108,14 @@ $(function () {
function onResize() { function onResize() {
//Fix GitHub Ribbon overlapping Scrollbar //Fix GitHub Ribbon overlapping Scrollbar
var a = $('article'); var a = $('article');
if (ribbon[0] && a[0] && a[0].scrollHeight > $('.right-column').height()) { if (ribbon.length && a.length) {
if (a[0] && a[0].scrollHeight > $('.right-column').height()) {
ribbon[0].style.right = '16px'; ribbon[0].style.right = '16px';
} else { } else {
ribbon[0].style.right = ''; ribbon[0].style.right = '';
} }
} }
}
$(window).resize(_.debounce(onResize, 100)); $(window).resize(_.debounce(onResize, 100));
onResize(); onResize();
}); });