Merge branch 'pull-1' into patch-8

This commit is contained in:
Nathan Brown
2015-09-22 13:50:37 -07:00
3 changed files with 392 additions and 248 deletions
+2 -2
View File
@@ -137,7 +137,7 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
];
element = React.createElement(Dialog, {"title": "Dialog With Custom Actions", "actions": customActions, "modal": false, "autoDetectWindowHeight": true, "autoScrollBodyContent": true}, "The actions in this window were passed in as an array of react objects.");
// "http://material-ui.com/#/components/dropdown-menu"
var menuItems = [
var menuItems: __MaterialUI.Menu.MenuItemRequest[] = [
{ payload: '1', text: 'Never' },
{ payload: '2', text: 'Every Night' },
{ payload: '3', text: 'Weeknights' },
@@ -192,7 +192,7 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
element = React.createElement(TextField, {"hintText": "Disabled Hint Text", "disabled": true});
element = React.createElement(TextField, {"hintText": "Disabled Hint Text", "disabled": true, "defaultValue": "Disabled With Value"});
//Select Fields
var arbitraryArrayMenuItems = [
var arbitraryArrayMenuItems: __MaterialUI.Menu.MenuItemRequest[] = [
{
id: 0,
name: "zero",
+1 -1
View File
@@ -69,7 +69,7 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
let ThemeManager = new mui.Styles.ThemeManager();
ThemeManager.setTheme(ThemeManager.types.LIGHT);
ThemeManager.setTheme(ThemeManager.types.DARK);
let muiTheme: __MaterialUI.Styles.CustomTheme = ThemeManager.getCurrentTheme();
let muiTheme = ThemeManager.getCurrentTheme();
ThemeManager.setComponentThemes({
toggle: {
thumbOnColor: "#00bcd4",
+389 -245
View File
File diff suppressed because it is too large Load Diff