forked from mui/material-ui
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Button] Fix and add missing labelPosition
- Loading branch information
1 parent
9be7261
commit 3983146
Showing
5 changed files
with
92 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,19 @@ | ||
//Flat Buttons | ||
<FlatButton label="Default" /> | ||
|
||
<FlatButton label="Primary" primary={true} /> | ||
|
||
<FlatButton label="Secondary" secondary={true} /> | ||
<div style={styles.container}> | ||
<FlatButton primary={true} label="Choose an Image"> | ||
<input type="file" id="imageButton" style={styles.exampleImageInput}></input> | ||
</FlatButton> | ||
</div> | ||
<div style={styles.container}> | ||
<FlatButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub"> | ||
<FontIcon style={styles.exampleFlatButtonIcon} className="muidocs-icon-custom-github"/> | ||
</FlatButton> | ||
</div> | ||
|
||
<FlatButton primary={true} label="Choose an Image"> | ||
<input type="file" id="imageButton" style={styles.exampleImageInput} /> | ||
</FlatButton> | ||
|
||
<FlatButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub"> | ||
<FontIcon style={styles.exampleFlatButtonIcon} className="muidocs-icon-custom-github" /> | ||
</FlatButton> | ||
|
||
<FlatButton secondary={true} label="Label after" labelPosition="after"> | ||
<FontIcon style={styles.exampleFlatButtonIcon} className="muidocs-icon-custom-github" /> | ||
</FlatButton> | ||
|
||
<FlatButton label="Disabled" disabled={true} /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,19 @@ | ||
//Raised Buttons | ||
<RaisedButton label="Default" /> | ||
|
||
<RaisedButton label="Primary" primary={true} /> | ||
|
||
<RaisedButton label="Secondary" secondary={true} /> | ||
<div style={styles.container}> | ||
<RaisedButton primary={true} label="Choose an Image"> | ||
<input type="file" style={styles.exampleImageInput}></input> | ||
</RaisedButton> | ||
</div> | ||
<div style={styles.container}> | ||
<RaisedButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="Github"> | ||
<FontIcon style={styles.exampleButtonIcon} className="muidocs-icon-custom-github"/> | ||
</RaisedButton> | ||
</div> | ||
<RaisedButton label="Disabled" disabled={true} /> | ||
|
||
<RaisedButton primary={true} label="Choose an Image"> | ||
<input type="file" style={styles.exampleImageInput} /> | ||
</RaisedButton> | ||
|
||
<RaisedButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="Github"> | ||
<FontIcon style={styles.exampleButtonIcon} className="muidocs-icon-custom-github" /> | ||
</RaisedButton> | ||
|
||
<RaisedButton secondary={true} label="Label after" labelPosition="after"> | ||
<FontIcon style={styles.exampleButtonIcon} className="muidocs-icon-custom-github" /> | ||
</RaisedButton> | ||
|
||
<RaisedButton label="Disabled" disabled={true} /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters