Merge branch 'master' into fixes

This commit is contained in:
Elizabeth Craig
2019-03-01 12:18:15 -08:00
committed by GitHub
2 changed files with 34 additions and 49 deletions

View File

@@ -87,7 +87,7 @@ The `styles` prop can take either an object, or a function which returns a style
The following code (simplified from `demo/src/components/TodoHeader.tsx`) demonstrates using `styles` to customize individual components. The TextField uses a style function and the PrimaryButton uses a style object.
```ts
```js
function render() {
const buttonStyles = {
root: { backgroundColor: 'maroon' },