diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-29 11:01:28 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-29 11:01:28 -0500 |
| commit | c4b9b2cfcfae5f7ce4e4c0fd41caf012812f58b1 (patch) | |
| tree | fec68bc0c7eb559421d160c5eb4856bc6a55677c | |
| parent | a0f440efd36a2a2039e89bc74219772c62f24105 (diff) | |
| download | gitlab-ce-c4b9b2cfcfae5f7ce4e4c0fd41caf012812f58b1.tar.gz | |
Wrap icon with edited time
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index ae9189811c7..6cb6adb480c 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -22,7 +22,7 @@ ul.notes { margin-left: 55px; } - .note_created_ago, .note_edited_ago { + .note_created_ago, .note-updated-at { white-space: nowrap; } diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index e858c412836..52972576aff 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -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') |