diff --git a/web/pgadmin/static/js/components/PgTable.jsx b/web/pgadmin/static/js/components/PgTable.jsx
index 43fc44ce..b0a064b1 100644
--- a/web/pgadmin/static/js/components/PgTable.jsx
+++ b/web/pgadmin/static/js/components/PgTable.jsx
@@ -34,7 +34,7 @@ const useStyles = makeStyles((theme) => ({
borderSpacing: 0,
width: '100%',
overflow: 'hidden',
- height: '99.7%',
+ height: '100%',
backgroundColor: theme.otherVars.tableBg,
...theme.mixins.panelBorder,
//backgroundColor: theme.palette.background.default,
diff --git a/web/pgadmin/static/js/helpers/wizard/Wizard.jsx b/web/pgadmin/static/js/helpers/wizard/Wizard.jsx
index fbb4b6ac..29f070b4 100644
--- a/web/pgadmin/static/js/helpers/wizard/Wizard.jsx
+++ b/web/pgadmin/static/js/helpers/wizard/Wizard.jsx
@@ -12,64 +12,74 @@ import clsx from 'clsx';
import FastForwardIcon from '@material-ui/icons/FastForward';
import FastRewindIcon from '@material-ui/icons/FastRewind';
import ChevronRightIcon from '@material-ui/icons/ChevronRight';
+import DoneIcon from '@material-ui/icons/Done';
import HelpIcon from '@material-ui/icons/HelpRounded';
import CheckIcon from '@material-ui/icons/Check';
import { DefaultButton, PrimaryButton, PgIconButton } from '../../../../static/js/components/Buttons';
import PropTypes from 'prop-types';
import { Box } from '@material-ui/core';
import gettext from 'sources/gettext';
+import Loader from 'sources/components/Loader';
const useStyles = makeStyles((theme) =>
({
wizardBase: {
- height: '100%'
+ height: '100%',
+ display: 'flex',
+ flexDirection: 'column'
},
root: {
display: 'flex',
flexDirection: 'column',
- height: '100%',
+ flexGrow: 1,
+ minHeight: 0
},
wizardTitle: {
- top: '0 !important',
- opacity: '1 !important',
- borderRadius: '6px 6px 0px 0px !important',
- margin: '0 !important',
- width: '100%',
- height: '6%'
+ //top: '0 !important',
+ //opacity: '1 !important',
+ //borderRadius: '6px 6px 0px 0px !important',
+ //margin: '0 !important',
+ //width: '100%',
+ //height: '6%'
},
rightPanel: {
position: 'relative',
- minHeight: 100,
display: 'flex',
- paddingLeft: '1.5em',
- paddingTop: '0em',
- flex: 5,
+ flexBasis: '75%',
overflow: 'auto',
height: '100%',
+ minHeight: '100px'
},
leftPanel: {
display: 'flex',
- // padding: '2em',
+ flexBasis: '25%',
flexDirection: 'column',
alignItems: 'flex-start',
borderRight: '1px solid',
...theme.mixins.panelBorder.right,
- flex: 1.6
},
label: {
display: 'inline-block',
position: 'relative',
- paddingLeft: '0.5em',
- flex: 6
+ paddingLeft: '0.5rem',
+ flexBasis: '70%'
},
labelArrow: {
display: 'inline-block',
position: 'relative',
- flex: 1
+ flexBasis: '30%'
+ },
+ labelDone: {
+ display: 'inline-block',
+ position: 'relative',
+ flexBasis: '30%',
+ color: theme.otherVars.activeStepBg + ' !important',
+ padding: '4px'
},
stepLabel: {
padding: '1em',
+ paddingRight: 0
},
active: {
fontWeight: 600
@@ -99,19 +109,9 @@ const useStyles = makeStyles((theme) =>
borderTop: '1px solid #dde0e6 !important',
padding: '0.5rem',
display: 'flex',
- flexDirection: 'row',
- flex: 1,
- position: 'absolute',
- verticalAlign: 'bottom',
- bottom: 0,
- zIndex: 999,
width: '100%',
- background: theme.otherVars.headerBg
- },
- wizardPanelContent: {
- paddingTop: '0.9em !important',
- overflow: 'hidden',
- paddingBottom: '6.3em'
+ background: theme.otherVars.headerBg,
+ zIndex: 999,
},
backButton: {
marginRight: theme.spacing(1),
@@ -129,13 +129,10 @@ const useStyles = makeStyles((theme) =>
stepDefaultStyle: {
width: '100%',
height: '100%',
- paddingBottom: '1em',
- paddingRight: '1em',
- overflow: 'hidden',
- minHeight: 0,
- position: 'relative'
+ padding: '8px',
+ display: 'flex',
+ flexDirection: 'column',
}
-
}),
);
@@ -192,14 +189,16 @@ function Wizard({ stepList, onStepChange, onSave, className, ...props }) {