From 45907c9260ed1035e9416307a54ffbaa537eb13f Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Sat, 2 Mar 2024 21:37:07 +0100 Subject: [PATCH] Use ellipsis icon for action dropdowns --- .../question_component.html.haml | 18 +++++++++++------- app/views/answerbox/_actions.html.haml | 4 ++-- app/views/answerbox/_comments.html.haml | 4 ++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/components/question_component/question_component.html.haml b/app/components/question_component/question_component.html.haml index 5716b279..ef08c7ae 100644 --- a/app/components/question_component/question_component.html.haml +++ b/app/components/question_component/question_component.html.haml @@ -12,19 +12,23 @@ %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_to_you") } } - elsif moderation_view? %i.fa.fa-eye-slash{ data: { bs_toggle: "tooltip", bs_title: t(".visible_mod_mode") } } - = t(".asked_html", user: user_screen_name(@question.user, context_user: @context_user, author_identifier: author_identifier), time: time_tooltip(@question)) + = user_screen_name(@question.user, context_user: @context_user, author_identifier: author_identifier) - if follower_question? · %a{ href: question_path(@question.user.screen_name, @question.id), data: { selection_hotkey: "a" } } = t(".answers", count: @question.answer_count) + · + = time_tooltip(@question) + - else + · + = link_to(time_tooltip(@question), question_path(@question.user.screen_name, @question.id)) + - if user_signed_in? + .dropdown.d-inline + %button.btn.btn-link.btn-sm.p-0{ data: { bs_toggle: :dropdown }, aria: { expanded: false } } + %i.fa.fa-fw.fa-ellipsis + = render "actions/question", question: @question .question__body{ data: { controller: @question.long? ? "collapse" : nil } } .question__text{ class: @question.long? && @collapse ? "collapsed" : "", data: { collapse_target: "content" } } = question_markdown @question.content - if @question.long? && @collapse = render "shared/collapse", type: "question" - - if user_signed_in? - .flex-shrink-0.ms-auto - .btn-group - %button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } } - %span.caret - = render "actions/question", question: @question diff --git a/app/views/answerbox/_actions.html.haml b/app/views/answerbox/_actions.html.haml index 445a6e4c..961507c2 100644 --- a/app/views/answerbox/_actions.html.haml +++ b/app/views/answerbox/_actions.html.haml @@ -12,6 +12,6 @@ = render "actions/share", answer: a - if user_signed_in? .dropdown.d-inline - %button.btn.btn-link.answerbox__action.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } } - %span.caret + %button.btn.btn-link.answerbox__action{ data: { bs_toggle: :dropdown }, aria: { expanded: false } } + %i.fa.fa-fw.fa-ellipsis = render "actions/answer", answer: a diff --git a/app/views/answerbox/_comments.html.haml b/app/views/answerbox/_comments.html.haml index fe013eb6..c1c2a2de 100644 --- a/app/views/answerbox/_comments.html.haml +++ b/app/views/answerbox/_comments.html.haml @@ -21,6 +21,6 @@ - else = render "reactions/create", type: "Comment", target: comment .dropdown.d-inline - %button.btn.btn-link.answerbox__action.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } } - %span.caret + %button.btn.btn-link.answerbox__action{ data: { bs_toggle: :dropdown }, aria: { expanded: false } } + %i.fa.fa-fw.fa-ellipsis = render "actions/comment", comment: comment, answer: a