diff --git a/app/assets/javascripts/mobile/mobile_post_actions.js b/app/assets/javascripts/mobile/mobile_post_actions.js index 7df54d6a9165451e011bd65a09f27077267a67cb..ed6bb16b9ffff19444939715d875bdb33a827956 100644 --- a/app/assets/javascripts/mobile/mobile_post_actions.js +++ b/app/assets/javascripts/mobile/mobile_post_actions.js @@ -75,7 +75,7 @@ onLike: function(evt){ evt.preventDefault(); - var link = $(evt.target), + var link = $(evt.target).closest(".like-action"), likeCounter = $(evt.target).closest(".stream-element").find(".like-count"); if(!link.hasClass("loading") && link.hasClass("inactive")) { @@ -89,7 +89,7 @@ onReshare: function(evt) { evt.preventDefault(); - var link = $(this), + var link = $(this).closest(".reshare-action"), href = link.attr("href"), confirmText = link.attr("title"); diff --git a/app/assets/stylesheets/mobile/comments.scss b/app/assets/stylesheets/mobile/comments.scss index 7588a47feaf2f71a7be530abdc8a4cb67aa9dfdf..62db27354a5e5663c734acb655889bdb6c9a4deb 100644 --- a/app/assets/stylesheets/mobile/comments.scss +++ b/app/assets/stylesheets/mobile/comments.scss @@ -43,16 +43,15 @@ display: flex; .count { + color: $text-color; + font-family: $font-family-base; + font-size: $font-size-base; line-height: 22px; margin-left: 5px; + vertical-align: top; z-index: 2; } - .icon-count-group { - display: flex; - margin: 0 7px; - } - [class^="entypo"] { color: $text-grey; font-size: 24px; @@ -73,6 +72,9 @@ } .post-action { + display: flex; + margin: 0 7px; + .disabled { color: $medium-gray; } } diff --git a/app/helpers/mobile_helper.rb b/app/helpers/mobile_helper.rb index ef3d184e516871695aff71ef62d5f968ff519d07..6d8f008dcd55bd64f4767077468d187e54d60dab 100644 --- a/app/helpers/mobile_helper.rb +++ b/app/helpers/mobile_helper.rb @@ -7,25 +7,30 @@ module MobileHelper reshare = Reshare.where(author_id: current_user.person_id, root_guid: absolute_root.guid).first klass = reshare.present? ? "active" : "inactive" - link_to "", reshares_path(root_guid: absolute_root.guid), + link_to content_tag(:span, post.reshares.size, class: "count reshare-count"), + reshares_path(root_guid: absolute_root.guid), title: t("reshares.reshare.reshare_confirmation", author: absolute_root.author_name), class: "entypo-reshare reshare-action #{klass}" else - content_tag :div, nil, class: "entypo-reshare reshare-action disabled" + content_tag :div, + content_tag(:span, post.reshares.size, class: "count reshare-count"), + class: "entypo-reshare reshare-action disabled" end else - content_tag :div, nil, class: "entypo-reshare reshare-action disabled" + content_tag :div, + content_tag(:span, post.reshares.size, class: "count reshare-count"), + class: "entypo-reshare reshare-action disabled" end end def mobile_like_icon(post) if current_user && current_user.liked?(post) - link_to "", + link_to content_tag(:span, post.likes.size, class: "count like-count"), "#", data: {url: post_like_path(post.id, current_user.like_for(post).id)}, class: "entypo-heart like-action active" else - link_to "", + link_to content_tag(:span, post.likes.size, class: "count like-count"), "#", data: {url: post_likes_path(post.id)}, class: "entypo-heart like-action inactive" @@ -33,7 +38,9 @@ module MobileHelper end def mobile_comment_icon(post) - link_to "", new_post_comment_path(post), class: "entypo-comment comment-action inactive" + link_to content_tag(:span, post.comments.size, class: "count comment-count"), + new_post_comment_path(post), + class: "entypo-comment comment-action inactive" end def show_comments_link(post, klass="") diff --git a/app/views/comments/_post_stats.mobile.haml b/app/views/comments/_post_stats.mobile.haml index 106ef8ae89abf8d89306ecbd3ded39fe20551131..980bf46ef0fd4f50f8c04e6b4a2cb0ecc757f456 100644 --- a/app/views/comments/_post_stats.mobile.haml +++ b/app/views/comments/_post_stats.mobile.haml @@ -1,13 +1,10 @@ .post-stats - if post.public? - .icon-count-group - .post-action= mobile_reshare_icon(post) - %span.reshare-count.count= post.reshares.size + .post-action + = mobile_reshare_icon(post) - .icon-count-group - .post-action= mobile_comment_icon(post) - %span.comment-count.count= post.comments.size + .post-action + = mobile_comment_icon(post) - .icon-count-group - .post-action= mobile_like_icon(post) - %span.like-count.count= post.likes.size + .post-action + = mobile_like_icon(post)