Skip to content
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.

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

[To Main] Style hotfix for Chromium-based browsers #2572

Merged
merged 4 commits into from
Aug 6, 2024
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
7 changes: 7 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## August 6, 2024

- **Hotfix** Fix styling issues with the new admin header - 🎟️ HOTFIX
- Fixed an issue where page widths above 100% were causing the header to become misaligned
- Fixed a z-index issue with the tenant selector on mobile

## July 31, 2024

- **Feature** New footer (public and admin) [🎟️ DESENG-662](https://citz-gdx.atlassian.net/browse/DESENG-662)
Expand All @@ -7,6 +13,7 @@
## July 30, 2024

- **Feature** New admin header [🎟️ DESENG-660](https://citz-gdx.atlassian.net/browse/DESENG-660)

- Added a new API endpoint to fetch a list of a user's tenants, required for the new header
- Redesigned the admin header to match the new design system
- Added a new dropdown to the header to allow users to switch between tenants
Expand Down
5 changes: 4 additions & 1 deletion met-web/src/components/appLayouts/AuthenticatedLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ export const AuthenticatedLayout = () => {
<InternalHeader />
<Notification />
<NotificationModal />
<Box component="main" sx={{ flexGrow: 1, marginTop: { xs: '3.5em', md: '6.5em' } }}>
<Box
component="main"
sx={{ flexGrow: 1, marginTop: { xs: '3.5em', md: '6.5em' }, width: '100%', overflowX: 'auto' }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Was that right padding present on the header element? Maybe it was just introduced with a component.

>
<ScrollToTop />
<FormioListener />
<LocalizationProvider
Expand Down
7 changes: 3 additions & 4 deletions met-web/src/components/layout/Header/InternalHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ const InternalHeader = () => {
},
}}
>
<CssBaseline />
<AppBar
position="fixed"
sx={{
Expand All @@ -86,7 +87,6 @@ const InternalHeader = () => {
}}
data-testid="appbar-header"
>
<CssBaseline />
<Toolbar
sx={{
height: '4em',
Expand Down Expand Up @@ -132,10 +132,11 @@ const InternalHeader = () => {
transform: `rotate(${sideNavOpen ? '180deg' : '0'})`,
transition: 'transform 0.3s',
position: isMobileScreen ? 'relative' : undefined,
left: isMobileScreen ? '6px' : undefined,
right: isMobileScreen ? '6px' : undefined,
}}
/>
}
iconPosition="right"
sx={{
marginLeft: 'auto',
minWidth: 'unset',
Expand Down Expand Up @@ -269,8 +270,6 @@ const TenantSelector = ({
<TenantButtonContent isOpen={tenantDrawerOpen} />
</ButtonBase>
<Drawer
disableEnforceFocus
disablePortal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have to look these props up, so many cool things you can do with mui.

anchor="top"
open={tenantDrawerOpen}
onClose={() => {
Expand Down
Loading