Skip to content

Commit

Permalink
Merge pull request #1269 from Andrew8xx8/master
Browse files Browse the repository at this point in the history
[LeftNav] Fix sidebar position for browsers that don't support transform3d
  • Loading branch information
Hai Nguyen committed Aug 27, 2015
2 parents dcd7d00 + f8d455f commit 28403c3
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/left-nav.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
const isBrowser = typeof window !== 'undefined';
let Modernizr = isBrowser ? require('./utils/modernizr.custom') : undefined;

let React = require('react');
let KeyCode = require('./utils/key-code');
let StylePropable = require('./mixins/style-propable');
Expand Down Expand Up @@ -106,7 +109,7 @@ let LeftNav = React.createClass({
width: this.getTheme().width,
position: 'fixed',
zIndex: 10,
left: 0,
left: isBrowser && Modernizr.csstransforms3d ? 0 : x,
top: 0,
transform: 'translate3d(' + x + 'px, 0, 0)',
transition: !this.state.swiping && Transitions.easeOut(),
Expand All @@ -128,6 +131,7 @@ let LeftNav = React.createClass({
right: 0,
},
};

styles.menuItemLink = this.mergeAndPrefix(styles.menuItem, {
display: 'block',
textDecoration: 'none',
Expand Down

0 comments on commit 28403c3

Please sign in to comment.