From 7e0449bb1eee3fb4d982d7155f1468837b6c63dd Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 7 Sep 2011 15:20:14 +0200
Subject: [PATCH 1/4] Fix #1584 Pseudo-checkboxes in aspect list

---
 public/stylesheets/sass/application.sass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 1ad40c3f8..f94cdaec8 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2886,6 +2886,12 @@ ul.left_nav
           :weight 700
         :color #666
 
+  li.active > a.aspect_selector, li a.aspect_selector:hover
+    :background
+      :image url(../images/icons/check_yes_ok.png)
+      :position 3px 50%
+      :repeat no-repeat
+
   .contact_count
     :float right
 
@@ -2927,7 +2933,7 @@ ul.left_nav
     .new_aspect,
     a.tag_selector
       :padding
-        :left 15px
+        :left 25px
       :width 182px
 
     a.toggle_selector

From 1f2d37cc93d10aeac1babdf7f11fc8469b8d6171 Mon Sep 17 00:00:00 2001
From: Gonzalo Rodriguez <gonzalo@wyeworks.com>
Date: Tue, 4 Oct 2011 23:35:01 -0200
Subject: [PATCH 2/4] Dont use checkmarks when hovering

---
 public/stylesheets/sass/application.sass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index f94cdaec8..ad5fd0521 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2886,11 +2886,11 @@ ul.left_nav
           :weight 700
         :color #666
 
-  li.active > a.aspect_selector, li a.aspect_selector:hover
-    :background
-      :image url(../images/icons/check_yes_ok.png)
-      :position 3px 50%
-      :repeat no-repeat
+    > a.aspect_selector
+      :background
+        :image url(../images/icons/check_yes_ok.png)
+        :position 3px 50%
+        :repeat no-repeat
 
   .contact_count
     :float right

From 4563632afe8a4509d958fb2783ec20fa79d1cfbc Mon Sep 17 00:00:00 2001
From: Gonzalo Rodriguez <gonzalo@wyeworks.com>
Date: Thu, 6 Oct 2011 01:07:28 -0200
Subject: [PATCH 3/4] Avoid checkmark on 'All contacts' link

---
 app/views/contacts/_aspect_listings.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/contacts/_aspect_listings.haml b/app/views/contacts/_aspect_listings.haml
index 2966dc7b2..3367d4e37 100644
--- a/app/views/contacts/_aspect_listings.haml
+++ b/app/views/contacts/_aspect_listings.haml
@@ -21,7 +21,7 @@
         = link_to t('aspects.aspect_listings.add_an_aspect'), new_aspect_path, :class => "new_aspect", :rel => "facebox"
 
   %li.all_contacts{:class => ("active" if params["set"] == "all" || params["set"] == "only_sharing")}
-    %a.aspect_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")}
+    %a.home_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")}
       .contact_count
         = all_contacts_count
       = t('contacts.index.all_contacts')

From 977c12e2b8903c4657b72e2e18975e1e9d8e131a Mon Sep 17 00:00:00 2001
From: Gonzalo Rodriguez <gonzalo@wyeworks.com>
Date: Thu, 6 Oct 2011 01:51:18 -0200
Subject: [PATCH 4/4] Fix aspect contacts count alignment

---
 public/stylesheets/sass/application.sass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index ad5fd0521..fa4d0c458 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2934,7 +2934,7 @@ ul.left_nav
     a.tag_selector
       :padding
         :left 25px
-      :width 182px
+      :width 172px
 
     a.toggle_selector
       :outline none