Skip to content
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.

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

Ui fix #26

Merged
merged 3 commits into from May 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -19,7 +19,8 @@
"tsify": "^0.15.3",
"typescript": "^1.9.0-dev.20160510",
"typings": "^0.8.1",
"watchify": "^3.7.0"
"watchify": "^3.7.0",
"whatwg-fetch": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p build:less build:script",
Expand Down
11 changes: 7 additions & 4 deletions src/main/typescript/ChecklistComponent.tsx
Expand Up @@ -138,10 +138,13 @@ export const ChecklistComponent = React.createClass<ChecklistComponentProps, Che
<List>
{
this.state.checklist.checks.map((check: Check) => (
<ListItem leftCheckbox={<Checkbox defaultChecked={check.checked} onCheck={this._handleCheck(check)} checkedIcon={<ActionThumbUp />} unCheckedIcon={<ActionThumbUp color={theme.baseTheme.palette.accent2Color}/>} />} >
#{check.number} {check.title}
<div style={{ position: 'absolute', right: 32, top: 8 }}>
{check.users.map(user => <Avatar src={user.avatarUrl} size={32} />)}
<ListItem>
<Checkbox style={{position: 'absolute', left: 16, top: 12, width: 24}} defaultChecked={check.checked} onCheck={this._handleCheck(check)} checkedIcon={<ActionThumbUp />} unCheckedIcon={<ActionThumbUp color={theme.baseTheme.palette.disabledColor}/>} />
<div style={{paddingLeft: 36}}>
<a href={check.url} target="_blank" style={{display: 'block'}}>#{check.number} {check.title}</a>
<div style={{ position: 'absolute', right: 32, top: 8 }}>
{check.users.map(user => <Avatar src={user.avatarUrl} size={32} />)}
</div>
</div>
</ListItem>
))
Expand Down
10 changes: 3 additions & 7 deletions src/main/typescript/app.tsx
Expand Up @@ -3,6 +3,8 @@ import * as ReactDOM from 'react-dom';
import { Router, Route, IndexRoute, RouteComponentProps, Link, browserHistory } from 'react-router'
import * as injectTapEventPlugin from 'react-tap-event-plugin';

import 'whatwg-fetch';

injectTapEventPlugin();

import {Styles,ThemeWrapper} from 'material-ui';
Expand Down Expand Up @@ -31,13 +33,7 @@ const Layout = React.createClass({
const IndexPage = React.createClass({
render() {
return (
<div>
<NewsComponent></NewsComponent>
<h2>For development</h2>
<ul>
<li><Link to={"/-/motemen/test/pull/3"}>motemen/test#3</Link></li>
</ul>
</div>
<NewsComponent></NewsComponent>
);
}
});
Expand Down