summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-07-05 17:20:54 +0000
committerPhil Hughes <me@iamphill.com>2019-07-05 17:20:54 +0000
commit50441577f0d24fe66ad1d59879f10315b54946c4 (patch)
treeed6551b299b65310efba3ef5b1c2098171047338
parent27c4b8aadd8e5137341c8966d7b7af3833521816 (diff)
parent7c41a02e4a695d42344488819111b5387d605e7e (diff)
downloadgitlab-ce-50441577f0d24fe66ad1d59879f10315b54946c4.tar.gz
Merge branch '63976-discussion-sticky-header' into 'master'
Fix top position of sticky file header on discussion tab Closes #63976 See merge request gitlab-org/gitlab-ce!30410
-rw-r--r--app/assets/stylesheets/pages/notes.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 0cf8e4a7314..5db0136e3f1 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -406,7 +406,7 @@ $note-form-margin-left: 72px;
border-radius: 0;
@media (min-width: map-get($grid-breakpoints, md)) {
- top: 91px;
+ top: $mr-tabs-height + $header-height;
.with-performance-bar & {
top: 126px;