don't show hovercard for current_user in likes field + fixed hovercard styling in likes field
This commit is contained in:
parent
fdaa44ca9c
commit
e994c90559
3 changed files with 8 additions and 2 deletions
|
|
@ -56,7 +56,7 @@ module NotificationsHelper
|
||||||
actors =people || note.actors
|
actors =people || note.actors
|
||||||
number_of_actors = actors.count
|
number_of_actors = actors.count
|
||||||
sentence_translations = {:two_words_connector => " #{t('notifications.index.and')} ", :last_word_connector => ", #{t('notifications.index.and')} " }
|
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
|
if number_of_actors < 4
|
||||||
message = actor_links.to_sentence(sentence_translations)
|
message = actor_links.to_sentence(sentence_translations)
|
||||||
|
|
|
||||||
|
|
@ -3078,6 +3078,8 @@ ul.left_nav
|
||||||
:width 70px
|
:width 70px
|
||||||
:margin
|
:margin
|
||||||
:right 10px
|
:right 10px
|
||||||
|
:left 0
|
||||||
|
:top 0 !important
|
||||||
|
|
||||||
:background
|
:background
|
||||||
:color $background
|
:color $background
|
||||||
|
|
@ -3095,6 +3097,7 @@ ul.left_nav
|
||||||
:margin
|
:margin
|
||||||
:bottom 10px
|
:bottom 10px
|
||||||
a
|
a
|
||||||
|
:color $blue
|
||||||
:font
|
:font
|
||||||
:weight bold !important
|
:weight bold !important
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -122,16 +122,19 @@
|
||||||
|
|
||||||
ul
|
ul
|
||||||
@include user-select(none)
|
@include user-select(none)
|
||||||
|
:font
|
||||||
|
:size normal
|
||||||
|
|
||||||
:padding 0 !important
|
:padding 0 !important
|
||||||
:margin 0 !important
|
:margin 0 !important
|
||||||
:color #333
|
:color #000
|
||||||
|
|
||||||
> li
|
> li
|
||||||
:font-size 11px !important
|
:font-size 11px !important
|
||||||
:padding 3px 2px
|
:padding 3px 2px
|
||||||
:left 24px
|
:left 24px
|
||||||
:position relative
|
:position relative
|
||||||
|
:color #222
|
||||||
|
|
||||||
.check,
|
.check,
|
||||||
.checkWhite
|
.checkWhite
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue