Skip to content

Commit

Permalink
Fix mobile settings menu transitions with new GUI
Browse files Browse the repository at this point in the history
Ref #3810
  • Loading branch information
novaugust committed Aug 23, 2014
1 parent 0005c1b commit 77a2d34
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions core/client/views/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var SettingsView = Ember.View.extend({
// used by SettingsContentBaseView and on resize to mobile from desktop
showSettingsContent: function () {
if (mobileQuery.matches) {
$('.settings-sidebar').animate({right: '100%', left: '-110%', 'margin-right': '15px'}, 300);
$('.settings-menu').animate({right: '100%', left: '-110%', 'margin-right': '15px'}, 300);
$('.settings-content').animate({right: '0', left: '0', 'margin-left': '0'}, 300);
$('.settings-header-inner').css('display', 'block');
}
Expand All @@ -13,13 +13,13 @@ var SettingsView = Ember.View.extend({
showSettingsMenu: function () {
if (mobileQuery.matches) {
$('.settings-header-inner').css('display', 'none');
$('.settings-sidebar').animate({right: '0', left: '0', 'margin-right': '0'}, 300);
$('.settings-menu').animate({right: '0', left: '0', 'margin-right': '0'}, 300);
$('.settings-content').animate({right: '-100%', left: '100%', 'margin-left': '15'}, 300);
}
},
showAll: function () {
//Remove any styles applied by jQuery#animate
$('.settings-sidebar, .settings-content').removeAttr('style');
$('.settings-menu, .settings-content').removeAttr('style');
},

mobileInteractions: function () {
Expand Down

0 comments on commit 77a2d34

Please sign in to comment.