Remove sidebar from timeline layout

This commit is contained in:
Andreas Nedbal 2022-10-20 21:59:44 +02:00 committed by Andreas Nedbal
parent d3faccf85e
commit c5efbee938
4 changed files with 14 additions and 28 deletions

View File

@ -1,8 +1,6 @@
.container-lg.container--main .container-lg.container--main
.row .row
.col-md-3.col-sm-4.d-none.d-sm-block .col-sm-10.col-md-10.col-lg-9.mx-auto
= render 'shared/sidebar'
.col-md-9.col-xs-12.col-sm-8
= render 'layouts/messages' = render 'layouts/messages'
= render 'tabs/feed', list: @list = render 'tabs/feed', list: @list
= yield = yield

View File

@ -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"

View File

@ -10,6 +10,16 @@
- else - else
= t(".lists.title") = t(".lists.title")
.dropdown-menu.dropdown-menu-right.dropdown-menu--lists .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? - if current_user.lists.empty?
.p-3= t(".lists.notice_html") .p-3= t(".lists.notice_html")
- current_user.lists.each do |list| - current_user.lists.each do |list|

View File

@ -511,10 +511,6 @@ en:
anonymous_block: anonymous_block:
deleted_question: "Deleted question" deleted_question: "Deleted question"
blocked: "blocked %{time} ago" blocked: "blocked %{time} ago"
sidebar:
list:
title: "Members"
none: "No members yet."
tabs: tabs:
feed: feed:
public: "Public" public: "Public"
@ -531,6 +527,9 @@ en:
Once you have done that, the lists will be shown here. 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. When you select a list you'll get a timeline view of all users within that list.
</p> </p>
members:
title: "Members"
none: "No members yet."
moderation: moderation:
all: "All reports" all: "All reports"
answers: :activerecord.models.answer.other answers: :activerecord.models.answer.other