Merge pull request mui#1478 from alldne/master

AppBar should be positioned
tyfoo · Nov 10, 2015 · c24b79a · c24b79a
2 parents db23297 + db21ee8
commit c24b79a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app-bar.jsx b/src/app-bar.jsx
@@ -87,6 +87,7 @@ const 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
@@ -51,9 +51,9 @@ const 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;