Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcf9f3c9

Browse files
committed
style fixes for material 0.15
1 parent0563867 commitcf9f3c9

File tree

9 files changed

+19
-13
lines changed

9 files changed

+19
-13
lines changed

‎lib/components/menu/menu.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var icon_button_1 = require('material-ui/lib/icon-button');
2424
varicon_menu_1=require('material-ui/lib/menus/icon-menu');
2525
varmore_vert_1=require('material-ui/lib/svg-icons/navigation/more-vert');
2626
varmenu_item_1=require('material-ui/lib/menus/menu-item');
27+
vardivider_1=require('material-ui/lib/divider');
2728
varorigin={horizontal:'right',vertical:'top'};
2829
vardefault_1=(function(_super){
2930
__extends(default_1,_super);
@@ -57,7 +58,7 @@ var default_1 = (function (_super) {
5758
};
5859
default_1.prototype.render=function(){
5960
varquit=this.props.quit;
60-
returnReact.createElement(app_bar_1.default,{title:'CodeRoad',className:'cr-menu-bar',iconElementRight:React.createElement(icon_menu_1.default,{iconButtonElement:React.createElement(icon_button_1.default,null,React.createElement(more_vert_1.default,null)),targetOrigin:origin,anchorOrigin:origin},this.menuOptions(),window.coderoad.issuesPath ?React.createElement(menu_item_1.default,{key:'issue',className:'link'},React.createElement("a",{href:window.coderoad.issuesPath},"post issue")) :null)});
61+
returnReact.createElement(app_bar_1.default,{title:'CodeRoad',className:'cr-menu-bar',iconElementRight:React.createElement(icon_menu_1.default,{iconButtonElement:React.createElement(icon_button_1.default,null,React.createElement(more_vert_1.default,null)),targetOrigin:origin,anchorOrigin:origin},this.menuOptions(),window.coderoad.issuesPath ?React.createElement(menu_item_1.default,{key:'issue',className:'link'},React.createElement("a",{href:window.coderoad.issuesPath},"post issue")) :null,React.createElement(divider_1.default,null),React.createElement(menu_item_1.default,{key:'quit',onClick:quit},"quit"))});
6162
};
6263
default_1=__decorate([
6364
react_redux_1.connect(null,function(dispatch){

‎lib/components/page/toolbar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var default_1 = (function (_super) {
4141
varprogress=taskProgress(taskPosition,tasks.length);
4242
return(React.createElement("section",{className:'cr-page-toolbar'},React.createElement(ProgressBar,{progress:progress}),React.createElement(toolbar_1.default,null,React.createElement(toolbar_group_1.default,{float:'left'},React.createElement(flat_button_1.default,{icon:React.createElement(code_1.default,null),onTouchTap:actions_1.toggleDevTools})),React.createElement(toolbar_group_1.default,{float:'right'},taskPosition>=tasks.length ?
4343
React.createElement(raised_button_1.default,{label:'Continue',primary:true,onTouchTap:callNextPage}) :
44-
React.createElement(raised_button_1.default,{label:'Save',secondary:true,onTouchTap:editor_1.save})))));
44+
React.createElement(flat_button_1.default,{label:'Save',secondary:true,onTouchTap:editor_1.save})))));
4545
};
4646
default_1=__decorate([
4747
react_redux_1.connect(null,function(dispatch,state){

‎lib/components/progress/progress.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ exports.default = function (_a) {
8989
returnReact.createElement(list_item_1.default,{key:'c'+chapterIndex,className:classnames({
9090
'chapter':true,
9191
'isActive':isActive
92-
}),initiallyOpen:chapterIndex===0,leftIcon:chapter.completed ?React.createElement(AllCompleted,null) :null,primaryTogglesNestedList:chapterIndex===position.chapter&&!chapter.completed,nestedItems:chapter.pages.map(function(page,pageIndex){
92+
}),initiallyOpen:chapterIndex===0,leftIcon:chapter.completed ?React.createElement(check_box_1.default,null) :null,primaryTogglesNestedList:chapterIndex===position.chapter&&!chapter.completed,nestedItems:chapter.pages.map(function(page,pageIndex){
9393
varitemPosition={chapter:chapterIndex,page:pageIndex};
9494
returnReact.createElement(ProgressPage,{key:'c'+chapterIndex+'p'+pageIndex,page:page,itemPosition:itemPosition,position:position});
9595
})},React.createElement("h3",null,chapterIndex+1,". ",chapter.title),React.createElement("span",{className:'chapter-description'},React.createElement(_components_1.MarkdownText,{text:chapter.description})));

‎lib/components/start/tutorials.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1414
if(typeofReflect==="object"&&typeofReflect.metadata==="function")returnReflect.metadata(k,v);
1515
};
1616
varReact=require('react');
17-
varraised_button_1=require('material-ui/lib/raised-button');
17+
varflat_button_1=require('material-ui/lib/flat-button');
1818
vartable_1=require('material-ui/lib/table/table');
1919
vartable_header_column_1=require('material-ui/lib/table/table-header-column');
2020
vartable_row_1=require('material-ui/lib/table/table-row');
@@ -41,8 +41,8 @@ var default_1 = (function (_super) {
4141
var_this=this;
4242
var_a=this.props,tutorials=_a.tutorials,loadTutorials=_a.loadTutorials,selectProject=_a.selectProject,toggleAlert=_a.toggleAlert;
4343
return(React.createElement("div",{className:'cr-tutorials'},React.createElement(table_1.default,null,React.createElement(table_header_1.default,{displaySelectAll:false,adjustForCheckbox:false},React.createElement(table_row_1.default,null,React.createElement(table_header_column_1.default,null,"Tutorial"),React.createElement(table_header_column_1.default,null,"Version"))),React.createElement(table_body_1.default,{displayRowCheckbox:false},tutorials.map(function(tutorial,index){
44-
return(React.createElement(table_row_1.default,null,React.createElement(table_row_column_1.default,{onClick:selectProject.bind(_this,tutorial)},_this.trim(tutorial)),React.createElement(table_row_column_1.default,null,"v1.0.0"),"/>"));
45-
}))),React.createElement("br",null),React.createElement(raised_button_1.default,{label:'Load Tutorials',secondary:true,onTouchTap:loadTutorials})));
44+
return(React.createElement(table_row_1.default,null,React.createElement(table_row_column_1.default,null,React.createElement(flat_button_1.default,{label:_this.trim(tutorial),primary:true,onTouchTap:selectProject.bind(_this,tutorial)})),React.createElement(table_row_column_1.default,null,"v1.0.0"),"/>"));
45+
}))),React.createElement("br",null),React.createElement(flat_button_1.default,{label:'Check for Tutorials',secondary:true,onTouchTap:loadTutorials})));
4646
};
4747
default_1=__decorate([
4848
react_redux_1.connect(null,function(dispatch){

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
"dependencies": {
4141
"classnames":"2.2.3",
4242
"highlights":"1.3.1",
43-
"lodash":"4.9.0",
43+
"lodash":"4.10.0",
4444
"marked":"0.3.5",
4545
"material-ui":"0.15.0-alpha.2",
4646
"react":"15.0.1",
4747
"react-dom":"15.0.1",
4848
"react-redux":"4.4.2",
49-
"react-tap-event-plugin":"git+https://github.com/zilverline/react-tap-event-plugin.git",
49+
"react-tap-event-plugin":"1.0.0",
5050
"redux":"3.4.0"
5151
},
5252
"scripts": {

‎src/components/menu/menu.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import NavigationClose from 'material-ui/lib/svg-icons/navigation/close';
1010
importIconMenufrom'material-ui/lib/menus/icon-menu';
1111
importMoreVertIconfrom'material-ui/lib/svg-icons/navigation/more-vert';
1212
importMenuItemfrom'material-ui/lib/menus/menu-item';
13+
importDividerfrom'material-ui/lib/divider';
1314

1415
constorigin={horizontal:'right',vertical:'top'};
1516

@@ -80,6 +81,8 @@ export default class extends React.Component<{
8081
post issue
8182
</a>
8283
</MenuItem> :null}
84+
<Divider/>
85+
<MenuItemkey='quit'onClick={quit}>quit</MenuItem>
8386
</IconMenu>
8487
}/>;
8588
}

‎src/components/page/toolbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default class extends React.Component<{
4545
<ToolbarGroupfloat='right'>
4646
{taskPosition>=tasks.length ?
4747
<RaisedButtonlabel='Continue'primary={true}onTouchTap={callNextPage}/> :
48-
<RaisedButtonlabel='Save'secondary={true}onTouchTap={save}/>
48+
<FlatButtonlabel='Save'secondary={true}onTouchTap={save}/>
4949
}
5050
</ToolbarGroup>
5151

‎src/components/progress/progress.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default ({progress, position}) => (
8282
'isActive':isActive
8383
})}
8484
initiallyOpen={chapterIndex===0}
85-
leftIcon={chapter.completed ?<AllCompleted/> :null}
85+
leftIcon={chapter.completed ?<CheckBox/> :null}
8686
primaryTogglesNestedList={chapterIndex===position.chapter&&!chapter.completed}
8787
nestedItems={chapter.pages.map((page:CR.Page,pageIndex:number)=>{
8888
constitemPosition={chapter:chapterIndex,page:pageIndex};

‎src/components/start/tutorials.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import*asReactfrom'react';
2-
importRaisedButtonfrom'material-ui/lib/raised-button';
2+
importFlatButtonfrom'material-ui/lib/flat-button';
33
importTablefrom'material-ui/lib/table/table';
44
importTableHeaderColumnfrom'material-ui/lib/table/table-header-column';
55
importTableRowfrom'material-ui/lib/table/table-row';
@@ -55,7 +55,9 @@ export default class extends React.Component<{
5555
{tutorials.map((tutorial:string,index)=>{
5656
return(
5757
<TableRow>
58-
<TableRowColumnonClick={selectProject.bind(this,tutorial)}>{this.trim(tutorial)}</TableRowColumn>
58+
<TableRowColumn>
59+
<FlatButtonlabel={this.trim(tutorial)}primary={true}onTouchTap={selectProject.bind(this,tutorial)}/>
60+
</TableRowColumn>
5961
<TableRowColumn>v1.0.0</TableRowColumn>
6062
/>
6163
</TableRow>
@@ -66,7 +68,7 @@ export default class extends React.Component<{
6668
</Table>
6769

6870
<br/>
69-
<RaisedButtonlabel='Load Tutorials'secondary={true}onTouchTap={loadTutorials}/>
71+
<FlatButtonlabel='Check for Tutorials'secondary={true}onTouchTap={loadTutorials}/>
7072
</div>
7173
);
7274
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp