summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-12 10:43:45 +0000
committerPhil Hughes <me@iamphill.com>2019-03-12 10:43:45 +0000
commitd22d9dbcc9c79276044266e807571e1675a802af (patch)
treeed84f3671a43779094a5c9a36066021f247924a9 /app/assets/stylesheets/pages/merge_requests.scss
parentaaee3fb4a608d291a49ff3194cf34053daf57d5e (diff)
downloadgitlab-ce-d22d9dbcc9c79276044266e807571e1675a802af.tar.gz
Fixed sticky headers in merge request creation diff
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57691
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 126b00af552..44556060c65 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -1019,3 +1019,13 @@
padding-left: 50px;
padding-bottom: $gl-padding;
}
+
+.mr-compare {
+ .diff-file .file-title-flex-parent {
+ top: $header-height + 51px;
+
+ .with-performance-bar & {
+ top: $performance-bar-height + $header-height + 51px;
+ }
+ }
+}