wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Dashlane/material-ui-button-label-position' into material-ui-v014. Pull request #6680.

Browse Source
This commit is contained in:
Nathan Brown
2016-02-26 10:18:25 -07:00
parent 84fe7d57ef f17e96256c
commit 7459445f83
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
material-ui/material-ui-tests.tsx
+1 -1
View File
@@ -161,7 +161,7 @@ class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implemen
element = <FlatButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
<FontIcon style={{ color: Typography.textFullWhite }} className="muidocs-icon-custom-github"/>
</FlatButton>;
element = <RaisedButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub">
element = <RaisedButton linkButton={true} href="https://github.com/callemall/material-ui" secondary={true} label="GitHub" labelPosition="before">
<FontIcon style={{ color: Typography.textFullWhite }} className="muidocs-icon-custom-github"/>
</RaisedButton>;
element = <FloatingActionButton secondary={true} mini={true} linkButton={true}
material-ui/material-ui.d.ts
Vendored
+1
View File
@@ -1022,6 +1022,7 @@ declare namespace __MaterialUI {
fullWidth?: boolean;
label?: string;
labelColor?: string;
labelPosition?: string;
labelStyle?: React.CSSProperties;
primary?: boolean;
secondary?: boolean;