summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-17 22:53:40 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-17 22:54:02 +0200
commitbf753e99e7d2ba876a62cb5f163375e8fc5fd004 (patch)
treef9eae1d2fc095e0c2da398c85df657e572e67b9d
parent309e2ceaf85929cc1d8dceaa24620cc1bdae0ede (diff)
downloadgitlab-ce-bf753e99e7d2ba876a62cb5f163375e8fc5fd004.tar.gz
Improve link to comment targets on dashboard
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/buttons.scss2
-rw-r--r--app/views/events/event/_note.html.haml8
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index 2b5ecce4246..674481e2cd2 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -1,6 +1,6 @@
.btn {
@include linear-gradient(#f7f7f7, #d5d5d5);
- border-color: #aaa;
+ border-color: #BBB;
&:hover {
@include bg-gray-gradient;
border-color: #bbb;
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 0f8f92748dc..ef5035fca7f 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -1,15 +1,17 @@
.event-title
%span.author_name= link_to_author event
- %span.event_label commented on #{event.note_target_type}
+ %span.event_label commented on
- if event.note_target
- if event.note_commit?
+ = event.note_target_type
= link_to event.note_short_commit_id, project_commit_path(event.project, event.note_commit_id), class: "commit_short_id"
- else
= link_to [event.project, event.note_target] do
- %strong= truncate event.note_target_id
+ %strong
+ #{event.note_target_type} ##{truncate event.note_target_id}
- elsif event.wall_note?
- -# nothing here
+ = link_to 'wall', wall_project_path(event.project)
- else
%strong (deleted)
at