From 64e76a87aaddf76c3b3a487c5eb39e4490e4724f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 18 Sep 2012 09:17:55 +0300 Subject: [PATCH] Notes votes: use icons instead of borders. Removed unnecessary padding --- app/assets/stylesheets/common.scss | 12 ++++++++++++ app/assets/stylesheets/sections/notes.scss | 10 +--------- app/views/notes/_note.html.haml | 10 +++++++++- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index fda8d54c..ffabdf8b 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -158,6 +158,18 @@ span.update-author { 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 { diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index e14a0828..267a9b43 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -73,15 +73,7 @@ /* mark vote notes */ .voting_notes .note { - padding: 8px 0 8px 12px; - &.upvote { - padding-left: 8px; - border-left: 4px solid #468847; - } - &.downvote { - padding-left: 8px; - border-left: 4px solid #B94A48; - } + padding: 8px 0; } .notes-status { diff --git a/app/views/notes/_note.html.haml b/app/views/notes/_note.html.haml index 23145f12..5234e55d 100644 --- a/app/views/notes/_note.html.haml +++ b/app/views/notes/_note.html.haml @@ -6,8 +6,16 @@ %cite.cgray = time_ago_in_words(note.updated_at) 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) - = 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 Remove