From e994c90559b9fb379eb1e5de0ea4931c9b2e07c2 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Wed, 6 Jul 2011 21:33:59 -0700
Subject: [PATCH] don't show hovercard for current_user in likes field + fixed
hovercard styling in likes field
---
app/helpers/notifications_helper.rb | 2 +-
public/stylesheets/sass/application.sass | 3 +++
public/stylesheets/sass/ui.sass | 5 ++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index a9353fd5a3..e15a1d6fd0 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -56,7 +56,7 @@ module NotificationsHelper
actors =people || note.actors
number_of_actors = actors.count
sentence_translations = {:two_words_connector => " #{t('notifications.index.and')} ", :last_word_connector => ", #{t('notifications.index.and')} " }
- actor_links = actors.collect{ |person| link_to("#{h(person.name.titlecase.strip)}", person_path(person), :class => 'hovercardable')}
+ actor_links = actors.collect{ |person| link_to("#{h(person.name.titlecase.strip)}", person_path(person), :class => ('hovercardable' if defined?(user_signed_in?) && user_signed_in? && current_user.person != person))}
if number_of_actors < 4
message = actor_links.to_sentence(sentence_translations)
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 4017038562..ccfdfee8b0 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3078,6 +3078,8 @@ ul.left_nav
:width 70px
:margin
:right 10px
+ :left 0
+ :top 0 !important
:background
:color $background
@@ -3095,6 +3097,7 @@ ul.left_nav
:margin
:bottom 10px
a
+ :color $blue
:font
:weight bold !important
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index c811f7da64..a5b9eaaa11 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -122,16 +122,19 @@
ul
@include user-select(none)
+ :font
+ :size normal
:padding 0 !important
:margin 0 !important
- :color #333
+ :color #000
> li
:font-size 11px !important
:padding 3px 2px
:left 24px
:position relative
+ :color #222
.check,
.checkWhite
--
GitLab