Commit 5619c7b9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'note-action-icons' into 'master'

Always show note action icons.

As discussed in #639.

The delete icon becomes red on hover, the edit one becomes slightly darker.

The "Link here" icon has been removed, and the link to the specific comment can now be found by clicking the post date ("3 months ago"), which is most other sites do it as well.

![Screen_Shot_2015-05-14_at_12.18.50](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a204fa3a042659fa53fcb70d7143c8d1/Screen_Shot_2015-05-14_at_12.18.50.png)

See merge request !652
parents 910794ba 74770137
...@@ -33,7 +33,16 @@ ul.notes { ...@@ -33,7 +33,16 @@ ul.notes {
&:before { &:before {
content: "\00b7"; content: "\00b7";
} }
font-size: 13px; font-size: 13px;
a {
@extend .cgray;
&:hover {
text-decoration: underline;
}
}
} }
.author { .author {
color: #333; color: #333;
...@@ -47,7 +56,7 @@ ul.notes { ...@@ -47,7 +56,7 @@ ul.notes {
.note-role { .note-role {
float: right; float: right;
margin-top: 2px; margin-top: 1px;
border: 1px solid #bbb; border: 1px solid #bbb;
background-color: transparent; background-color: transparent;
color: #999; color: #999;
...@@ -142,31 +151,23 @@ ul.notes { ...@@ -142,31 +151,23 @@ ul.notes {
.discussion, .discussion,
.note { .note {
&.note:hover {
.note-actions { display: block; }
.note-actions + .note-role { display: none; }
}
.discussion-header:hover {
.discussion-actions { display: block; }
}
.discussion-actions, .discussion-actions,
.note-actions { .note-actions {
display: none;
float: right; float: right;
margin-left: 10px;
a {
margin-left: 5px;
color: #999;
i.fa { i.fa {
font-size: 16px; font-size: 16px;
line-height: 16px; line-height: 16px;
vertical-align: middle;
} }
a {
margin-left: 5px;
@extend .cgray;
&:hover { &:hover {
@extend .cgray;
&.danger { @extend .cred; } &.danger { @extend .cred; }
} }
} }
......
...@@ -8,19 +8,13 @@ ...@@ -8,19 +8,13 @@
= image_tag avatar_icon(note.author_email), class: 'avatar s40', alt: '' = image_tag avatar_icon(note.author_email), class: 'avatar s40', alt: ''
.timeline-content .timeline-content
.note-header .note-header
.note-actions
= link_to "##{dom_id(note)}", name: dom_id(note), title: "Link here" do
= icon('link fw')
Link here
- if note_editable?(note) - if note_editable?(note)
.note-actions
= link_to '#', title: 'Edit comment', class: 'js-note-edit' do = link_to '#', title: 'Edit comment', class: 'js-note-edit' do
= icon('pencil-square-o fw') = icon('pencil-square-o')
Edit
= link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'danger js-note-delete' do = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'js-note-delete danger' do
= icon('trash-o fw', class: 'cred') = icon('trash-o')
Remove
- unless note.system - unless note.system
- member = note.project.team.find_member(note.author.id) - member = note.project.team.find_member(note.author.id)
...@@ -33,9 +27,12 @@ ...@@ -33,9 +27,12 @@
= image_tag avatar_icon(note.author_email), class: 'avatar s16', alt: '' = image_tag avatar_icon(note.author_email), class: 'avatar s16', alt: ''
= link_to_member(note.project, note.author, avatar: false) = link_to_member(note.project, note.author, avatar: false)
%span.author-username %span.author-username
= '@' + note.author.username = '@' + note.author.username
%span.note-last-update %span.note-last-update
= link_to "##{dom_id(note)}", name: dom_id(note), title: "Link here" do
= note_timestamp(note) = note_timestamp(note)
- if note.superceded?(@notes) - if note.superceded?(@notes)
......
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
- last_note = discussion_notes.last - last_note = discussion_notes.last
last updated by last updated by
= link_to_member(@project, last_note.author, avatar: false) = link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update %span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')} #{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
.discussion-body.js-toggle-content .discussion-body.js-toggle-content
= render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
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