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

Commitaf19182

Browse files
committed
fix button styles for material@0.15
1 parent3545577 commitaf19182

File tree

10 files changed

+52
-16
lines changed

10 files changed

+52
-16
lines changed

‎lib/components/Common/RouteButton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
1818
varactions_1=require('../../actions');
19-
varFlatButton_1=require('material-ui/FlatButton');
19+
varRaisedButton_1=require('material-ui/RaisedButton');
2020
varRouteButton=(function(_super){
2121
__extends(RouteButton,_super);
2222
functionRouteButton(){
2323
_super.apply(this,arguments);
2424
}
2525
RouteButton.prototype.render=function(){
2626
var_a=this.props,label=_a.label,route=_a.route,style=_a.style,routeTo=_a.routeTo;
27-
return(React.createElement(FlatButton_1.default,{label:label,style:style||{},onTouchTap:routeTo.bind(this,route),secondary:true}));
27+
return(React.createElement(RaisedButton_1.default,{label:label,style:style||{},onTouchTap:routeTo.bind(this,route),secondary:true}));
2828
};
2929
RouteButton=__decorate([
3030
react_redux_1.connect(null,function(dispatch){

‎lib/components/Page/PageToolbar/Continue/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,23 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
18-
varFlatButton_1=require('material-ui/FlatButton');
18+
varRaisedButton_1=require('material-ui/RaisedButton');
1919
varactions_1=require('../../../../actions');
2020
varstyles={
2121
zIndex:'10000',
22+
border:'0',
23+
boxShadow:'none',
24+
backgroundColor:'inherit',
25+
position:'relative',
26+
top:'10px',
2227
};
2328
varContinue=(function(_super){
2429
__extends(Continue,_super);
2530
functionContinue(){
2631
_super.apply(this,arguments);
2732
}
2833
Continue.prototype.render=function(){
29-
return(React.createElement(FlatButton_1.default,{style:styles,label:'Continue',secondary:true,onTouchTap:this.props.callNextPage}));
34+
return(React.createElement(RaisedButton_1.default,{style:styles,label:'Continue',primary:true,onTouchTap:this.props.callNextPage}));
3035
};
3136
Continue=__decorate([
3237
react_redux_1.connect(null,function(dispatch,state){

‎lib/components/Page/PageToolbar/Save/index.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,22 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
18-
varFlatButton_1=require('material-ui/FlatButton');
18+
varRaisedButton_1=require('material-ui/RaisedButton');
1919
varactions_1=require('../../../../actions');
20+
varstyles={
21+
border:'0',
22+
boxShadow:'none',
23+
backgroundColor:'inherit',
24+
position:'relative',
25+
top:'10px',
26+
};
2027
varSave=(function(_super){
2128
__extends(Save,_super);
2229
functionSave(){
2330
_super.apply(this,arguments);
2431
}
2532
Save.prototype.render=function(){
26-
return(React.createElement(FlatButton_1.default,{label:'Save',secondary:true,onTouchTap:this.props.save}));
33+
return(React.createElement(RaisedButton_1.default,{label:'Save',style:styles,secondary:true,onTouchTap:this.props.save}));
2734
};
2835
Save=__decorate([
2936
react_redux_1.connect(null,function(dispatch,state){

‎lib/components/Page/PageToolbar/ToggleLog/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ var code_1 = require('material-ui/svg-icons/action/code');
1818
varreact_redux_1=require('react-redux');
1919
varactions_1=require('../../../../actions');
2020
varFlatButton_1=require('material-ui/FlatButton');
21+
varstyles={
22+
position:'relative',
23+
top:'10px',
24+
};
2125
varToggleLog=(function(_super){
2226
__extends(ToggleLog,_super);
2327
functionToggleLog(){
2428
_super.apply(this,arguments);
2529
}
2630
ToggleLog.prototype.render=function(){
27-
return(React.createElement(FlatButton_1.default,{icon:React.createElement(code_1.default,null),onTouchTap:this.props.toggleDevTools}));
31+
return(React.createElement(FlatButton_1.default,{style:styles,icon:React.createElement(code_1.default,null),onTouchTap:this.props.toggleDevTools}));
2832
};
2933
;
3034
ToggleLog=__decorate([

‎lib/components/Start/Welcome/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var taglineStyles = {
2222
};
2323
varbuttonStyles={
2424
fontSize:'1.4em',
25-
padding:'5px 2px',
25+
boxShadow:'2px 2px 1px #888888',
2626
textShadow:'1px 1px 0px #000',
2727
};
2828
varWelcome=function(){return(React.createElement("div",{style:styles,className:'cr-bg'},React.createElement("div",{style:titleStyles},"CodeRoad"),React.createElement("div",{style:taglineStyles},"Tutorials in your Editor"),React.createElement("br",null),React.createElement("br",null),React.createElement(index_1.RouteButton,{label:'Start',route:'tutorials',style:buttonStyles})));};

‎src/components/Common/RouteButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
33
import{routeSet}from'../../actions';
4-
importFlatButtonfrom'material-ui/FlatButton';
4+
importRaisedButtonfrom'material-ui/RaisedButton';
55

66
@connect(null,(dispatch)=>{
77
return{
@@ -14,7 +14,7 @@ export default class RouteButton extends React.Component<{
1414
render(){
1515
const{label, route, style, routeTo}=this.props;
1616
return(
17-
<FlatButton
17+
<RaisedButton
1818
label={label}
1919
style={style||{}}
2020
onTouchTap={routeTo.bind(this,route)}

‎src/components/Page/PageToolbar/Continue/index.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
3-
importFlatButtonfrom'material-ui/FlatButton';
3+
importRaisedButtonfrom'material-ui/RaisedButton';
44
import{pageNext}from'../../../../actions';
55

66
conststyles={
77
zIndex:'10000',
8+
border:'0',
9+
boxShadow:'none',
10+
backgroundColor:'inherit',
11+
position:'relative',
12+
top:'10px',
813
};
914

1015
@connect(null,(dispatch,state)=>{
@@ -19,10 +24,10 @@ export default class Continue extends React.Component<{
1924
},{}>{
2025
render(){
2126
return(
22-
<FlatButton
27+
<RaisedButton
2328
style={styles}
2429
label='Continue'
25-
secondary={true}
30+
primary={true}
2631
onTouchTap={this.props.callNextPage}
2732
/>
2833
);

‎src/components/Page/PageToolbar/Save/index.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
3-
importFlatButtonfrom'material-ui/FlatButton';
3+
importRaisedButtonfrom'material-ui/RaisedButton';
44
import{testSave}from'../../../../actions';
55

6+
conststyles={
7+
border:'0',
8+
boxShadow:'none',
9+
backgroundColor:'inherit',
10+
position:'relative',
11+
top:'10px',
12+
};
13+
614
@connect(null,(dispatch,state)=>{
715
return{
816
save:()=>{
@@ -15,8 +23,9 @@ export default class Save extends React.Component<{
1523
},{}>{
1624
render(){
1725
return(
18-
<FlatButton
26+
<RaisedButton
1927
label='Save'
28+
style={styles}
2029
secondary={true}
2130
onTouchTap={this.props.save}
2231
/>

‎src/components/Page/PageToolbar/ToggleLog/index.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ import {connect} from 'react-redux';
44
import{devToolsToggle}from'../../../../actions';
55
importFlatButtonfrom'material-ui/FlatButton';
66

7+
conststyles={
8+
position:'relative',
9+
top:'10px',
10+
};
11+
712
@connect(null,(dispatch,state)=>{
813
return{
914
toggleDevTools:()=>{
@@ -17,6 +22,7 @@ export default class ToggleLog extends React.Component<{
1722
render(){
1823
return(
1924
<FlatButton
25+
style={styles}
2026
icon={
2127
<Code/>
2228
}

‎src/components/Start/Welcome/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const taglineStyles = {
2828

2929
constbuttonStyles={
3030
fontSize:'1.4em',
31-
padding:'5px 2px',
31+
boxShadow:'2px 2px 1px #888888',
3232
textShadow:'1px 1px 0px #000',
3333
};
3434

0 commit comments

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