mirror of
https://github.com/Hopiu/jquery-mobile.git
synced 2026-03-16 22:10:25 +00:00
Merge remote branch 'origin/master'
This commit is contained in:
commit
5d30cdb50d
8 changed files with 39 additions and 26 deletions
|
|
@ -21,9 +21,9 @@
|
|||
.fade.out {
|
||||
z-index: 0;
|
||||
opacity: 0;
|
||||
-webkit-animation-duration: 100ms;
|
||||
-webkit-animation-duration: 125ms;
|
||||
-webkit-animation-name: fadeout;
|
||||
-moz-animation-duration: 100ms;
|
||||
-moz-animation-duration: 125ms;
|
||||
-moz-animation-name: fadeout;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@
|
|||
.flip.out {
|
||||
-webkit-transform: rotateY(-90deg) scale(.9);
|
||||
-webkit-animation-name: flipouttoleft;
|
||||
-webkit-animation-duration: 225ms;
|
||||
-webkit-animation-duration: 175ms;
|
||||
-moz-transform: rotateY(-90deg) scale(.9);
|
||||
-moz-animation-name: flipouttoleft;
|
||||
-moz-animation-duration: 225ms;
|
||||
-moz-animation-duration: 175ms;
|
||||
}
|
||||
|
||||
.flip.in {
|
||||
-webkit-animation-name: flipintoright;
|
||||
-webkit-animation-duration: 350ms;
|
||||
-webkit-animation-duration: 225ms;
|
||||
-moz-animation-name: flipintoright;
|
||||
-moz-animation-duration: 350ms;
|
||||
-moz-animation-duration: 225ms;
|
||||
}
|
||||
|
||||
.flip.out.reverse {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
-moz-box-shadow: 0 0 20px rgba(0,0,0,.4);
|
||||
}
|
||||
.ui-dialog-page.flow {
|
||||
-webkit-transform-origin: none;
|
||||
-moz-transform-origin: none;
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
|
|
@ -14,22 +15,22 @@
|
|||
-webkit-transform: translateX(-100%) scale(.7);
|
||||
-webkit-animation-name: flowouttoleft;
|
||||
-webkit-animation-timing-function: ease;
|
||||
-webkit-animation-duration: 500ms;
|
||||
-webkit-animation-duration: 350ms;
|
||||
-moz-transform: translateX(-100%) scale(.7);
|
||||
-moz-animation-name: flowouttoleft;
|
||||
-moz-animation-timing-function: ease;
|
||||
-moz-animation-duration: 500ms;
|
||||
-moz-animation-duration: 350ms;
|
||||
}
|
||||
|
||||
.flow.in {
|
||||
-webkit-transform: translateX(0) scale(1);
|
||||
-webkit-animation-name: flowinfromright;
|
||||
-webkit-animation-timing-function: ease;
|
||||
-webkit-animation-duration: 400ms;
|
||||
-webkit-animation-duration: 350ms;
|
||||
-moz-transform: translateX(0) scale(1);
|
||||
-moz-animation-name: flowinfromright;
|
||||
-moz-animation-timing-function: ease;
|
||||
-moz-animation-duration: 400ms;
|
||||
-moz-animation-duration: 350ms;
|
||||
}
|
||||
|
||||
.flow.out.reverse {
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
-webkit-animation-name: fadeout;
|
||||
-moz-animation-name: fadeout;
|
||||
opacity: 0;
|
||||
-webkit-animation-duration: 225ms;
|
||||
-moz-animation-duration: 225ms;
|
||||
-webkit-animation-duration: 100ms;
|
||||
-moz-animation-duration: 100ms;
|
||||
}
|
||||
|
||||
.pop.in.reverse {
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
-webkit-animation-name: fadein;
|
||||
-moz-transform: translateX(0);
|
||||
-moz-animation-name: fadein;
|
||||
-webkit-animation-duration: 350ms;
|
||||
-moz-animation-duration: 350ms;
|
||||
-webkit-animation-duration: 200ms;
|
||||
-moz-animation-duration: 200ms;
|
||||
}
|
||||
|
||||
.slide.out.reverse {
|
||||
|
|
@ -22,6 +22,8 @@
|
|||
-webkit-animation-name: slideouttoright;
|
||||
-moz-transform: translateX(100%);
|
||||
-moz-animation-name: slideouttoright;
|
||||
-webkit-animation-duration: 200ms;
|
||||
-moz-animation-duration: 200ms;
|
||||
}
|
||||
|
||||
.slide.in.reverse {
|
||||
|
|
@ -29,6 +31,8 @@
|
|||
-webkit-animation-name: fadein;
|
||||
-moz-transform: translateX(0);
|
||||
-moz-animation-name: fadein;
|
||||
-webkit-animation-duration: 200ms;
|
||||
-moz-animation-duration: 200ms;
|
||||
}
|
||||
|
||||
@-webkit-keyframes slideouttoleft {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
.slidedown.out {
|
||||
-webkit-animation-name: fadeout;
|
||||
-moz-animation-name: fadeout;
|
||||
-webkit-animation-duration: 225ms;
|
||||
-moz-animation-duration: 225ms;
|
||||
-webkit-animation-duration: 100ms;
|
||||
-moz-animation-duration: 100ms;
|
||||
}
|
||||
|
||||
.slidedown.in {
|
||||
|
|
@ -11,13 +11,15 @@
|
|||
-webkit-animation-name: slideinfromtop;
|
||||
-moz-transform: translateY(0);
|
||||
-moz-animation-name: slideinfromtop;
|
||||
-webkit-animation-duration: 350ms;
|
||||
-moz-animation-duration: 350ms;
|
||||
-webkit-animation-duration: 250ms;
|
||||
-moz-animation-duration: 250ms;
|
||||
}
|
||||
|
||||
.slidedown.in.reverse {
|
||||
-webkit-animation-name: fadein;
|
||||
-moz-animation-name: fadein;
|
||||
-webkit-animation-duration: 150ms;
|
||||
-moz-animation-duration: 150ms;
|
||||
}
|
||||
|
||||
.slidedown.out.reverse {
|
||||
|
|
@ -25,6 +27,8 @@
|
|||
-moz-transform: translateY(-100%);
|
||||
-webkit-animation-name: slideouttotop;
|
||||
-moz-animation-name: slideouttotop;
|
||||
-webkit-animation-duration: 200ms;
|
||||
-moz-animation-duration: 200ms;
|
||||
}
|
||||
|
||||
@-webkit-keyframes slideinfromtop {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
.slideup.out {
|
||||
-webkit-animation-name: fadeout;
|
||||
-moz-animation-name: fadeout;
|
||||
-webkit-animation-duration: 225ms;
|
||||
-moz-animation-duration: 225ms;
|
||||
-webkit-animation-duration: 100ms;
|
||||
-moz-animation-duration: 100ms;
|
||||
}
|
||||
|
||||
.slideup.in {
|
||||
|
|
@ -11,13 +11,15 @@
|
|||
-webkit-animation-name: slideinfrombottom;
|
||||
-moz-transform: translateY(0);
|
||||
-moz-animation-name: slideinfrombottom;
|
||||
-webkit-animation-duration: 350ms;
|
||||
-moz-animation-duration: 350ms;
|
||||
-webkit-animation-duration: 250ms;
|
||||
-moz-animation-duration: 250ms;
|
||||
}
|
||||
|
||||
.slideup.in.reverse {
|
||||
-webkit-animation-name: fadein;
|
||||
-moz-animation-name: fadein;
|
||||
-webkit-animation-duration: 150ms;
|
||||
-moz-animation-duration: 150ms;
|
||||
}
|
||||
|
||||
.slideup.out.reverse {
|
||||
|
|
@ -25,6 +27,8 @@
|
|||
-moz-transform: translateY(100%);
|
||||
-webkit-animation-name: slideouttobottom;
|
||||
-moz-animation-name: slideouttobottom;
|
||||
-webkit-animation-duration: 200ms;
|
||||
-moz-animation-duration: 200ms;
|
||||
}
|
||||
|
||||
@-webkit-keyframes slideinfrombottom {
|
||||
|
|
|
|||
|
|
@ -25,15 +25,15 @@
|
|||
-webkit-animation-name: flipouttoleft;
|
||||
-moz-transform: rotateY(-90deg) scale(.9);
|
||||
-moz-animation-name: flipouttoleft;
|
||||
-webkit-animation-duration: 225ms;
|
||||
-moz-animation-duration: 225ms;
|
||||
-webkit-animation-duration: 125ms;
|
||||
-moz-animation-duration: 125ms;
|
||||
}
|
||||
|
||||
.turn.in {
|
||||
-webkit-animation-name: flipintoright;
|
||||
-moz-animation-name: flipintoright;
|
||||
-webkit-animation-duration: 350ms;
|
||||
-moz-animation-duration: 350ms;
|
||||
-webkit-animation-duration: 250ms;
|
||||
-moz-animation-duration: 250ms;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue