Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MM-15535 - UI updates for Jira 2 #71

Merged
merged 5 commits into from
May 24, 2019
Merged

MM-15535 - UI updates for Jira 2 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
370cc15
MM-15535 - UI updates for Jira 2
asaadmahmood May 23, 2019
7744f7a
Reverting input class
asaadmahmood May 23, 2019
166e163
Updating textarea
asaadmahmood May 23, 2019
773d9b6
Removing readonly
asaadmahmood May 23, 2019
80b8db8
Updating readonly changes
asaadmahmood May 23, 2019
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
5 changes: 5 additions & 0 deletions webapp/src/components/input.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default class Input extends PureComponent {
onChange: PropTypes.func,
disabled: PropTypes.bool,
required: PropTypes.bool,
readOnly: PropTypes.bool,
type: PropTypes.oneOf([
'number',
'input',
Expand All @@ -31,6 +32,7 @@ export default class Input extends PureComponent {
type: 'input',
maxLength: null,
required: false,
readOnly: false,
};

handleChange = (e) => {
Expand All @@ -55,6 +57,7 @@ export default class Input extends PureComponent {
onChange={this.handleChange}
disabled={this.props.disabled}
required={this.props.required}
readOnly={this.props.readOnly}
/>
);
} else if (this.props.type === 'number') {
Expand All @@ -69,6 +72,7 @@ export default class Input extends PureComponent {
onChange={this.handleChange}
disabled={this.props.disabled}
required={this.props.required}
readOnly={this.props.readOnly}
/>
);
} else if (this.props.type === 'textarea') {
Expand All @@ -83,6 +87,7 @@ export default class Input extends PureComponent {
onChange={this.handleChange}
disabled={this.props.disabled}
required={this.props.required}
readOnly={this.props.readOnly}
/>
);
}
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/components/modals/attach_comment_to_issue/attach_comment_to_issue.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export default class AttachIssueModal extends PureComponent {
isDisabled={true}
value={this.props.post.message}
disabled={false}
readOnly={true}
/>
<br/>
</div>
Expand Down Expand Up @@ -160,7 +161,7 @@ export default class AttachIssueModal extends PureComponent {
<Modal.Footer>
<FormButton
type='button'
btnClass='btn-default'
btnClass='btn-link'
defaultMessage='Cancel'
onClick={this.handleClose}
/>
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/components/modals/create_issue/create_issue.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export default class CreateIssueModal extends PureComponent {
<Modal.Footer>
<FormButton
type='button'
btnClass='btn-default'
btnClass='btn-link'
defaultMessage='Cancel'
onClick={this.handleClose}
/>
Expand Down
7 changes: 6 additions & 1 deletion webapp/src/components/setting.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ export default class Setting extends React.PureComponent {
{label}
</label>
{required &&
<span style={{color: '#ff0000'}}>{'*'}</span>
<span
className='error-text'
style={{marginLeft: '3px'}}
>
{'*'}
</span>
}
<div>
{children}
Expand Down