diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss index 2b5ecce424662a5e60bd178180df70fa808003cc..674481e2cd243528a59ce04b2fcceaaa1e6584ae 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 0f8f92748dcac52bc849f420288274b43a333749..ef5035fca7f74681bfbd3989ce9e8036af502d93 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