Skip to content

Commit d6bcae1

Browse files
authored
Fixes #497: "Validation Message spacing (UI) issue" (#763)
* fixes #497 small ui changes * linting fix * added margin for bottom error message to be more consistent * 8px/24px margins as suggested * fix spacing issues * linting changes
1 parent 0cfd828 commit d6bcae1

File tree

4 files changed

+27
-13
lines changed

4 files changed

+27
-13
lines changed

webapp/src/components/github_repo_selector/github_repo_selector.jsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default class GithubRepoSelector extends PureComponent {
4242
const repoOptions = this.props.yourRepos.map((item) => ({value: item.full_name, label: item.full_name}));
4343

4444
return (
45-
<div className={'form-group margin-bottom x3'}>
45+
<div className={'form-group x3'}>
4646
<ReactSelectSetting
4747
name={'repo'}
4848
label={'Repository'}
@@ -57,8 +57,11 @@ export default class GithubRepoSelector extends PureComponent {
5757
removeValidate={this.props.removeValidate}
5858
value={repoOptions.find((option) => option.value === this.props.value)}
5959
/>
60-
<div className={'help-text'}>
61-
{'Returns GitHub repositories connected to the user account'} <br/>
60+
<div
61+
className={'help-text'}
62+
style={{marginTop: '8px', marginBottom: '24px'}}
63+
>
64+
{'Returns GitHub repositories connected to the user account'}
6265
</div>
6366
</div>
6467
);

webapp/src/components/modals/create_issue/create_issue.jsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export default class CreateIssueModal extends PureComponent {
7171
}
7272

7373
const {post} = this.props;
74-
const postId = (post) ? post.id : '';
74+
const postId = post ? post.id : '';
7575

7676
const issue = {
7777
title: this.state.issueTitle,
@@ -116,7 +116,8 @@ export default class CreateIssueModal extends PureComponent {
116116

117117
handleIssueTitleChange = (issueTitle) => this.setState({issueTitle});
118118

119-
handleIssueDescriptionChange = (issueDescription) => this.setState({issueDescription});
119+
handleIssueDescriptionChange = (issueDescription) =>
120+
this.setState({issueDescription});
120121

121122
renderIssueAttributeSelectors = () => {
122123
if (!this.state.repo || (this.state.repo.permissions && !this.state.repo.permissions.push)) {
@@ -147,7 +148,7 @@ export default class CreateIssueModal extends PureComponent {
147148
/>
148149
</>
149150
);
150-
}
151+
};
151152

152153
render() {
153154
if (!this.props.visible) {
@@ -162,7 +163,10 @@ export default class CreateIssueModal extends PureComponent {
162163
let issueTitleValidationError = null;
163164
if (this.state.showErrors && !this.state.issueTitleValid) {
164165
issueTitleValidationError = (
165-
<p className='help-text error-text'>
166+
<p
167+
className='help-text error-text'
168+
style={{marginTop: '8px', marginBottom: '24px'}}
169+
>
166170
<span>{requiredMsg}</span>
167171
</p>
168172
);
@@ -221,9 +225,7 @@ export default class CreateIssueModal extends PureComponent {
221225
backdrop='static'
222226
>
223227
<Modal.Header closeButton={true}>
224-
<Modal.Title>
225-
{'Create GitHub Issue'}
226-
</Modal.Title>
228+
<Modal.Title>{'Create GitHub Issue'}</Modal.Title>
227229
</Modal.Header>
228230
<form
229231
role='form'

webapp/src/components/react_select_setting.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@ export default class ReactSelectSetting extends React.PureComponent {
9797
let validationError = null;
9898
if (this.props.required && this.state.invalid) {
9999
validationError = (
100-
<p className='help-text error-text'>
100+
<p
101+
className='help-text error-text'
102+
style={{marginTop: '8px', marginBottom: '8px'}}
103+
>
101104
<span>{requiredMsg}</span>
102105
</p>
103106
);

webapp/src/components/setting.jsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ export default class Setting extends React.PureComponent {
2525
} = this.props;
2626

2727
return (
28-
<div className='form-group less'>
28+
<div
29+
className='form-group less'
30+
style={{marginBottom: '8px'}}
31+
>
2932
{label && (
3033
<label
3134
className='control-label margin-bottom x2'
@@ -45,7 +48,10 @@ export default class Setting extends React.PureComponent {
4548
}
4649
<div>
4750
{children}
48-
<div className='help-text'>
51+
<div
52+
className='help-text'
53+
style={{margin: '0px'}}
54+
>
4955
{helpText}
5056
</div>
5157
</div>

0 commit comments

Comments
 (0)