Skip to content

Commit

Permalink
First pass at revamping slide transitions on Android. Still pretty ro…
Browse files Browse the repository at this point in the history
…ugh around the edges, but mostly blink-free.
  • Loading branch information
Wilto committed Dec 26, 2011
1 parent 138547c commit 7bf9ce5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
21 changes: 9 additions & 12 deletions css/structure/jquery.mobile.transitions.css
Expand Up @@ -20,22 +20,19 @@ Built by David Kaneda and maintained by Jonathan Stark.


.slide.out {
-webkit-transform: translateX(-100%);
opacity: 0;
-webkit-animation-name: slideouttoleft;
}

.slide.in {
-webkit-transform: translateX(0);
-webkit-animation-name: slideinfromright;
}

.slide.out.reverse {
-webkit-transform: translateX(100%);
-webkit-animation-name: slideouttoright;
}

.slide.in.reverse {
-webkit-transform: translateX(0);
-webkit-animation-name: slideinfromleft;
}

Expand Down Expand Up @@ -84,23 +81,23 @@ Built by David Kaneda and maintained by Jonathan Stark.
}

@-webkit-keyframes slideinfromright {
from { -webkit-transform: translateX(100%); }
to { -webkit-transform: translateX(0); }
from { left: 210%; }
to { left: 0; }
}

@-webkit-keyframes slideinfromleft {
from { -webkit-transform: translateX(-100%); }
to { -webkit-transform: translateX(0); }
from { left: -1000px; }
to { left: 0; }
}

@-webkit-keyframes slideouttoleft {
from { -webkit-transform: translateX(0); }
to { -webkit-transform: translateX(-100%); }
from { opacity: 1; left: auto; right: 0%; }
to { opacity: 1; left: auto; right: 100%; }
}

@-webkit-keyframes slideouttoright {
from { -webkit-transform: translateX(0); }
to { -webkit-transform: translateX(100%); }
from { opacity: 1; left: 0; }
to { opacity: .9; left: 200%; }
}

@-webkit-keyframes slideinfromtop {
Expand Down
4 changes: 2 additions & 2 deletions docs/_assets/js/jqm-docs.js
Expand Up @@ -39,10 +39,10 @@ function setDefaultTransition(){
trans ="slide";

if( winwidth >= 1000 ){
trans = "none";
trans = "slide"; // trans = "none";
}
else if( winwidth >= 650 ){
trans = "fade";
trans = "slide";
}

$.mobile.defaultPageTransition = trans;
Expand Down

0 comments on commit 7bf9ce5

Please sign in to comment.