Skip to content

Commit

Permalink
fix(sidemenu): Side menu always needs to have translate3d applied, cl…
Browse files Browse the repository at this point in the history
…oses #710
  • Loading branch information
Adam Bradley committed Mar 10, 2014
1 parent ed1dbb7 commit 16ac2ff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
6 changes: 1 addition & 5 deletions js/ext/angular/src/directive/ionicSideMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
return $scope.sideMenuContentTranslateX || 0;
},
setTranslateX: ionic.animationFrameThrottle(function(amount) {
if(amount === 0) {
$element[0].style[ionic.CSS.TRANSFORM] = 'none';
} else {
$element[0].style[ionic.CSS.TRANSFORM] = 'translate3d(' + amount + 'px, 0, 0)';
}
$element[0].style[ionic.CSS.TRANSFORM] = 'translate3d(' + amount + 'px, 0, 0)';
$timeout(function() {
$scope.sideMenuContentTranslateX = amount;
});
Expand Down
10 changes: 5 additions & 5 deletions scss/_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@

.grade-b .menu-content,
.grade-c .menu-content {
@include box-sizing(content-box);
right: -1px;
left: -1px;
@include box-sizing(content-box);
border-right: 1px solid #ccc;
border-left: 1px solid #ccc;
box-shadow: none;
}

.menu-left {
left: 0;
.menu-left {
left: 0;
}

.menu-right {
right: 0;
.menu-right {
right: 0;
}

.menu-animated {
Expand Down

0 comments on commit 16ac2ff

Please sign in to comment.