Skip to content
Snippets Groups Projects
Commit 0cb6370a authored by Eric Eastwood's avatar Eric Eastwood
Browse files

Fix note header timeago and action overlap

parent a62ae94d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -344,6 +344,15 @@ ul.notes {
font-size: 14px;
}
 
.note-header {
display: flex;
justify-content: space-between;
}
.note-header-info {
min-width: 0;
}
.note-headline-light {
display: inline;
 
Loading
Loading
@@ -363,21 +372,27 @@ ul.notes {
}
}
 
.note-headline-meta {
display: inline-block;
white-space: nowrap;
}
/**
* Actions for Discussions/Notes
*/
 
.discussion-actions,
.note-actions {
.discussion-actions {
float: right;
margin-left: 10px;
color: $gray-darkest;
}
 
.note-actions {
position: absolute;
right: 0;
top: 0;
flex-shrink: 0;
// For PhantomJS that does not support flex
float: right;
margin-left: 10px;
color: $gray-darkest;
 
.note-action-button {
margin-left: 8px;
Loading
Loading
Loading
Loading
@@ -12,19 +12,21 @@
= image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
.timeline-content
.note-header
%a.visible-xs{ href: user_path(note.author) }
= note.author.to_reference
= link_to_member(note.project, note.author, avatar: false, extra_class: 'hidden-xs')
.note-headline-light
%span.hidden-xs
= note.author.to_reference
- unless note.system
commented
- if note.system
%span.system-note-message
= note.redacted_note_html
%a{ href: "##{dom_id(note)}" }
= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
.note-header-info
%a{ href: user_path(note.author) }
%span.hidden-xs
= sanitize(note.author.name)
%span.note-headline-light
= note.author.to_reference
%span.note-headline-light
%span.note-headline-meta
- unless note.system
commented
- if note.system
%span.system-note-message
= note.redacted_note_html
%a{ href: "##{dom_id(note)}" }
= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note-created-ago')
- unless note.system?
.note-actions
- access = note_max_access_for_user(note)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment