Skip to content

Commit

Permalink
fix(indent): disable jsx-indent - disagree with indent
Browse files Browse the repository at this point in the history
  • Loading branch information
philloooo committed Oct 30, 2017
1 parent e4beda2 commit 78f11f4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ module.exports = {
// see https://github.com/clayne11/eslint-import-resolver-meteor/issues/17
// - seems to affect Codacy :-(
"import/extensions": ["off", "never"],
"react/jsx-indent": "off"
}
};
1 change: 0 additions & 1 deletion src/Explorer/ExplorerTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ export class ExplorerTableComponent extends Component {
<SelectComponent
values={pageSizeValues}
title={'Page size: '}
selectWidth={'100px'}
selectedValue={this.props.pageSize}
onChange={value => this.props.onPageSizeChange(value)}
/>
Expand Down
14 changes: 7 additions & 7 deletions src/Popup/Popup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@ export const Error = styled.h6`
const Popup = ({ message, code, error, closeText, cancelText, confirmText,
onClose, onCancel, onConfirm }) => (
<PopupMask>
<PopupBox>
<PopupBox>
<Message>
<div>{message}</div>
{code &&
<div>{message}</div>
{code &&
<Code className="json"> {code} </Code>
}
{error && <Error>Error</Error>}
{error &&
{error && <Error>Error</Error>}
{error &&
<Code className="json"> {error} </Code>
}
</Message>
</Message>
{onClose &&
<CancelButton role="button" id="cd-popup__button_close" onClick={onClose}>{closeText || 'close'}</CancelButton>
}
Expand All @@ -80,7 +80,7 @@ const Popup = ({ message, code, error, closeText, cancelText, confirmText,
<CancelButton role="button" id="cd-popup__button_cancel" onClick={onCancel}>{cancelText || 'cancel'}</CancelButton>
}
</PopupBox>
</PopupMask>
</PopupMask>
);

Popup.propTypes = {
Expand Down
16 changes: 8 additions & 8 deletions src/Submission/SubmissionResult.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ const SubmissionResult = ({ status, data }) => {
Errors:
</p>
<AceEditor
width="100%"
height="300px"
style={{ marginBottom: '2em' }}
mode="json"
theme="kuroir"
readOnly
value={JSON.stringify(errorList, null, ' ')}
/>
width="100%"
height="300px"
style={{ marginBottom: '2em' }}
mode="json"
theme="kuroir"
readOnly
value={JSON.stringify(errorList, null, ' ')}
/>
</div>);
}
} else if (status === 504) {
Expand Down
1 change: 0 additions & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export const predictFileType = (dirtyData, fileType) => {
};

export const withBoxAndNav = (Component, background) => ({ ...props }) => {
console.log(background);
return (
<div>
<Box>
Expand Down

0 comments on commit 78f11f4

Please sign in to comment.