Resolve "MR resolve conflicts file headers bad positioning on scroll"
What does this MR do?
The initial intent of this MR was to resolve the file headers being badly offset from their correct sticky scrolling location when resolving merge conflicts.
NB: The reason for this is the file headers were using a top position that assumed the MR tabs and MR controls bars, which are not present in the conflict resolution view.
This MR resolves that problem by making a specific carve-out for .file-title (and .file-title-flex-parent) children of .conflict.diff-files.
| Before | After |
|---|---|
 |
 |
In the course of fixing the file header offset issue, I also noticed that conflict diffs were missing the top border. In addition, the file header was overflowing the diff container and not rounded, causing unsightly square protrusions from the otherwise rounded corners.
These problems were fixed by adding the missing top border and rounding for conflict diffs. The rounding is so that it can't overflow its parent container.
| Before | After |
|---|---|
 |
 |
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry for user-facing changes, or community contribution. Check the link for other scenarios. -
Documentation created/updated or follow-up review issue created -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Performance and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers (This update has been tested, but IE11 continues to exhibit broken behavior due to this open issue)
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
~~Label as security and @ mention @gitlab-com/gl-security/appsec~~ -
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Closes #60141 (closed)