Merge remote branch 'ticho/highlight-unread-conversations'
This commit is contained in:
commit
d043c74528
2 changed files with 17 additions and 1 deletions
|
|
@ -7,6 +7,9 @@
|
||||||
= person_image_tag(conversation.author)
|
= person_image_tag(conversation.author)
|
||||||
|
|
||||||
.subject
|
.subject
|
||||||
|
- if unread_counts[conversation.id].to_i > 0
|
||||||
|
.unread_message_count
|
||||||
|
= unread_counts[conversation.id].to_i
|
||||||
.message_count
|
.message_count
|
||||||
= conversation.messages.size
|
= conversation.messages.size
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2513,6 +2513,19 @@ ul.show_comments,
|
||||||
:size 12px
|
:size 12px
|
||||||
:weight normal
|
:weight normal
|
||||||
|
|
||||||
|
.unread_message_count
|
||||||
|
@include border-radius(5px)
|
||||||
|
|
||||||
|
:right 30px
|
||||||
|
:background
|
||||||
|
:color #b11
|
||||||
|
:color #eee
|
||||||
|
:position absolute
|
||||||
|
:padding 0 5px
|
||||||
|
:font
|
||||||
|
:size 12px
|
||||||
|
:weight normal
|
||||||
|
|
||||||
.participant_count
|
.participant_count
|
||||||
:font
|
:font
|
||||||
:weight normal
|
:weight normal
|
||||||
|
|
@ -2544,7 +2557,7 @@ ul.show_comments,
|
||||||
|
|
||||||
.conversation.unread
|
.conversation.unread
|
||||||
:background
|
:background
|
||||||
:color lighten($background,5%)
|
:color darken($background,5%)
|
||||||
|
|
||||||
.conversation.selected
|
.conversation.selected
|
||||||
:background
|
:background
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue