diff --git a/dist/framework.css b/dist/framework.css index 3687a3d4d5..43eae6806b 100644 --- a/dist/framework.css +++ b/dist/framework.css @@ -237,9 +237,9 @@ header, main, footer { z-index: 100; left: 0; right: 0; - -webkit-transition: -webkit-transform 300ms ease; - -moz-transition: -moz-transform 300ms ease; - transition: transform 300ms ease; + -webkit-transition: -webkit-transform 200ms ease; + -moz-transition: -moz-transform 200ms ease; + transition: transform 200ms ease; -webkit-transform: translate3d(0, 0, 0); -moz-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0); } diff --git a/example/panels.html b/example/panels.html index d64c435af8..bc84405965 100644 --- a/example/panels.html +++ b/example/panels.html @@ -39,7 +39,7 @@ - - + + diff --git a/js/framework/helpers/panel-helper.js b/js/framework/handlers/panel-handler.js similarity index 62% rename from js/framework/helpers/panel-helper.js rename to js/framework/handlers/panel-handler.js index b30ae6a9ce..94a8f356e7 100644 --- a/js/framework/helpers/panel-helper.js +++ b/js/framework/handlers/panel-handler.js @@ -3,12 +3,6 @@ function click(e) { if(e.target.dataset.togglePanel) { ion.Panel.toggle(e.target.dataset.togglePanel); - return true; - } - } - - function touchEnd(e) { - if(click(e)) { e.preventDefault(); e.stopPropagation(); return false; @@ -16,6 +10,6 @@ } window.addEventListener('click', click, false); - window.addEventListener('touchend', touchEnd, false); + window.addEventListener('touchend', click, false); })(this, document, ion = this.ion || {}); \ No newline at end of file diff --git a/scss/framework/_structure-variables.scss b/scss/framework/_structure-variables.scss index 2b7b2f83e7..a6da2d0117 100644 --- a/scss/framework/_structure-variables.scss +++ b/scss/framework/_structure-variables.scss @@ -27,4 +27,4 @@ $listItemBorder: 1px solid #ddd; // Panels $panelOpenWidth: 270px; -$panelAnimationSpeed: 300ms; \ No newline at end of file +$panelAnimationSpeed: 200ms; \ No newline at end of file