Skip to content

Commit c24b79a

Browse files
committed
Merge pull request mui#1478 from alldne/master
AppBar should be positioned
2 parents db23297 + db21ee8 commit c24b79a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/app-bar.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ const AppBar = React.createClass({
8787
let flatButtonSize = 36;
8888
let styles = {
8989
root: {
90+
position: 'relative',
9091
zIndex: 5,
9192
width: '100%',
9293
display: '-webkit-box; display: -webkit-flex; display: flex',

src/app-canvas.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ const AppCanvas = React.createClass({
5151
switch (currentChild.type.displayName) {
5252
case 'AppBar' :
5353
return React.cloneElement(currentChild, {
54-
style: this.mergeStyles({
54+
style: this.mergeStyles(currentChild.props.style, {
5555
position: 'fixed',
56-
}, currentChild.props.style),
56+
}),
5757
});
5858
default:
5959
return currentChild;

0 commit comments

Comments
 (0)