Skip to content
Extraits de code Groupes Projets
Valider 58e844eb rédigé par Raphael Sofaer's avatar Raphael Sofaer
Parcourir les fichiers

fade in like action for comments

parent 0e664b2c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -19,14 +19,10 @@ ...@@ -19,14 +19,10 @@
.comment_info .comment_info
%time.timeago{:datetime => comment.created_at} %time.timeago{:datetime => comment.created_at}
= comment.created_at ? timeago(comment.created_at) : timeago(Time.now) = comment.created_at ? timeago(comment.created_at) : timeago(Time.now)
·
.likes .likes
= render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count = render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count
- if comment.likes_count > 0
·
- unless (defined?(@commenting_disabled) && @commenting_disabled) - unless (defined?(@commenting_disabled) && @commenting_disabled)
%span.like_action %span.like_action
= like_action(comment, current_user) = like_action(comment, current_user)
......
...@@ -448,7 +448,7 @@ ul.as-selections ...@@ -448,7 +448,7 @@ ul.as-selections
:top -1px :top -1px
.delete .delete
@include opacity(0.6) @include opacity(0.3)
:padding 5px :padding 5px
&:hover &:hover
...@@ -459,7 +459,8 @@ ul.as-selections ...@@ -459,7 +459,8 @@ ul.as-selections
:right 12px :right 12px
.controls .controls
:display none @include transition(opacity)
@include opacity(0)
:z-index 6 :z-index 6
:color #999 :color #999
a a
...@@ -469,7 +470,7 @@ ul.as-selections ...@@ -469,7 +470,7 @@ ul.as-selections
&:hover, .comment:hover &:hover, .comment:hover
> .controls > .controls
:display inline @include opacity(1)
.from .from
a a
...@@ -668,6 +669,17 @@ form.new_comment ...@@ -668,6 +669,17 @@ form.new_comment
.comment .comment
.like_action
@include transition(opacity)
@include opacity(0)
&:before
:content " · "
&:hover
.like_action
@include opacity(1)
.likes, .likes,
.likes_container .likes_container
:display inline :display inline
...@@ -685,6 +697,11 @@ form.new_comment ...@@ -685,6 +697,11 @@ form.new_comment
:width 9px :width 9px
:top 1px :top 1px
.likes
:margin
:left 5px
.stream.show .stream.show
ul.comments ul.comments
li li
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter