Bug fixes

MrMoonKr · Mar 8, 2019 · 3874f67 · 3874f67
1 parent e0bca77
commit 3874f67
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 118 deletions.
diff --git a/src/Chapter02AppBar/FixedPosition.js b/src/Chapter02AppBar/FixedPosition.js
@@ -34,7 +34,7 @@ const FixedPosition = withStyles(styles)(({ classes }) => (
           <MenuIcon />
         </IconButton>
         <Typography
-          variant="title"
+          variant="h6"
           color="inherit"
           className={classes.flex}
         >

diff --git a/src/Chapter02AppBar/HideOnScroll.js b/src/Chapter02AppBar/HideOnScroll.js
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+
 import { withStyles } from '@material-ui/core/styles';
 import AppBar from '@material-ui/core/AppBar';
 import Toolbar from '@material-ui/core/Toolbar';

diff --git a/src/Chapter02AppBar/ToolbarAbstraction.js b/src/Chapter02AppBar/ToolbarAbstraction.js
@@ -66,7 +66,7 @@ const MyToolbar = withStyles(styles)(
                 <MenuItems closeMenu={this.closeMenu} />
               </Menu>
               <Typography
-                variant="title"
+                variant="h6"
                 color="inherit"
                 className={classes.flex}
               >

diff --git a/src/Chapter02AppBar/WithNavigation.js b/src/Chapter02AppBar/WithNavigation.js
@@ -77,7 +77,7 @@ const MyToolbar = withStyles(styles)(
                 <MenuItems />
               </Menu>
               <Typography
-                variant="title"
+                variant="h6"
                 color="inherit"
                 className={classes.flex}
               >

diff --git a/src/Chapter03Drawer/AppBarInteraction.js b/src/Chapter03Drawer/AppBarInteraction.js
@@ -45,7 +45,7 @@ const MyToolbar = withStyles(styles)(
             <MenuIcon />
           </IconButton>
           <Typography
-            variant="title"
+            variant="h6"
             color="inherit"
             className={classes.flex}
           >

diff --git a/src/Chapter03Drawer/AppBarInteraction.tmp.js b/src/Chapter03Drawer/AppBarInteraction.tmp.js
diff --git a/src/stories/Chapter01Grid.js b/src/stories/Chapter01Grid.js
@@ -3,6 +3,8 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { withKnobs, select } from '@storybook/addon-knobs';
 
+import withThemeProvider from './withThemeProvider';
+
 import {
   UnderstandingBreakpoints,
   FillingSpace,
@@ -13,6 +15,7 @@ import {
 
 storiesOf('Chapter 1 Grid', module)
   .addDecorator(withKnobs)
+  .addDecorator(withThemeProvider)
   .add('Understanding Breakpoints', () => (
     <UnderstandingBreakpoints />
   ))

diff --git a/src/stories/Chapter02AppBar.js b/src/stories/Chapter02AppBar.js
@@ -4,6 +4,8 @@ import { storiesOf } from '@storybook/react';
 import StoryRouter from 'storybook-react-router';
 import { withKnobs, text } from '@storybook/addon-knobs';
 
+import withThemeProvider from './withThemeProvider';
+
 import {
   HideOnScroll,
   FixedPosition,
@@ -14,6 +16,7 @@ import {
 storiesOf('Chapter 2 App Bar', module)
   .addDecorator(withKnobs)
   .addDecorator(StoryRouter())
+  .addDecorator(withThemeProvider)
   .add('Hide On Scroll', () => <HideOnScroll />)
   .add('Fixed Position', () => <FixedPosition />)
   .add('Toolbar Abstraction', () => (

diff --git a/src/stories/Chapter03Drawer.js b/src/stories/Chapter03Drawer.js
@@ -7,6 +7,8 @@ import StoryRouter from 'storybook-react-router';
 
 import { withKnobs, select } from '@storybook/addon-knobs';
 
+import withThemeProvider from './withThemeProvider';
+
 import {
   DrawerTypes,
   DrawerItemState,
@@ -18,6 +20,7 @@ import {
 storiesOf('Chapter 3 Drawers', module)
   .addDecorator(withKnobs)
   .addDecorator(StoryRouter())
+  .addDecorator(withThemeProvider)
   .add('Drawer Types', () => (
     <DrawerTypes
       variant={select(