Skip to content
This repository was archived by the owner on Feb 6, 2023. It is now read-only.

Upgrade bootstrap #161

Merged
merged 2 commits into from
Sep 25, 2018
Merged

Upgrade bootstrap #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b15ec3
`npm un bootstrap reactstrap && npm i bootstrap reactstrap`
ofk Sep 12, 2018
f3abf1a
Fix
ofk Sep 12, 2018
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
77 changes: 31 additions & 46 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/AxisLogKeySelectorRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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>
);
}
}
Expand Down
22 changes: 10 additions & 12 deletions frontend/src/components/LinesConfiguratorRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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}>
Expand Down