diff --git a/frontend/src/component/common/PercentageCircle/PercentageCircle.tsx b/frontend/src/component/common/PercentageCircle/PercentageCircle.tsx index bc9b139093..d3e5af849c 100644 --- a/frontend/src/component/common/PercentageCircle/PercentageCircle.tsx +++ b/frontend/src/component/common/PercentageCircle/PercentageCircle.tsx @@ -21,7 +21,7 @@ const PercentageCircle = ({ color: '#fff', backgroundColor: theme.palette.grey[200], backgroundImage: `conic-gradient(${ - theme.palette.primary.main + theme.palette.primary.light } ${percentage}%, ${secondaryPieColor || theme.palette.grey[200]} 1%)`, }; diff --git a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution.styles.ts b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution.styles.ts index 0ecbe7b5a5..e40c8fb75c 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution.styles.ts +++ b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution.styles.ts @@ -4,17 +4,21 @@ export const useStyles = makeStyles(theme => ({ container: { border: `1px solid ${theme.palette.grey[300]}`, borderRadius: '5px', - width: '500px', + width: '50%', marginLeft: '1rem', display: 'flex', flexDirection: 'column', alignItems: 'center', }, + headerContainer: { + width: '100%', + backgroundColor: '#efefef', + }, header: { - color: theme.palette.primary.main, - textAlign: 'center', - margin: '0.5rem 0', - fontSize: theme.fontSizes.mainHeader, - marginTop: '1rem', + color: '#000', + textAlign: 'left', + margin: '1rem 1.2rem', + fontSize: theme.fontSizes.bodySize, + fontWeight: 'normal', }, })); diff --git a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution.tsx b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution.tsx index 801832fcd1..d2f1bd4ca2 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution.tsx @@ -36,9 +36,12 @@ const FeatureEnvironmentStrategyExecution = ({ return (
-

- Visual overview of your strategy configuration -

+
+
+ Visual overview of your strategy configuration +
+
+ {renderStrategies()}
); diff --git a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecutionSeparator/FeatureEnvironmentStrategyExecutionSeparator.tsx b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecutionSeparator/FeatureEnvironmentStrategyExecutionSeparator.tsx index 544af838dc..c2622fdd52 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecutionSeparator/FeatureEnvironmentStrategyExecutionSeparator.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecutionSeparator/FeatureEnvironmentStrategyExecutionSeparator.tsx @@ -5,7 +5,6 @@ const FeatureEnvironmentStrategyExecutionSeparator = () => { const styles = useStyles(); return (
-
diff --git a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironmentList/FeatureStrategiesEnvironmentList.styles.ts b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironmentList/FeatureStrategiesEnvironmentList.styles.ts index ba810f2234..7f8022d8a8 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironmentList/FeatureStrategiesEnvironmentList.styles.ts +++ b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironmentList/FeatureStrategiesEnvironmentList.styles.ts @@ -44,7 +44,6 @@ export const useStyles = makeStyles(theme => ({ top: '-65px', display: 'flex', justifyContent: 'space-between', - width: '100%', [theme.breakpoints.down(700)]: { top: '-94px', }, diff --git a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironmentList/FeatureStrategiesEnvironmentList.tsx b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironmentList/FeatureStrategiesEnvironmentList.tsx index fb44f35deb..eca39f750c 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironmentList/FeatureStrategiesEnvironmentList.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironmentList/FeatureStrategiesEnvironmentList.tsx @@ -149,16 +149,18 @@ const FeatureStrategiesEnvironmentList = ({ condition={!expandedSidebar} show={
- +
+ +
} /> diff --git a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.styles.ts b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.styles.ts index 54dc08a317..4e0625a327 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.styles.ts +++ b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.styles.ts @@ -24,8 +24,8 @@ export const useStyles = makeStyles(theme => ({ }, }, outerTabContentContainer: { - marginTop: '1rem', - padding: '0rem 2rem 2rem 2rem', + margin: '1rem 2rem', + paddingBottom: '2rem', display: 'flex', flexDirection: 'column', [theme.breakpoints.down(700)]: { @@ -73,7 +73,10 @@ export const useStyles = makeStyles(theme => ({ configureStrategy: { display: 'none', }, - addStrategyButton: { marginLeft: 'auto' }, + addStrategyButton: { + marginLeft: 'auto', + marginTop: '10px', + }, tabNavigation: { backgroundColor: 'transparent', textTransform: 'none', diff --git a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.tsx b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.tsx index 35a9d183c2..dfe87e7d6f 100644 --- a/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.tsx +++ b/frontend/src/component/feature/FeatureView2/FeatureStrategies/FeatureStrategiesEnvironments/FeatureStrategiesEnvironments.tsx @@ -20,7 +20,6 @@ import FeatureStrategiesUIContext from '../../../../../contexts/FeatureStrategie import ConditionallyRender from '../../../../common/ConditionallyRender'; import FeatureStrategiesConfigure from './FeatureStrategiesConfigure/FeatureStrategiesConfigure'; import FeatureStrategiesRefresh from './FeatureStrategiesRefresh/FeatureStrategiesRefresh'; -import FeatureEnvironmentStrategyExecution from './FeatureEnvironmentStrategyExecution/FeatureEnvironmentStrategyExecution'; import ResponsiveButton from '../../../../common/ResponsiveButton/ResponsiveButton'; import AccessContext from '../../../../../contexts/AccessContext'; @@ -291,26 +290,11 @@ const FeatureStrategiesEnvironments = () => { env.strategies.length > 0 || expandedSidebar } show={ - <> -
- -
- - } +
+ - +
} elseShow={ ({ marginLeft: 'auto', }, icon: { - fill: theme.palette.primary.main, + marginRight: '0.5rem', + fill: theme.palette.grey[600], minWidth: '50px', }, rollout: {