Skip to content

Commit 0f643b8

Browse files
committed
Fix style issues
1 parent f3e35b6 commit 0f643b8

8 files changed

Lines changed: 22 additions & 19 deletions

File tree

web/src/components/appLayouts/AuthenticatedLayout.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ export const AuthenticatedLayout = () => {
2222
<InternalHeader />
2323
<Notification />
2424
<NotificationModal />
25-
<Box
26-
component="main"
27-
sx={{ flexGrow: 1, marginTop: { xs: '3.5em', md: '6.5em' }, width: '100%', overflowX: 'auto' }}
25+
<ScrollToTop />
26+
<FormioListener />
27+
<LocalizationProvider
28+
dateFormats={{
29+
keyboardDate: 'YYYY-MM-DD',
30+
}}
31+
dateAdapter={AdapterDayjs}
2832
>
29-
<ScrollToTop />
30-
<FormioListener />
31-
<LocalizationProvider
32-
dateFormats={{
33-
keyboardDate: 'YYYY-MM-DD',
34-
}}
35-
dateAdapter={AdapterDayjs}
33+
<Box
34+
component="main"
35+
sx={{ flexGrow: 1, marginTop: { xs: '3.5em', md: '6.5em' }, width: '100%', overflowX: 'auto' }}
3636
>
3737
<Outlet />
38-
</LocalizationProvider>
39-
<FeedbackModal />
40-
</Box>
38+
<FeedbackModal />
39+
</Box>
40+
</LocalizationProvider>
4141
</Box>
4242
<Box
4343
sx={{

web/src/components/appLayouts/SimplifiedLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const SimplifiedLayout = () => {
2424
<Box sx={{ display: 'flex', flexDirection: 'column' }}>
2525
<Notification />
2626
<NotificationModal />
27-
<Box component="main" sx={{ flexGrow: 1, width: '100%', overflowX: 'auto' }}>
27+
<Box sx={{ flexGrow: 1, width: '100%', overflowX: 'auto' }}>
2828
<ScrollToTop />
2929
<FormioListener />
3030
<LocalizationProvider dateFormats={{ keyboardDate: 'YYYY-MM-DD' }} dateAdapter={AdapterDayjs}>

web/src/components/common/Input/TextInput.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ export const TextInput: React.FC<TextInputProps> = ({
9090
border: 'none',
9191
...inputProps,
9292
sx: {
93+
padding: 0,
9394
'&::placeholder': {
9495
color: colors.type.regular.secondary,
9596
},

web/src/components/engagement/admin/view/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ const AdminEngagementView = () => {
6161
justifyContent: 'flex-start',
6262
borderBottom: '2px solid',
6363
borderBottomColor: 'gray.60',
64-
width: 'calc(100% - 7.75rem)',
64+
width: '100%',
6565
minWidth: 'max-content',
66+
maxWidth: '700px',
6667
},
6768
}}
6869
>

web/src/components/engagement/public/view/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ export const PublicEngagementView = () => {
2222
const { slug, engagementId, language } = useParams();
2323
const viewKey = `${slug ?? engagementId ?? 'engagement'}-${language ?? 'default'}`;
2424
return (
25-
<main key={viewKey}>
25+
<React.Fragment key={viewKey}>
2626
<EngagementHero />
2727
<EngagementDescription />
2828
<EngagementDetailsTabs />
2929
<EngagementSurveyBlock />
3030
<EngagementSubscribeBlock />
3131
<SuggestedEngagements />
32-
</main>
32+
</React.Fragment>
3333
);
3434
};
3535

web/src/components/language/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const LanguageAdminPanel = () => {
8686
}, []);
8787

8888
return (
89-
<ResponsiveContainer component="main" data-testid="language-admin-panel">
89+
<ResponsiveContainer data-testid="language-admin-panel">
9090
<AutoBreadcrumbs />
9191
<Grid size={12}>
9292
<Heading1>Languages</Heading1>

web/src/components/layout/Header/EnvironmentBanner.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const EnvironmentBanner = () => {
2525
borderColor="warning.main"
2626
textAlign="left"
2727
alignItems="center"
28+
flexWrap="nowrap"
2829
lineHeight="28px"
2930
>
3031
<BodyText component="span" fontSize="22px" color="warning.dark">

web/src/styles/Theme.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,8 @@ export const AdminDarkTheme = createTheme({
582582
...DarkTheme.palette,
583583
},
584584
components: {
585-
...DarkTheme.components,
586585
...AdminTheme.components,
586+
...DarkTheme.components,
587587
},
588588
});
589589

0 commit comments

Comments
 (0)