Skip to content

use react-toggle-button #104

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

Merged
dabbott merged 1 commit into from
Jun 29, 2016
Merged

use react-toggle-button #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 3 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@
"react-redux": "^4.4.0",
"react-router": "2.0.0",
"react-router-redux": "^3.0.0",
"react-toggle-button": "^2.0.0",
"redux": "^3.3.1",
"redux-thunk": "^1.0.3",
"semver": "^5.1.0",
"sklad": "^4.1.1",
"style-loader": "^0.8.3",
"url-loader": "^0.5.7",
"react-addons-pure-render-mixin": "^15.1.0",
"classnames": "^2.2.5",
"uuid": "^2.0.1",
"webpack": "^1.12.2",
"webpack-dev-server": "^1.11.0"
Expand All @@ -60,7 +59,7 @@
"devDependencies": {
"babel-eslint": "^5.0.0",
"del": "^2.1.0",
"eslint": "^2.10.2",
"eslint": "^2.13.1",
"eslint-plugin-react": "^3.16.1",
"gulp": "^3.9.0",
"gulp-autoprefixer": "^3.0.2",
Expand Down
143 changes: 0 additions & 143 deletions web/src/scripts/components/buttons/SwitchButton.jsx
View file
Open in desktop

This file was deleted.

21 changes: 16 additions & 5 deletions web/src/scripts/components/console/PackagerSwitch.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import React, { Component } from 'react'

import Switch from '../buttons/SwitchButton'
import ToggleButton from 'react-toggle-button'

const style = {
container: {
Expand All @@ -26,7 +26,7 @@ const style = {
marginRight: 11,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
justifyContent: 'center',
},
indicator: {
width: 10,
Expand All @@ -50,10 +50,21 @@ class PackagerSwitch extends Component {
<div style={style.termTitleText}>
{this.props.isRunning ? 'Packager running' : 'Run packager'}
</div>
<div style={{display: 'flex', alignSelf: 'center'}} onClick={this.props.onClick}>
<Switch checked={this.props.isRunning}/>
<div onMouseDown={this.props.onClick} onClick={(e) => {
e.stopPropagation()
}}>
<ToggleButton
value={this.props.isRunning}
colors={{
active: {
base: 'rgb(18, 80, 146)',
}
}}
inactiveLabelStyle={{
marginRight: 2,
}}
onToggle={() => { }} />
Copy link
Member

@dabbott dabbott Jun 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yolo

</div>

</div>
)
}
Expand Down
1 change: 0 additions & 1 deletion web/src/styles/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
@import "./colorpicker";
@import "../../node_modules/codemirror/lib/codemirror";
@import "./codemirror/proto";
@import "./react-toggle.scss";

.m-node {
.collapse {
Expand Down
118 changes: 0 additions & 118 deletions web/src/styles/react-toggle.scss
View file
Open in desktop

This file was deleted.