Skip to content

Pull button margins up to its container #3828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcoyne merged 1 commit into from
Nov 29, 2023
Merged

Pull button margins up to its container #3828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/components/WindowListButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ export class WindowListButton extends Component {
aria-label={t('listAllOpenWindows')}
aria-owns={windowListAnchor ? 'window-list' : null}
sx={{
margin: 1,
...(windowListAnchor && {
backgroundColor: 'action.selected',
}),
Expand Down
3 changes: 3 additions & 0 deletions src/components/WorkspaceControlPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ const StyledWorkspaceButtons = styled('div')(({ theme }) => ({
[theme.breakpoints.up('sm')]: {
display: 'flex',
flexDirection: 'column',
gap: theme.spacing(2),
marginBottom: theme.spacing(1),
marginTop: theme.spacing(1),
},
}));

Expand Down
6 changes: 1 addition & 5 deletions src/components/WorkspaceControlPanelButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import { Component } from 'react';
import { styled } from '@mui/material/styles';
import FullScreenButton from '../containers/FullScreenButton';
import WorkspaceMenuButton from '../containers/WorkspaceMenuButton';
import WorkspaceOptionsButton from '../containers/WorkspaceOptionsButton';
import WindowListButton from '../containers/WindowListButton';
import { PluginHook } from './PluginHook';

const StyledFullScreenButton = styled(FullScreenButton)({
});

/**
*
*/
Expand All @@ -24,7 +20,7 @@ export class WorkspaceControlPanelButtons extends Component {
<WindowListButton />
<WorkspaceMenuButton />
<WorkspaceOptionsButton />
<StyledFullScreenButton sx={{ margin: 1 }} />
<FullScreenButton />
<PluginHook {...this.props} />
</>
);
Expand Down
1 change: 0 additions & 1 deletion src/components/WorkspaceMenuButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ export class WorkspaceMenuButton extends Component {
aria-label={t('workspaceMenu')}
aria-owns={open ? 'workspace-menu' : undefined}
sx={{
margin: 1,
...(open && {
backgroundColor: 'action.selected',
}),
Expand Down
8 changes: 2 additions & 6 deletions src/components/WorkspaceOptionsButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import MoreHorizontalIcon from '@mui/icons-material/MoreHorizSharp';
import MiradorMenuButton from '../containers/MiradorMenuButton';
import WorkspaceOptionsMenu from '../containers/WorkspaceOptionsMenu';

const StyledMiradorMenuButton = styled(MiradorMenuButton)({
});

/**
* WorkspaceOptionsButton ~
*/
Expand Down Expand Up @@ -54,18 +51,17 @@ export class WorkspaceOptionsButton extends Component {

return (
<>
<StyledMiradorMenuButton
<MiradorMenuButton
aria-label={t('workspaceOptions')}
onClick={this.handleMenuClick}
sx={{
margin: 1,
...(open && {
backgroundColor: 'action.selected',
}),
}}
>
<MoreHorizontalIcon />
</StyledMiradorMenuButton>
</MiradorMenuButton>
<WorkspaceOptionsMenu
anchorEl={anchorEl}
handleClose={this.handleMenuClose}
Expand Down