Merge pull request #161 from ofk/feature/upgrade-bootstrap

Upgrade bootstrap
chainer · Sep 25, 2018 · 44e519f · 44e519f
2 parents d7ac6c6 + f3abf1a
commit 44e519f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 63 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "babel-polyfill": "^6.26.0",
-    "bootstrap": "^4.0.0-beta",
+    "bootstrap": "^4.1.3",
     "jquery": "^3.2.1",
     "moment": "^2.22.2",
     "open-iconic": "^1.1.1",
@@ -60,7 +60,7 @@
     "react-router": "^3.2.0",
     "react-router-redux": "^4.0.8",
     "react-table": "^6.8.2",
-    "reactstrap": "^5.0.0-alpha.4",
+    "reactstrap": "^6.4.0",
     "recharts": "git+https://github.com/ofk/recharts.git#v1.1.0-patch",
     "redux": "^3.7.2",
     "redux-logger": "^3.0.6",

diff --git a/frontend/src/components/AxisLogKeySelectorRow.jsx b/frontend/src/components/AxisLogKeySelectorRow.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Label, Input } from 'reactstrap';
+import { FormGroup, Label, Input } from 'reactstrap';
 
 
 class AxisLogKeySelectorRow extends React.Component {
@@ -18,15 +18,15 @@ class AxisLogKeySelectorRow extends React.Component {
   render() {
     const { logKey, logKeyConfig } = this.props;
     return (
-      <div>
+      <FormGroup check>
         <Label check>
           <Input
             type="checkbox"
             checked={logKeyConfig.selected}
             onChange={this.handleSelectToggle}
           /> {logKey}
         </Label>
-      </div>
+      </FormGroup>
     );
   }
 }

diff --git a/frontend/src/components/LinesConfiguratorRow.jsx b/frontend/src/components/LinesConfiguratorRow.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {
   Row, Col,
-  Form, FormGroup, Label, Input
+  FormGroup, Label, Input
 } from 'reactstrap';
 import TruncatedResultName from './TruncatedResultName';
 import { line2key } from '../utils';
@@ -51,17 +51,15 @@ class LinesConfiguratorRow extends React.Component {
       >
         <Row>
           <Col xs="3" lg="2">
-            <Form>
-              <FormGroup check>
-                <Label check>
-                  <Input
-                    type="checkbox"
-                    checked={isVisible}
-                    onChange={this.handleLineVisibilityUpdate}
-                  />
-                </Label>
-              </FormGroup>
-            </Form>
+            <FormGroup check>
+              <Label check>
+                <Input
+                  type="checkbox"
+                  checked={isVisible}
+                  onChange={this.handleLineVisibilityUpdate}
+                />&nbsp;
+              </Label>
+            </FormGroup>
           </Col>
           <Col xs="9" lg="5" className="text-truncate">
             <a href="" className="text-dark d-block" onClick={this.handleEditClick}>