Commit 4738ef64 authored by Clement Ho's avatar Clement Ho

Merge branch '60141-mr-resolve-conflicts-file-headers-bad-positioning-on-scroll' into 'master'

Resolve "MR resolve conflicts file headers bad positioning on scroll"

Closes #60141

See merge request gitlab-org/gitlab-ce!31991
parents 4eecb0ad 98949a13
......@@ -2,8 +2,14 @@
.diff-file {
margin-bottom: $gl-padding;
&.conflict {
border-top: 1px solid $border-color;
}
.file-title,
.file-title-flex-parent {
border-top-left-radius: $border-radius-default;
border-top-right-radius: $border-radius-default;
cursor: pointer;
@media (min-width: map-get($grid-breakpoints, md)) {
......@@ -67,6 +73,28 @@
}
}
@media (min-width: map-get($grid-breakpoints, md)) {
&.conflict .file-title,
&.conflict .file-title-flex-parent {
top: $header-height;
}
.with-performance-bar &.conflict .file-title,
.with-performance-bar &.conflict .file-title-flex-parent {
top: $header-height + $performance-bar-height;
}
.with-system-header &.conflict .file-title,
.with-system-header &.conflict .file-title-flex-parent {
top: $header-height + $system-header-height;
}
.with-system-header.with-performance-bar &.conflict .file-title,
.with-system-header.with-performance-bar &.conflict .file-title-flex-parent {
top: $header-height + $performance-bar-height + $system-header-height;
}
}
.diff-content {
background: $white-light;
color: $gl-text-color;
......
---
title: Fix file header style and position during scroll in a merge conflict resolution
merge_request: 31991
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment