Commit 41441445 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'master'

Fix note header author and time ago wrapping in parallel diff

Closes #32801

See merge request !11702
parents d9835145 068e5e21
......@@ -385,6 +385,12 @@ ul.notes {
padding-bottom: 0;
}
.note-header-author-name {
@media (max-width: $screen-xs-max) {
display: none;
}
}
.note-headline-light {
display: inline;
......@@ -733,9 +739,8 @@ ul.notes {
// Merge request notes in diffs
.diff-file {
// Diff is side by side
.notes_content.parallel .note-header .note-headline-light {
.notes_content.parallel .note-header .note-header-author-name {
display: block;
position: relative;
}
// Diff is inline
.notes_content .note-header .note-headline-light {
......
......@@ -18,7 +18,7 @@
.note-header
.note-header-info
%a{ href: user_path(note.author) }
%span.hidden-xs
%span.note-header-author-name
= sanitize(note.author.name)
%span.note-headline-light
= note.author.to_reference
......
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