From db21ee87acc8bf4e249c79c8ff46b30141924daf Mon Sep 17 00:00:00 2001 From: Jeong Yong-uk Date: Fri, 21 Aug 2015 21:34:39 +0900 Subject: [PATCH] AppBar should be positioned zIndex only has an effect if an element is positioned --- src/app-bar.jsx | 1 + src/app-canvas.jsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app-bar.jsx b/src/app-bar.jsx index abab0b1ccb9868..9e05c2ba4284e0 100644 --- a/src/app-bar.jsx +++ b/src/app-bar.jsx @@ -61,6 +61,7 @@ let AppBar = React.createClass({ let flatButtonSize = 36; let styles = { root: { + position: 'relative', zIndex: 5, width: '100%', display: '-webkit-box; display: -webkit-flex; display: flex', diff --git a/src/app-canvas.jsx b/src/app-canvas.jsx index 1781ad954cae8f..cb45fb76164173 100644 --- a/src/app-canvas.jsx +++ b/src/app-canvas.jsx @@ -24,9 +24,9 @@ let AppCanvas = React.createClass({ switch (currentChild.type.displayName) { case 'AppBar' : return React.cloneElement(currentChild, { - style: this.mergeStyles({ + style: this.mergeStyles(currentChild.props.style, { position: 'fixed', - }, currentChild.props.style), + }), }); default: return currentChild;