mirror of
https://github.com/revoltchat/revite.git
synced 2024-12-26 23:42:11 -05:00
fix(sidebars): fixed sidebar margins
This commit is contained in:
parent
63e52fe69c
commit
2ce4136a52
2 changed files with 18 additions and 3 deletions
|
@ -27,14 +27,14 @@ export const GenericSidebarBase = styled.div<{
|
||||||
/*border-end-start-radius: 8px;*/
|
/*border-end-start-radius: 8px;*/
|
||||||
background: var(--secondary-background);
|
background: var(--secondary-background);
|
||||||
|
|
||||||
> :nth-child(1) {
|
/*> :nth-child(1) {
|
||||||
//border-end-start-radius: 8px;
|
//border-end-start-radius: 8px;
|
||||||
margin-top: 48px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
> :nth-child(2) {
|
> :nth-child(2) {
|
||||||
|
margin-top: 48px;
|
||||||
background: red;
|
background: red;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
${(props) =>
|
${(props) =>
|
||||||
props.mobilePadding &&
|
props.mobilePadding &&
|
||||||
|
|
|
@ -6,9 +6,12 @@ import { Presence } from "revolt-api/types/Users";
|
||||||
import { Channel } from "revolt.js/dist/maps/Channels";
|
import { Channel } from "revolt.js/dist/maps/Channels";
|
||||||
import { Server } from "revolt.js/dist/maps/Servers";
|
import { Server } from "revolt.js/dist/maps/Servers";
|
||||||
import { User } from "revolt.js/dist/maps/Users";
|
import { User } from "revolt.js/dist/maps/Users";
|
||||||
|
import styled, { css } from "styled-components";
|
||||||
|
|
||||||
import { useContext, useEffect, useMemo } from "preact/hooks";
|
import { useContext, useEffect, useMemo } from "preact/hooks";
|
||||||
|
|
||||||
|
import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
ClientStatus,
|
ClientStatus,
|
||||||
StatusContext,
|
StatusContext,
|
||||||
|
@ -18,6 +21,15 @@ import {
|
||||||
import { GenericSidebarBase } from "../SidebarBase";
|
import { GenericSidebarBase } from "../SidebarBase";
|
||||||
import MemberList, { MemberListGroup } from "./MemberList";
|
import MemberList, { MemberListGroup } from "./MemberList";
|
||||||
|
|
||||||
|
export const Container = styled.div`
|
||||||
|
margin-top: 48px;
|
||||||
|
|
||||||
|
${isTouchscreenDevice &&
|
||||||
|
css`
|
||||||
|
margin-top: 0;
|
||||||
|
`}
|
||||||
|
`;
|
||||||
|
|
||||||
export default function MemberSidebar() {
|
export default function MemberSidebar() {
|
||||||
const channel = useClient().channels.get(
|
const channel = useClient().channels.get(
|
||||||
useParams<{ channel: string }>().channel,
|
useParams<{ channel: string }>().channel,
|
||||||
|
@ -180,6 +192,9 @@ export const ServerMemberSidebar = observer(
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<GenericSidebarBase>
|
<GenericSidebarBase>
|
||||||
|
<Container className="test">
|
||||||
|
{isTouchscreenDevice && <div>Server settings go here</div>}
|
||||||
|
</Container>
|
||||||
<MemberList entries={entries} context={channel} />
|
<MemberList entries={entries} context={channel} />
|
||||||
</GenericSidebarBase>
|
</GenericSidebarBase>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue