deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Notes votes: use icons instead of borders. Removed unnecessary padding

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-09-18 09:17:55 +03:00
parent 2aafd7cf4e
commit 64e76a87aa
3 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/stylesheets/common.scss
View file

@ -158,6 +158,18 @@ span.update-author {
padding: 6px; padding: 6px;
} }
} }
&.label-success {
background-color: #8D8;
color: #333;
text-shadow: 0 1px 1px white;
}
&.label-error {
background-color: #D88;
color: #333;
text-shadow: 0 1px 1px white;
}
} }
.event_label { .event_label {

10
app/assets/stylesheets/sections/notes.scss
View file

@ -73,15 +73,7 @@
/* mark vote notes */ /* mark vote notes */
.voting_notes .note { .voting_notes .note {
padding: 8px 0 8px 12px; padding: 8px 0;
&.upvote {
padding-left: 8px;
border-left: 4px solid #468847;
}
&.downvote {
padding-left: 8px;
border-left: 4px solid #B94A48;
}
} }
.notes-status { .notes-status {

8
app/views/notes/_note.html.haml
View file

@ -6,6 +6,14 @@
%cite.cgray %cite.cgray
= time_ago_in_words(note.updated_at) = time_ago_in_words(note.updated_at)
ago ago
- if note.upvote?
%span.label.label-success
%i.icon-thumbs-up
\+1
- if note.downvote?
%span.label.label-error
%i.icon-thumbs-down
\-1
- if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project) - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
= link_to [@project, note], confirm: 'Are you sure?', method: :delete, remote: true, class: "cred delete-note btn very_small" do = link_to [@project, note], confirm: 'Are you sure?', method: :delete, remote: true, class: "cred delete-note btn very_small" do
%i.icon-trash %i.icon-trash