Commit 0cb6370a authored by Eric Eastwood's avatar Eric Eastwood

Fix note header timeago and action overlap

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30810
parent a62ae94d
...@@ -344,6 +344,15 @@ ul.notes { ...@@ -344,6 +344,15 @@ ul.notes {
font-size: 14px; font-size: 14px;
} }
.note-header {
display: flex;
justify-content: space-between;
}
.note-header-info {
min-width: 0;
}
.note-headline-light { .note-headline-light {
display: inline; display: inline;
...@@ -363,21 +372,27 @@ ul.notes { ...@@ -363,21 +372,27 @@ ul.notes {
} }
} }
.note-headline-meta {
display: inline-block;
white-space: nowrap;
}
/** /**
* Actions for Discussions/Notes * Actions for Discussions/Notes
*/ */
.discussion-actions, .discussion-actions {
.note-actions {
float: right; float: right;
margin-left: 10px; margin-left: 10px;
color: $gray-darkest; color: $gray-darkest;
} }
.note-actions { .note-actions {
position: absolute; flex-shrink: 0;
right: 0; // For PhantomJS that does not support flex
top: 0; float: right;
margin-left: 10px;
color: $gray-darkest;
.note-action-button { .note-action-button {
margin-left: 8px; margin-left: 8px;
......
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
= image_tag avatar_icon(note.author), alt: '', class: 'avatar s40' = image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
.timeline-content .timeline-content
.note-header .note-header
%a.visible-xs{ href: user_path(note.author) } .note-header-info
= note.author.to_reference %a{ href: user_path(note.author) }
= link_to_member(note.project, note.author, avatar: false, extra_class: 'hidden-xs')
.note-headline-light
%span.hidden-xs %span.hidden-xs
= sanitize(note.author.name)
%span.note-headline-light
= note.author.to_reference = note.author.to_reference
%span.note-headline-light
%span.note-headline-meta
- unless note.system - unless note.system
commented commented
- if note.system - if note.system
......
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