nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only show heart icon when avatars are shown for comment likes

Browse source
This commit is contained in:
Benjamin Neff 2022-11-12 04:11:52 +01:00
parent ad6c9dd55f
commit 71d071be60
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/comments.scss
View file

@ -85,6 +85,10 @@
.media { .media {
margin: 0 0 2px; margin: 0 0 2px;
&:not(.display-avatars) .entypo-heart {
display: none;
}
} }
.expand-likes { .expand-likes {

14
app/assets/stylesheets/single-post-view.scss
View file

@ -166,11 +166,15 @@
font-size: 12px; font-size: 12px;
line-height: 16px; line-height: 16px;
.bd, .bd { display: inline-block; }
.entypo-heart {
display: inline-block;
}
img { display: inline; } img { display: inline; }
} }
.display-avatars .entypo-heart {
display: inline-block;
font-size: 16px;
line-height: 18px;
margin-right: 5px;
vertical-align: top;
}
} }

4
app/assets/templates/likes-info_tpl.jst.hbs
View file

@ -1,6 +1,6 @@
{{#if likesCount}} {{#if likesCount}}
<div class="comment"> <div class="comment">
<div class="media"> <div class="media{{#if displayAvatars}} display-avatars{{/if}}">
<i class="entypo-heart"></i> <i class="entypo-heart"></i>
<div class="bd"> <div class="bd">
@ -8,9 +8,7 @@
<a href="#" class="expand-likes gray"> <a href="#" class="expand-likes gray">
{{t "stream.likes" count=likesCount}} {{t "stream.likes" count=likesCount}}
</a> </a>
{{else}} {{else}}
{{#each likes}} {{#each likes}}
{{#linkToAuthor author}} {{#linkToAuthor author}}
{{{personImage this 'small' 'micro'}}} {{{personImage this 'small' 'micro'}}}

2
features/desktop/comments.feature
View file

@ -91,7 +91,7 @@ Feature: commenting
When "alice@alice.alice" has commented "That's cool" on "Look at this dog" When "alice@alice.alice" has commented "That's cool" on "Look at this dog"
And I am on "alice@alice.alice"'s page And I am on "alice@alice.alice"'s page
And I like the comment "That's cool" And I like the comment "That's cool"
Then I should see a heart within comment "That's cool" Then I should see a like within comment "That's cool"
When I expand likes within comment "That's cool" When I expand likes within comment "That's cool"
Then I should see a micro avatar within comment "That's cool" Then I should see a micro avatar within comment "That's cool"

4
features/step_definitions/comment_steps.rb
View file

@ -51,10 +51,10 @@ Then /^I like the comment "([^"]*)"$/ do |comment_text|
find(id: comment_guid).click_link("Like") find(id: comment_guid).click_link("Like")
end end
Then /^I should see a heart within comment "([^"]*)"$/ do |comment_text| Then /^I should see a like within comment "([^"]*)"$/ do |comment_text|
comment_guid = Comment.find_by(text: comment_text).guid comment_guid = Comment.find_by(text: comment_text).guid
block = find(id: comment_guid) block = find(id: comment_guid)
expect(block).to have_css(".entypo-heart") expect(block).to have_css(".expand-likes")
end end
When /^I expand likes within comment "([^"]*)"$/ do |comment_text| When /^I expand likes within comment "([^"]*)"$/ do |comment_text|