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
10 changes: 4 additions & 6 deletions frontend/src/components/DetailView/DetailView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const EditToggleButton = <T,>({
id="edit-button"
onClick={handleClick}
variant={mode.read ? 'contained' : 'outlined'}
style={{ width: '8em' }}
style={{ width: '12em', height: '3em' }}
>
<EditIcon style={{ marginRight: '0.5em' }} /> {mode.read ? 'Edit' : 'Cancel edit'}
</Button>
Expand Down Expand Up @@ -254,13 +254,11 @@ export const DetailView = <T extends object>({
<DetailBrowser<T> />
</Box>
)}
<Box
sx={{ display: 'flex', justifyContent: 'space-between', alignContent: 'space-between', marginTop: 'auto' }}
>
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginTop: 'auto' }}>
<Box sx={{ display: 'flex' }} gap={3}>
{!isUserPage && <ReturnButton />}
</Box>
<Box sx={{ display: 'flex' }} gap={1}>
<Box sx={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }} gap={1}>
{!isPersonPage && !isNew && <ContactForm<T> buttonText="Contact" />}
<EditToggleButton<T>
canEdit={!!editRights.edit && !mode.staging}
Expand All @@ -274,7 +272,7 @@ export const DetailView = <T extends object>({
id="delete-button"
onClick={onDelete}
variant="contained"
sx={{ width: '8em', color: 'white' }}
sx={{ width: '8em', height: '3em' }}
color="error"
disabled={deleteDisabled}
>
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/components/DetailView/common/ContactModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ export const ContactModal = ({

return (
<Box>
<Button onClick={() => setOpen(true)} variant="outlined" startIcon={<EmailIcon />} className="button">
<Button
style={{ width: '8em', height: '3em' }}
onClick={() => setOpen(true)}
variant="outlined"
startIcon={<EmailIcon />}
className="button"
>
{buttonText}
</Button>
<Modal
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/DetailView/components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ export const WriteButton = <T,>({
needsTaxonomyAcknowledgement
}
id="write-button"
sx={{ width: '20em' }}
sx={{ width: '20em', height: '3em' }}
onClick={() => {
if (mode.staging) {
void handleWriteButtonClick()
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/TableView/TableToolBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ export const TableToolBar = <T extends MRT_RowData>({
{showContactButton && <ContactForm<T> buttonText="Contact" noContext={true} />}
{showNewButton && (
<Button
style={{ height: '3em' }}
id="new-button"
variant="outlined"
component={Link}
Expand Down
Loading