Merge branch 'issue_13212' into 'master'
Fixes padding loss after editing a diff comment Also applies .timeago() to comment datetimes when diff page is entered directly. Also fixes the vertical position of the comment count icon. See merge request !3012
This commit is contained in:
commit
e5276ee6ab
|
@ -146,6 +146,7 @@ class @MergeRequestTabs
|
|||
url: "#{source}.json" + @_location.search
|
||||
success: (data) =>
|
||||
document.querySelector("div#diffs").innerHTML = data.html
|
||||
$('.js-timeago').timeago()
|
||||
$('div#diffs .js-syntax-highlight').syntaxHighlight()
|
||||
@expandViewContainer() if @diffViewType() is 'parallel'
|
||||
@diffsLoaded = true
|
||||
|
|
|
@ -14,6 +14,18 @@ ul.notes {
|
|||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
||||
.timeline-icon {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.timeline-content {
|
||||
margin-left: 55px;
|
||||
}
|
||||
|
||||
.note_created_ago, .note-updated-at {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.system-note {
|
||||
font-size: 14px;
|
||||
padding-top: 10px;
|
||||
|
@ -151,6 +163,7 @@ ul.notes {
|
|||
border-left: none;
|
||||
|
||||
&.notes_line {
|
||||
vertical-align: middle;
|
||||
text-align: center;
|
||||
padding: 10px 0;
|
||||
background: #FFF;
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
%a{name: dom_id(note), href: "##{dom_id(note)}", title: 'Link here'}
|
||||
= time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note_created_ago')
|
||||
- if note.updated_at != note.created_at
|
||||
%span
|
||||
%span.note-updated-at
|
||||
·
|
||||
= icon('edit', title: 'edited')
|
||||
= time_ago_with_tooltip(note.updated_at, placement: 'bottom', html_class: 'note_edited_ago')
|
||||
|
|
Loading…
Reference in New Issue