From daf62841f645e77affa0a50701a79d942c612500 Mon Sep 17 00:00:00 2001 From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Date: Mon, 22 Jun 2020 21:02:27 +0200 Subject: Fix sticky diff stats container (#12002) * Fix sticky diff stats container * Use pure CSS sticky instead of Fomantic's JS * add border color to arc-green * add slight padding on sides * make linter happy Co-authored-by: techknowlogick --- web_src/js/index.js | 3 --- web_src/less/_repository.less | 10 ++++++++++ web_src/less/themes/theme-arc-green.less | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) (limited to 'web_src') diff --git a/web_src/js/index.js b/web_src/js/index.js index 61059b6946..a39d8b0dd3 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1204,8 +1204,6 @@ function initPullRequestReview() { return; } - $('.diff-detail-box.ui.sticky').sticky(); - $('.btn-review').on('click', function (e) { e.preventDefault(); $(this).closest('.dropdown').find('.menu').toggle('visible'); @@ -2042,7 +2040,6 @@ function initCodeView() { $.get(`${$blob.data('url')}?${$blob.data('query')}&anchor=${$blob.data('anchor')}`, (blob) => { $row.replaceWith(blob); $(`[data-anchor="${$blob.data('anchor')}"]`).on('click', (e) => { insertBlobExcerpt(e) }); - $('.diff-detail-box.ui.sticky').sticky(); }); } $('.ui.blob-excerpt').on('click', (e) => { insertBlobExcerpt(e) }); diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 7bdfe6611f..67bd582161 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -1567,6 +1567,16 @@ background: #ffffff; line-height: 30px; + &.sticky { + position: sticky; + top: 0; + z-index: 800; + margin-bottom: 10px; + border-bottom: 1px solid #d4d4d5; + padding-left: 5px; + padding-right: 5px; + } + > div:after { clear: both; content: ""; diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 3c83d1cc8b..529ceeb6e8 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -1335,6 +1335,10 @@ a.ui.labels .label:hover { .detail-files { background-color: inherit; } + + &.sticky { + border-bottom-color: rgba(255, 255, 255, .1); + } } .comment-code-cloud { -- cgit v1.2.3