cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-13 18:59:22 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix: apply border when sidebar collapsed

Browse source
This commit is contained in:
Paul Makles 2021-12-30 18:35:13 +00:00
parent b5789126f8
commit a921e8ed0d
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/pages/RevoltApp.tsx
View file

@ -5,6 +5,9 @@ import styled, { css } from "styled-components";
import ContextMenus from "../lib/ContextMenus"; import ContextMenus from "../lib/ContextMenus";
import { isTouchscreenDevice } from "../lib/isTouchscreenDevice"; import { isTouchscreenDevice } from "../lib/isTouchscreenDevice";
import { useApplicationState } from "../mobx/State";
import { SIDEBAR_CHANNELS } from "../mobx/stores/Layout";
import Popovers from "../context/intermediate/Popovers"; import Popovers from "../context/intermediate/Popovers";
import Notifications from "../context/revoltjs/Notifications"; import Notifications from "../context/revoltjs/Notifications";
import StateMonitor from "../context/revoltjs/StateMonitor"; import StateMonitor from "../context/revoltjs/StateMonitor";
@ -45,12 +48,16 @@ const StatusBar = styled.div`
} }
`; `;
const Routes = styled.div.attrs({ "data-component": "routes" })` const Routes = styled.div.attrs({ "data-component": "routes" })<{
borders: boolean;
}>`
min-width: 0; min-width: 0;
display: flex; display: flex;
flex-direction: column;
position: relative; position: relative;
flex-direction: column;
background: var(--primary-background); background: var(--primary-background);
/*background-color: rgba( /*background-color: rgba(
var(--primary-background-rgb), var(--primary-background-rgb),
max(var(--min-opacity), 0.75) max(var(--min-opacity), 0.75)
@ -62,10 +69,17 @@ const Routes = styled.div.attrs({ "data-component": "routes" })`
css` css`
overflow: hidden; overflow: hidden;
`} `}
${(props) =>
props.borders &&
css`
border-start-start-radius: 8px;
`}
`; `;
export default function App() { export default function App() {
const path = useLocation().pathname; const path = useLocation().pathname;
const layout = useApplicationState().layout;
const fixedBottomNav = const fixedBottomNav =
path === "/" || path === "/settings" || path.startsWith("/friends"); path === "/" || path === "/settings" || path.startsWith("/friends");
const inChannel = path.includes("/channel"); const inChannel = path.includes("/channel");
@ -107,7 +121,10 @@ export default function App() {
height: 50, height: 50,
}} }}
docked={isTouchscreenDevice ? Docked.None : Docked.Left}> docked={isTouchscreenDevice ? Docked.None : Docked.Left}>
<Routes> <Routes
borders={
!layout.getSectionState(SIDEBAR_CHANNELS, true)
}>
<Switch> <Switch>
<Route <Route
path="/server/:server/channel/:channel/settings/:page" path="/server/:server/channel/:channel/settings/:page"