Skip to content

Commit

Permalink
Merge pull request #35 from CybercentreCanada/hotfix/drawer_head
Browse files Browse the repository at this point in the history
Hotfix/drawer head
  • Loading branch information
cccs-sgaron authored Mar 23, 2021
2 parents e08df70 + 742e553 commit a7bc1f9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/components/routes/alerts/alert-details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import VerifiedUserOutlinedIcon from '@material-ui/icons/VerifiedUserOutlined';
import { Skeleton } from '@material-ui/lab';
import Alert from '@material-ui/lab/Alert';
import useClipboard from 'commons/components/hooks/useClipboard';
import PageCenter from 'commons/components/layout/pages/PageCenter';
import PageFullWidth from 'commons/components/layout/pages/PageFullWidth';
import useALContext from 'components/hooks/useALContext';
import useMyAPI from 'components/hooks/useMyAPI';
import { AlertItem } from 'components/routes/alerts/hooks/useAlerts';
Expand Down Expand Up @@ -89,7 +89,7 @@ const AlertDetails: React.FC<AlertDetailsProps> = ({ id, alert }) => {
}, [item]);

return (
<PageCenter margin={!alert ? 4 : 1} width="100%">
<PageFullWidth margin={!alert ? 4 : 1}>
{c12nDef.enforce && (
<div style={{ display: 'flex', alignItems: 'center', marginBottom: theme.spacing(2) }}>
<div style={{ flex: 1 }}>
Expand Down Expand Up @@ -525,7 +525,7 @@ const AlertDetails: React.FC<AlertDetailsProps> = ({ id, alert }) => {
</div>
) : null}
</div>
</PageCenter>
</PageFullWidth>
);
};

Expand Down
2 changes: 1 addition & 1 deletion src/components/routes/alerts/alerts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ const Alerts: React.FC = () => {
marginRight: theme.spacing(-1),
position: 'sticky',
top: theme.spacing(1),
zIndex: 1
zIndex: 10
}}
>
<ListNavigator id={ALERT_SIMPLELIST_ID} />
Expand Down
2 changes: 1 addition & 1 deletion src/components/visual/DrawerProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function DrawerProvider(props: DrawerProviderProps) {
padding: theme.spacing(1),
position: 'sticky',
top: 0,
zIndex: 1
zIndex: 5
}}
>
<IconButton onClick={closeGlobalDrawer}>
Expand Down

0 comments on commit a7bc1f9

Please sign in to comment.