From 65415e3208c29f52e3da6ccbdcdabcdf00bdb67b Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Mon, 25 Sep 2017 10:57:23 +0100 Subject: [PATCH] removed commented out CSS --- app/assets/javascripts/lib/utils/sticky.js | 2 +- app/assets/stylesheets/pages/diff.scss | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/assets/javascripts/lib/utils/sticky.js b/app/assets/javascripts/lib/utils/sticky.js index f8f0a43f1cc..2803939c7cd 100644 --- a/app/assets/javascripts/lib/utils/sticky.js +++ b/app/assets/javascripts/lib/utils/sticky.js @@ -9,7 +9,7 @@ export const isSticky = (el, scrollY, stickyTop, insertPlaceholder) => { const top = Math.floor(el.offsetTop - scrollY); if (top <= stickyTop && !el.classList.contains('is-stuck')) { - const placeholder = insertPlaceholder ? createPlaceholder(el) : null; + const placeholder = insertPlaceholder ? createPlaceholder() : null; const heightBefore = el.offsetHeight; el.classList.add('is-stuck'); diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 5dbf44073b5..ed9d5e98467 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -600,11 +600,6 @@ .inline-parallel-buttons { display: none; } - - + .files, - + .alert { - // margin-top: 32px; - } } } }