From d0cbde239433d5153fc03088ee74b6c0a2deeb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Pankowiak?= <blasecodes@gmail.com>
Date: Thu, 7 Aug 2014 16:36:57 +0200
Subject: [PATCH] Style aspect controls

---
 app/assets/stylesheets/aspects.css.scss | 16 +++++++++++++++-
 app/helpers/aspects_helper.rb           |  2 +-
 app/helpers/contacts_helper.rb          |  2 +-
 app/views/contacts/index.html.haml      |  4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/aspects.css.scss b/app/assets/stylesheets/aspects.css.scss
index 3790c3b4e..4085078fa 100644
--- a/app/assets/stylesheets/aspects.css.scss
+++ b/app/assets/stylesheets/aspects.css.scss
@@ -27,6 +27,14 @@ $bluebg: #e7f2f7;
   }
 }
 
+.modify_aspect {
+  background: url("icons/pencil.png") no-repeat;
+  width: 12px;
+  height: 12px;
+  display: inline-block;
+}
+
+
 
 /* -- Used in contacts/index.html.haml -- */
 #aspect_controls {
@@ -39,7 +47,13 @@ $bluebg: #e7f2f7;
   .button, .button_to {
     margin-right: 5px;
   }
-  
+
+  .btn {
+    &.delete {
+      color: desaturate($red,10%);
+    }
+  }
+
   .button_to { display: inline-block; }
   
   .contact_visibility_padlock,
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index a4260ebe4..17c268f75 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -50,7 +50,7 @@ module AspectsHelper
       title = t('aspects.edit.aspect_list_is_not_visible');
     end
     
-    link_to aspect_toggle_contact_visibility_path(@aspect), class: 'contact_visibility_link button', title: title, method: :put, remote: true do
+    link_to aspect_toggle_contact_visibility_path(@aspect), class: 'contact_visibility_link btn', title: title, method: :put, remote: true do
       concat t('aspects.edit.set_visibility')
       concat content_tag(:span, nil, class: "contact_visibility_padlock " + icon)
     end
diff --git a/app/helpers/contacts_helper.rb b/app/helpers/contacts_helper.rb
index cd7ffe32b..53edbc6e0 100644
--- a/app/helpers/contacts_helper.rb
+++ b/app/helpers/contacts_helper.rb
@@ -24,7 +24,7 @@ module ContactsHelper
 
   def start_a_conversation_link(aspect, contacts_size)
     suggested_limit = 16
-    conv_opts = { class: "button conversation_button", rel: "facebox"}
+    conv_opts = { class: "btn conversation_button", rel: "facebox"}
     conv_opts[:title] = t('.many_people_are_you_sure', suggested_limit: suggested_limit) if contacts_size > suggested_limit
     
     link_to new_conversation_path(aspect_id: aspect.id, name: aspect.name), conv_opts do
diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml
index db65808c9..0fc1a81c9 100644
--- a/app/views/contacts/index.html.haml
+++ b/app/views/contacts/index.html.haml
@@ -23,11 +23,11 @@
         #aspect_controls
           - if @contacts_size > 0 && @contacts_size < 20
             = start_a_conversation_link(@aspect, @contacts_size)
-          = link_to edit_aspect_path(@aspect), rel: "facebox", class: "button" do
+          = link_to edit_aspect_path(@aspect), rel: "facebox", class: "btn" do
             = t('aspects.edit.manage')
             %span.modify_aspect
           = aspect_visibility_link(@aspect)
-          = link_to @aspect, method: "delete", data: { confirm: t('aspects.edit.confirm_remove_aspect') }, class: 'button delete' do
+          = link_to @aspect, method: "delete", data: { confirm: t('aspects.edit.confirm_remove_aspect') }, class: 'btn delete' do
             = t('delete')
             %span.icons-monotone_close_exit_delete