Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/renderer/src/components/PlanTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const ScrollableTabsButtonAuto = (props: IProps) => {
/>
</Tabs>
</AppBar>
<Box sx={{ pt: `${TabHeight}px` }}>
<Box>
{tab === PlanTabEnum.sectionPassage && (
<ScriptureTable {...props} colNames={colNames} />
)}
Expand Down
37 changes: 13 additions & 24 deletions src/renderer/src/components/Sheet/PassageCard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ISheet } from '../../model';
import { Button, Card, CardContent, Typography } from '@mui/material';
import { Box, Button, Card, CardContent, Typography } from '@mui/material';
import {
ArrowForwardIos,
Person,
Expand Down Expand Up @@ -35,10 +35,10 @@ export function PassageCard(props: IProps) {
variant="text"
sx={{
minWidth: 0,
p: 0,
ml: 1,
width: 48,
height: 48,
mt: '-.25rem',
width: 40,
height: 40,
backgroundColor: 'transparent',
'&:hover': {
backgroundColor: '#f0f0f0',
Expand All @@ -60,34 +60,23 @@ export function PassageCard(props: IProps) {
)}
</Button>
) : (
<Button
variant="text"
<Box
sx={{
minWidth: 0,
p: 0,
display: 'inline-flex',
ml: 1,
width: 48,
height: 48,
backgroundColor: 'transparent',
'&:hover': {
backgroundColor: '#f0f0f0',
},
mt: '-.25rem',
width: 40,
height: 40,
borderRadius: '50%',
verticalAlign: 'middle',
}}
onClick={undefined}
>
<PlayCircleOutline
sx={{ verticalAlign: 'middle' }}
fontSize="large"
color="disabled"
/>
</Button>
/>
)}
</Typography>
<Typography variant="body2" color="grey" sx={{ mt: 1 }}>
<Typography variant="body2" color="grey">
{cardInfo.comment || '\u00A0'}
</Typography>
<Typography sx={{ margin: '1rem 0' }}>
<Typography sx={{ margin: '1.5rem 0 .5rem 0' }}>
<Person sx={{ verticalAlign: 'middle', mb: '.5rem' }} />
{assignedGroup}
</Typography>
Expand Down
8 changes: 6 additions & 2 deletions src/renderer/src/components/Sheet/PlanView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,17 @@ export function PlanView(props: IProps) {
display: 'flex',
flexDirection: 'column',
gap: '1rem',
padding: '1.5rem',
padding: '1rem',
}}
>
{rowInfo.map((row, i) => {
if (row.kind === 0) {
return (
<Typography key={row.sectionId?.id} variant="h4">
<Typography
key={row.sectionId?.id}
variant="h4"
sx={{ mt: '1.5rem' }}
>
Section {row.sectionSeq}
</Typography>
);
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/routes/PlanScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const PlanScreen = () => {
<Box sx={{ width: '100%' }}>
<AppHead switchTo={false} />
<PlanProvider>
<Box id="PlanScreen" sx={{ display: 'flex', paddingTop: '80px' }}>
<Box id="PlanScreen" sx={{ display: 'flex', paddingTop: '7.5rem' }}>
<PlanTabs checkSaved={checkSavedFn} />
</Box>
</PlanProvider>
Expand Down