Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into enterprise-features
Browse files Browse the repository at this point in the history
  • Loading branch information
JeraldJF committed Oct 30, 2024
2 parents 0937d54 + 99a6999 commit 7f23dfa
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ const ConnectorConfiguration: React.FC = () => {

return (
<Box>
<Box mx={4}>
<Box mx={4} my={1}>
<Button
variant="text"
sx={{ color: theme.palette.common.black }}
Expand All @@ -209,7 +209,7 @@ const ConnectorConfiguration: React.FC = () => {
className={`${styles.formContainer} ${isHelpSectionOpen ? styles.expanded : styles.collapsed}`}
pr={4}
pl={3}
sx={{ boxShadow: 'none', marginBottom: '30rem' }}
sx={{ boxShadow: 'none' }}
>
{errorMessage ? (
<Typography variant="h6" color="error" textAlign="center" py={32}>
Expand Down Expand Up @@ -286,7 +286,15 @@ const ConnectorConfiguration: React.FC = () => {
</Box>
<Box
className={`${isHelpSectionOpen ? styles.expanded : styles.collapsed}`}
mt={4}
mt={8}
sx={{
position: 'fixed',
bottom: 0,
right: 0,
left: -50,
backgroundColor: theme.palette.background.paper,
zIndex: 100
}}
pr={5}
>
<Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ const Processing: React.FC = () => {
flex: 1,
overflowY: 'auto',
paddingBottom: '80px',
paddingTop: '3.5rem'
paddingTop: '1rem'
}}
>
<Box mx={3.5} mb={2}>
Expand Down
2 changes: 1 addition & 1 deletion web-console-v2/src/pages/alertManager/views/AlertRules.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const AlertRules = () => {
return (
<Grid container spacing={3}>
<Grid item xs={12} id="tabSectionStart">
<Box sx={{ width: '100%' }}>
<Box sx={{ width: '100%', margin: '1rem' }}>
{renderTabs()}
<Grid marginTop={1}>
<Outlet />
Expand Down

0 comments on commit 7f23dfa

Please sign in to comment.