talksik/nirvana-v3
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trying things with scroll and such

Browse Source
This commit is contained in:
talksik
2022-06-20 10:18:52 -05:00
parent 436fd3a2ba
commit 660e5ef178
2 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/desktop/src/tree/MainPanel.tsx
+43 -43
View File
@@ -78,48 +78,6 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste
return (
<Container maxWidth={false} disableGutters>
<Stack direction={'column'} sx={{ position: 'relative' }}>
{/* conversation header details and controls */}
<Box sx={{ p: 2, boxShadow: 3, zIndex: 10 }}>
<Stack direction="row" alignItems="center">
<IconButton color="primary" size="small">
<FiSun />
</IconButton>
<ConversationLabel
users={masterConversation.members}
conversationName={masterConversation.name}
isSelected={true}
/>
{/* conversation controls */}
<Stack
direction="row"
alignItems="center"
sx={{
ml: 'auto',
}}
spacing={1}
>
<Tooltip title="Add to priority panel!">
{isPriority ? (
<Fab size="small" color="primary">
<FiZap />
</Fab>
) : (
<IconButton size="small">
<FiZap />
</IconButton>
)}
</Tooltip>
<Tooltip title="Add people to the conversation">
<IconButton size="small">
<FiUserPlus />
</IconButton>
</Tooltip>
</Stack>
</Stack>
</Box>
{/* main canvas */}
<Container maxWidth={'sm'} sx={{ pt: 2 }}>
<Stack spacing={1} sx={{ display: 'flex', flexDirection: 'column', py: 2 }}>
@@ -166,6 +124,48 @@ function ConversationDetails({ masterConversation }: { masterConversation: Maste
})}
</Stack>
</Container>
{/* conversation header details and controls */}
<Box sx={{ p: 2, boxShadow: 3, zIndex: 10, position: 'sticky' }}>
<Stack direction="row" alignItems="center">
<IconButton color="primary" size="small">
<FiSun />
</IconButton>
<ConversationLabel
users={masterConversation.members}
conversationName={masterConversation.name}
isSelected={true}
/>
{/* conversation controls */}
<Stack
direction="row"
alignItems="center"
sx={{
ml: 'auto',
}}
spacing={1}
>
<Tooltip title="Add to priority panel!">
{isPriority ? (
<Fab size="small" color="primary">
<FiZap />
</Fab>
) : (
<IconButton size="small">
<FiZap />
</IconButton>
)}
</Tooltip>
<Tooltip title="Add people to the conversation">
<IconButton size="small">
<FiUserPlus />
</IconButton>
</Tooltip>
</Stack>
</Stack>
</Box>
</Stack>
</Container>
);
@@ -254,7 +254,7 @@ function ConversationChunk() {
<Box sx={{ position: 'relative', p: 4 }}>
<Slider
aria-label="Restricted values"
defaultValue={25}
defaultValue={0}
valueLabelFormat={valueLabelFormat}
getAriaValueText={valuetext}
valueLabelDisplay="on"
packages/desktop/src/tree/Terminal.tsx
+1
View File
@@ -52,6 +52,7 @@ export default function Terminal() {
display: 'flex',
flexDirection: 'column',
maxHeight: '100vh',
overflowY: 'auto',
}}
>
<MainPanel />