From 85d97b0c7188479bb7b67751f649ee4689388d35 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Sat, 2 May 2020 20:35:48 +0200 Subject: [PATCH] Rename changed classes across templates --- app/views/discover/_userbox.html.haml | 2 +- app/views/inbox/_entry.html.haml | 4 ++-- app/views/moderation/_discussion.html.haml | 2 +- app/views/moderation/_moderationbox.html.haml | 2 +- app/views/question/_question.haml | 4 ++-- app/views/shared/_question.html.haml | 2 +- app/views/shared/_sidebar.haml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/discover/_userbox.html.haml b/app/views/discover/_userbox.html.haml index a61ba4d1..0f0fa626 100644 --- a/app/views/discover/_userbox.html.haml +++ b/app/views/discover/_userbox.html.haml @@ -13,7 +13,7 @@ %a{href: show_user_profile_path(u.screen_name)} %span= u.display_name %span.text-muted= "@#{u.screen_name}" - %p.answerbox--question-text + %p.answerbox__question-text - if type == "new" = t('views.discover.userbox.new', time: time_ago_in_words(u.created_at)) - elsif type == "most" diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml index fa42ad80..a93b6338 100644 --- a/app/views/inbox/_entry.html.haml +++ b/app/views/inbox/_entry.html.haml @@ -3,7 +3,7 @@ .media - unless i.question.author_is_anonymous %a.pull-left{href: show_user_profile_path(i.question.user.screen_name)} - %img.img-rounded.answerbox--img{src: i.question.user.profile_picture.url(:medium)} + %img.avatar-sm{src: i.question.user.profile_picture.url(:medium)} .media-body %h6.text-muted.media-heading.answerbox--question-user = raw t('views.inbox.entry.asked', user: user_screen_name(i.question.user, anonymous: i.question.author_is_anonymous), time: time_tooltip(i.question)) @@ -12,7 +12,7 @@ · %a{href: show_user_question_path(i.question.user.screen_name, i.question.id)} = pluralize(i.question.answer_count, t('views.inbox.entry.response')) - %p.answerbox--question-text= i.question.content + %p.answerbox__question-text= i.question.content .card-body %textarea.form-control{name: 'ib-answer', placeholder: t('views.placeholder.inbox'), data: { id: i.id }} %br/ diff --git a/app/views/moderation/_discussion.html.haml b/app/views/moderation/_discussion.html.haml index 6e791284..715ccc18 100644 --- a/app/views/moderation/_discussion.html.haml +++ b/app/views/moderation/_discussion.html.haml @@ -6,7 +6,7 @@ %li{data: { comment_id: comment.id }} .media.comments--media .pull-left - %img.img-rounded.answerbox--img{src: comment.user.profile_picture.url(:medium)} + %img.avatar-sm{src: comment.user.profile_picture.url(:medium)} .media-body.comments--body %h6.media-heading.answerbox--question-user = user_screen_name comment.user diff --git a/app/views/moderation/_moderationbox.html.haml b/app/views/moderation/_moderationbox.html.haml index 78daa565..122582cb 100644 --- a/app/views/moderation/_moderationbox.html.haml +++ b/app/views/moderation/_moderationbox.html.haml @@ -1,7 +1,7 @@ - unless report.nil? or report.target.nil? or report.user.nil? or report.type.nil? .card.moderationbox{data: { id: report.id }} .card-header - %img.img-rounded.answerbox--img{src: report.user.profile_picture.url(:medium)} + %img.avatar-sm{src: report.user.profile_picture.url(:medium)} = raw t('views.moderation.moderationbox.reported', user: user_screen_name(report.user), content: report.type.sub('Reports::', ''), time: time_tooltip(report)) .card-body %p diff --git a/app/views/question/_question.haml b/app/views/question/_question.haml index 456d79fa..ef1e336d 100644 --- a/app/views/question/_question.haml +++ b/app/views/question/_question.haml @@ -4,7 +4,7 @@ .media.question-media - unless question.author_is_anonymous %a.pull-left{href: unless hidden then show_user_profile_path(question.user.screen_name) end} - %img.img-rounded.answerbox--img{src: question.user.profile_picture.url(:medium)} + %img.avatar-sm{src: question.user.profile_picture.url(:medium)} .media-body.question-body - if user_signed_in? .pull-right @@ -28,4 +28,4 @@ = user_screen_name question.user, anonymous: question.author_is_anonymous, url: false - else = raw t('views.answerbox.asked', user: user_screen_name(question.user, anonymous: question.author_is_anonymous), time: time_tooltip(question)) - %p.answerbox--question-text= question.content + %p.answerbox__question-text= question.content diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml index ff0f5e4d..e621ffcf 100644 --- a/app/views/shared/_question.html.haml +++ b/app/views/shared/_question.html.haml @@ -29,5 +29,5 @@ · %a{href: show_user_question_path(q.user.screen_name, q.id)} = pluralize(q.answer_count, t('views.general.answer')) - %p.answerbox--question-text + %p.answerbox__question-text = q.content diff --git a/app/views/shared/_sidebar.haml b/app/views/shared/_sidebar.haml index 02d57908..555d3079 100644 --- a/app/views/shared/_sidebar.haml +++ b/app/views/shared/_sidebar.haml @@ -22,6 +22,6 @@ .card-body - @group.members.each do |member| %a{href: show_user_profile_path(member.user.screen_name), title: member.user.screen_name, data: { toggle: :tooltip, placement: :top }} - %img.img-rounded.answerbox--img-small{src: member.user.profile_picture.url(:medium)} + %img.avatar-xs{src: member.user.profile_picture.url(:medium)} = render 'shared/links'