Skip to content

Commit

Permalink
Merge branch 'master' of github.com:driftyco/ionic
Browse files Browse the repository at this point in the history
  • Loading branch information
danbucholtz committed May 9, 2016
2 parents 7da8739 + ea57b41 commit 2a48709
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
**Note: If you are having problems formatting your issue please refer to this article on using markdown in Github:**

https://guides.github.com/features/mastering-markdown/

**Note: for support questions, please use one of these channels:**

https://forum.ionicframework.com/
Expand Down Expand Up @@ -35,3 +39,4 @@ insert any relevant code between the above and below backticks
**Run `ionic info` from terminal/cmd prompt:** (paste output below)



2 changes: 1 addition & 1 deletion js/angular/controller/refresherController.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ IonicModule
}

function overscroll(val) {
scrollChild.style[ionic.CSS.TRANSFORM] = 'translate3d(0, ' + val + 'px, 0)';
scrollChild.style[ionic.CSS.TRANSFORM] = 'translate3d(0px, ' + val + 'px, 0px)';
lastOverscroll = val;
}

Expand Down

0 comments on commit 2a48709

Please sign in to comment.