diff --git a/app/views/layouts/feed.haml b/app/views/layouts/feed.haml index 94434e16..e9239c39 100644 --- a/app/views/layouts/feed.haml +++ b/app/views/layouts/feed.haml @@ -1,8 +1,6 @@ .container-lg.container--main .row - .col-md-3.col-sm-4.d-none.d-sm-block - = render 'shared/sidebar' - .col-md-9.col-xs-12.col-sm-8 + .col-sm-10.col-md-10.col-lg-9.mx-auto = render 'layouts/messages' = render 'tabs/feed', list: @list = yield diff --git a/app/views/shared/_sidebar.haml b/app/views/shared/_sidebar.haml deleted file mode 100644 index 3ea4cf8a..00000000 --- a/app/views/shared/_sidebar.haml +++ /dev/null @@ -1,21 +0,0 @@ -.card.userbox - %img.userbox__header{ src: current_user.profile_header.url(:mobile) } - .card-body - %img.userbox__avatar{ src: current_user.profile_picture.url(:small) } - .profile__name - - unless current_user.profile.display_name.blank? - .profile__display-name - = current_user.profile.display_name - .profile__screen-name - = current_user.screen_name -- unless @list.nil? - .card - .card-header= t(".list.title") - .card-body - - if @list.members.empty? - %p.text-muted= t(".list.none") - - @list.members.each do |member| - %a{ href: user_path(member.user), title: member.user.screen_name, data: { toggle: :tooltip, placement: :top } } - %img.avatar-xs{ src: member.user.profile_picture.url(:medium) } - -= render "shared/links" diff --git a/app/views/tabs/_feed.haml b/app/views/tabs/_feed.haml index d1da004d..54c66280 100644 --- a/app/views/tabs/_feed.haml +++ b/app/views/tabs/_feed.haml @@ -10,6 +10,16 @@ - else = t(".lists.title") .dropdown-menu.dropdown-menu-right.dropdown-menu--lists + - if list + %h6.dropdown-header= t(".lists.members.title") + - if list.members.empty? + %p.text-muted= t(".list.members.none") + - else + %p.px-4 + - list.members.each do |member| + %a{ href: user_path(member.user), title: member.user.screen_name, data: { toggle: :tooltip, placement: :top } } + %img.avatar-xs{ src: member.user.profile_picture.url(:small), loading: :lazy } + %li.dropdown-divider - if current_user.lists.empty? .p-3= t(".lists.notice_html") - current_user.lists.each do |list| diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml index f30ef043..732e4891 100644 --- a/config/locales/views.en.yml +++ b/config/locales/views.en.yml @@ -511,10 +511,6 @@ en: anonymous_block: deleted_question: "Deleted question" blocked: "blocked %{time} ago" - sidebar: - list: - title: "Members" - none: "No members yet." tabs: feed: public: "Public" @@ -531,6 +527,9 @@ en: Once you have done that, the lists will be shown here. When you select a list you'll get a timeline view of all users within that list.

+ members: + title: "Members" + none: "No members yet." moderation: all: "All reports" answers: :activerecord.models.answer.other