From f95376f575e61b7eef28ed6f6ac7c1c9516ad81f Mon Sep 17 00:00:00 2001 From: GraysonNull Date: Tue, 26 Mar 2019 12:28:26 -0700 Subject: [PATCH] [ch10189] labels, headings and bools respect when conditions --- web/app/package.json | 2 +- web/init/src/components/config_render/ConfigGroup.jsx | 3 ++- web/init/src/components/config_render/ConfigItemTitle.jsx | 2 +- web/init/src/scss/components/shared/StepNumbers.scss | 4 ---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/web/app/package.json b/web/app/package.json index f1428d0a0..23732d060 100644 --- a/web/app/package.json +++ b/web/app/package.json @@ -10,7 +10,7 @@ "react-dom": "^16.5.0" }, "scripts": { - "start": "PORT=8800 react-scripts-replicated start", + "start": "PORT=8880 react-scripts-replicated start", "build": "react-scripts-replicated build", "test": "react-scripts-replicated test --env=jsdom", "eject": "react-scripts-replicated eject" diff --git a/web/init/src/components/config_render/ConfigGroup.jsx b/web/init/src/components/config_render/ConfigGroup.jsx index 1aa14782c..ddb910a61 100644 --- a/web/init/src/components/config_render/ConfigGroup.jsx +++ b/web/init/src/components/config_render/ConfigGroup.jsx @@ -60,6 +60,7 @@ export default class ConfigGroup extends React.Component { title={item.title} recommended={item.recommended} required={item.required} + hidden={item.hidden} name={item.name} /> @@ -88,7 +89,7 @@ export default class ConfigGroup extends React.Component { ); case "heading": return ( -
+

{item.title}

); diff --git a/web/init/src/components/config_render/ConfigItemTitle.jsx b/web/init/src/components/config_render/ConfigItemTitle.jsx index e1b837c0f..0481d24a3 100644 --- a/web/init/src/components/config_render/ConfigItemTitle.jsx +++ b/web/init/src/components/config_render/ConfigItemTitle.jsx @@ -10,7 +10,7 @@ export default class ConfigItemTitle extends React.Component { } = this.props; return ( -

{title} { +

{title} { required ? Required : recommended ? diff --git a/web/init/src/scss/components/shared/StepNumbers.scss b/web/init/src/scss/components/shared/StepNumbers.scss index 4143943ad..09b6b1a9e 100644 --- a/web/init/src/scss/components/shared/StepNumbers.scss +++ b/web/init/src/scss/components/shared/StepNumbers.scss @@ -38,10 +38,6 @@ .progress-base { background-color: #dfdfdf; } - - .numbers-wrapper { - margin: 0; - } } .step-number {