Merge branch 'v3' of https://github.com/stipsan/uikit-react into hotf…

…ix/cleanup-revert-merge-trouble
stipsan · Mar 21, 2017 · 64402eb · 64402eb
2 parents a053ed5 + fb800d6
commit 64402eb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "eslint-config-airbnb": "14.1.0",
     "eslint-plugin-import": "2.2.0",
     "eslint-plugin-jsx-a11y": "4.0.0",
-    "eslint-plugin-react": "6.10.0",
+    "eslint-plugin-react": "6.10.2",
     "expect": "1.20.2",
     "file-loader": "0.10.1",
     "gh-release": "2.2.1",

diff --git a/src/Modal/Dialog.js b/src/Modal/Dialog.js
@@ -54,22 +54,15 @@ export default class Dialog extends Component {
 
     return (
       <div className={dialogClassName} onClick={handleOverlayClick}>
-        {close && (
-          <a
-            className={closeClassName}
-            onClick={handleClose}
-          />
-        )}
+        {close && (<a className={closeClassName} onClick={handleClose} />)}
         {header && (<div className="uk-modal-header"><h2>{header}</h2></div>)}
         {caption && (<div className="uk-modal-caption">{caption}</div>)}
         {children}
-        { footer.length > 0 &&
-          (<div className="uk-modal-footer uk-text-right">
-            {
-              footer.map((component, i) => createElement(component, { key: i, handleClose }))
-            }
-          </div>)
-        }
+        { footer.length > 0 && (
+          <div className="uk-modal-footer uk-text-right">
+            {footer.map((component, i) => createElement(component, { key: i, handleClose }))}
+          </div>
+        )}
       </div>
     )
   }

diff --git a/src/Modal/__tests__/index-test.js b/src/Modal/__tests__/index-test.js
@@ -201,7 +201,8 @@ describe('Modal', () => {
       onConfirm={jest.fn()}
     >
       Are you sure?
-  </Modal>)
+    </Modal>
+  )
 
   it('should handle handleCancel', () => {
     const instance = component.getInstance()

diff --git a/src/stories/Button.js b/src/stories/Button.js
@@ -7,10 +7,14 @@ Button.displayName = 'Button'
 storiesOf('Button', module)
   .addWithInfo('Basic Usage', '', () => (
     <div className="uk-margin-bottom">
-      <Button primary>Primary</Button> &nbsp;
-      <Button success>Success</Button> &nbsp;
-      <Button danger>Danger</Button> &nbsp;
-      <Button link>Link</Button> &nbsp;
+      <Button primary>Primary</Button>
+      &nbsp;
+      <Button success>Success</Button>
+      &nbsp;
+      <Button danger>Danger</Button>
+      &nbsp;
+      <Button link>Link</Button>
+      &nbsp;
       <Button type="submit">Submit</Button>
     </div>
   ), { header: false, inline: true, propTables: [Button] })
diff --git a/src/stories/Input.js b/src/stories/Input.js
@@ -10,9 +10,12 @@ storiesOf('Input', module)
   For more advanced use cases please check out [\`redux-form-uikit\`](http://form.uikit-react.io).
   `, () => (
     <form className="uk-margin-bottom uk-form">
-      <Input placeholder="Text input" /> &nbsp;
-      <Input danger defaultValue="danger" /> &nbsp;
-      <Input success defaultValue="success" /> &nbsp;
+      <Input placeholder="Text input" />
+      &nbsp;
+      <Input danger defaultValue="danger" />
+      &nbsp;
+      <Input success defaultValue="success" />
+      &nbsp;
       <Input blank placeholder="blank" />
     </form>
   ), { header: false, inline: true, propTables: [Input], mtrcConf: { // eslint-disable-line
@@ -53,11 +56,13 @@ storiesOf('Input', module)
   .addWithInfo('Form and icons', '', () => (
     <form className="uk-margin-bottom uk-form">
       <div className="uk-form-row">
-        <Input icon="calendar" /> &nbsp;
+        <Input icon="calendar" />
+        &nbsp;
         <Input flip icon="clock-o" />
       </div>
       <div className="uk-form-row">
-        <Input icon="spinner" /> &nbsp;
+        <Input icon="spinner" />
+        &nbsp;
         <Input flip icon="refresh" />
       </div>
     </form>

diff --git a/yarn.lock b/yarn.lock
@@ -2248,9 +2248,9 @@ eslint-plugin-jsx-a11y@4.0.0:
     jsx-ast-utils "^1.0.0"
     object-assign "^4.0.1"
 
-eslint-plugin-react@6.10.0:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.0.tgz#9c48b48d101554b5355413e7c64238abde6ef1ef"
+eslint-plugin-react@6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.2.tgz#e5492fc842ab19a3ba3e26bbf7a3455bd9c7b06f"
   dependencies:
     array.prototype.find "^2.0.1"
     doctrine "^1.2.2"