From 2fafea1da34f25e255fd1f610179aabf031c240e Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Wed, 9 Oct 2013 14:18:36 -0500 Subject: [PATCH] Made animation clearer --- dist/ionic-ios7.css | 5 ++--- dist/ionic.css | 5 ++--- dist/ionic.js | 2 -- js/views/listView.js | 2 -- scss/ionic/_listview.scss | 6 ++---- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dist/ionic-ios7.css b/dist/ionic-ios7.css index 3fa7f005d8..72c70e7d77 100644 --- a/dist/ionic-ios7.css +++ b/dist/ionic-ios7.css @@ -1044,9 +1044,8 @@ a.list-item { right: 0; bottom: 0; z-index: 1; - background-color: white; } - .list-item-content.slide-left { - -webkit-transition: margin-left 0.2s ease-in-out; } + background-color: white; + -webkit-transition: left 1s ease-in-out, right 1s ease-in-out; } .list-item-buttons { position: absolute; diff --git a/dist/ionic.css b/dist/ionic.css index 77c409fcb6..38b2e92da0 100644 --- a/dist/ionic.css +++ b/dist/ionic.css @@ -1132,9 +1132,8 @@ a.list-item { right: 0; bottom: 0; z-index: 1; - background-color: white; } - .list-item-content.slide-left { - -webkit-transition: margin-left 0.2s ease-in-out; } + background-color: white; + -webkit-transition: left 1s ease-in-out, right 1s ease-in-out; } .list-item-buttons { position: absolute; diff --git a/dist/ionic.js b/dist/ionic.js index b90457d3b0..78deb62cee 100644 --- a/dist/ionic.js +++ b/dist/ionic.js @@ -1817,7 +1817,6 @@ window.ionic = { // Slide the content over left by the button width content.style.right = buttonsWidth + 'px'; content.style.left = -buttonsWidth + 'px'; - content.classList.add('slide-left'); } }); }, @@ -1833,7 +1832,6 @@ window.ionic = { content = item; } - content.classList.remove('slide-left'); content.style.right = 0; content.style.left = 0; }); diff --git a/js/views/listView.js b/js/views/listView.js index 4fb49d91d6..45fbd4a474 100644 --- a/js/views/listView.js +++ b/js/views/listView.js @@ -37,7 +37,6 @@ // Slide the content over left by the button width content.style.right = buttonsWidth + 'px'; content.style.left = -buttonsWidth + 'px'; - content.classList.add('slide-left'); } }); }, @@ -53,7 +52,6 @@ content = item; } - content.classList.remove('slide-left'); content.style.right = 0; content.style.left = 0; }); diff --git a/scss/ionic/_listview.scss b/scss/ionic/_listview.scss index 52dbda7589..d5b1faa2a3 100644 --- a/scss/ionic/_listview.scss +++ b/scss/ionic/_listview.scss @@ -98,10 +98,8 @@ a.list-item { z-index: 1; background-color: white; - - &.slide-left { - -webkit-transition: margin-left 0.2s ease-in-out; - } + + -webkit-transition: left 1s ease-in-out, right 1s ease-in-out; } .list-item-buttons { position: absolute;