Skip to content
This repository has been archived by the owner on Mar 24, 2023. It is now read-only.

Updates to polish some of the config items #1112

Merged
merged 3 commits into from
May 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/init/src/components/config_render/ConfigCheckbox.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default class ConfigCheckbox extends React.Component {
return (
<div className={`field field-checkbox-wrapper u-marginTop--15 flex ${hidden ? "hidden" : ""}`}>
<span className="u-marginTop--10 config-errblock" id={`${this.props.name}-errblock`}></span>
<div className="flex-auto flex u-marginRight--20">
<div className="flex1 flex u-marginRight--20">
<input
ref={(checkbox) => this.checkbox = checkbox}
type="checkbox"
Expand Down
2 changes: 1 addition & 1 deletion web/init/src/components/config_render/ConfigRadio.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default class ConfigRadio extends React.Component {
const checked = val === this.props.name;

return (
<div className="flex-auto flex alignItems--center u-marginRight--20">
<div className="flex-auto flex alignItems--center u-marginRight--20 u-marginTop--10">
<input
type="radio"
name={this.props.group}
Expand Down
2 changes: 1 addition & 1 deletion web/init/src/components/config_render/ConfigSelectOne.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default class ConfigSelectOne extends React.Component {
</Markdown>
</p>
: null}
<div className="field-input-wrapper u-marginTop--15 flex flexWrap--wrap">
<div className="field-input-wrapper u-marginTop--5 flex flexWrap--wrap">
{options}
</div>
</div>
Expand Down
11 changes: 4 additions & 7 deletions web/init/src/components/config_render/FileInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,12 @@ export default class FileInput extends React.Component {
/>
<label htmlFor={`${this.props.name} selector`} className="u-position--relative">
<span className={`icon clickable ${this.state.fileAdded || this.props.value ? "u-smallCheckGreen" : "u-ovalIcon"} u-marginRight--normal u-top--3`}></span>
{this.state.fileAdded || this.props.value ? `${this.props.title} file selected` : `Browse files for ${this.props.title}`}
{this.state.fileAdded || this.props.value ? this.props.multiple ? this.state.fileNames.join(",") : this.state.fileName : `Browse files for ${this.props.title}`}
{this.state.fileAdded || this.props.value ?
<p className="u-color--astral u-textDecoration--underlineOnHover u-fontSize--small u-marginLeft--30 u-marginTop--5">Select a different file</p>
: null }
</label>
</div>
{this.state.fileAdded || this.props.value ?
<div className="u-color--tuna u-marginLeft--normal"> File uploaded:
<p className="Form-label-subtext"> {this.props.multiple ? this.state.fileNames.join(",") : this.state.fileName} </p>
<p className="Form-label-subtext"> {this.props.getFilenamesText} </p>
</div>
: null}
</div>
</div>
<small className="text-danger"> {this.state.errText}</small>
Expand Down
2 changes: 0 additions & 2 deletions web/init/src/scss/utilities/forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ input[type="file"] {
display: inline-block;
padding: 15px 17px;
cursor: pointer;
width: 249px;
border-radius: 4px;
}

Expand All @@ -93,7 +92,6 @@ input[type="file"] {
display: inline-block;
padding: 15px 17px;
cursor: pointer;
width: 249px;
border-radius: 4px;
color: #323232;
}