Fix note header author and time ago wrapping in parallel diff
What does this MR do?
- Fix note header author and time ago wrapping in parallel diff
See subsequent MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11701 where we apply all the same responsive note styles to the parallel diff notes.
Are there points in the code the reviewer needs to double check?
Why was this MR needed?
. | Screenshot |
---|---|
Before | |
After |
Does this MR meet the acceptance criteria?
- Tests
-
All builds are passing
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Branch has no merge conflicts with master
(if it does - rebase it please) -
Squashed related commits together
What are the relevant issue numbers?
Closes #32801 (closed)
Merge request reports
Activity
assigned to @annabeldunstone
@MadLittleMods I think we should have the Name + username on the same line. Was there a specific reason you did it this way?
@annabeldunstone I am not seeing that on this branch. Are you sure you checked out this branch?
When parallel, author + timeago is on it's own line. When inline, the avatar + name go away and then the buttons wrap underneath.
In this subsequent MR, we apply the same inline breakpoint styles to parallel at double the width because of the two columns, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11701
Edited by username-removed-892863@MadLittleMods that screenshot was meant to be what I thought it should look like. On your branch you have the name on its own line, and then the username on the second line with the timeago stuff
@annabeldunstone I think the author + timeago on same line is what it was previously doing, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8273 - We weren't doing the full responsive thing we do with inline notes.
I can remove the
display: block;
if we want to make it wrap that way.@MadLittleMods you're right. It seems weird to me but probably works better for long names/usernames.
mentioned in commit 41441445
mentioned in issue #33450 (closed)
mentioned in commit 000f4217
mentioned in merge request !12004 (merged)
@MadLittleMods: This MR doesn't apply cleanly onto
9-2-stable
. Could you please fix the conflicts in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12004?Edited by username-removed-407765mentioned in commit 0f3542c8