Skip to content

Commit 5d30cdb

Browse files
author
scottjehl
committed
Merge remote branch 'origin/master'
2 parents 57af436 + f53ac0d commit 5d30cdb

8 files changed

+39
-26
lines changed

css/structure/jquery.mobile.transitions.fade.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
.fade.out {
2222
z-index: 0;
2323
opacity: 0;
24-
-webkit-animation-duration: 100ms;
24+
-webkit-animation-duration: 125ms;
2525
-webkit-animation-name: fadeout;
26-
-moz-animation-duration: 100ms;
26+
-moz-animation-duration: 125ms;
2727
-moz-animation-name: fadeout;
2828
}
2929

css/structure/jquery.mobile.transitions.flip.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
.flip.out {
2121
-webkit-transform: rotateY(-90deg) scale(.9);
2222
-webkit-animation-name: flipouttoleft;
23-
-webkit-animation-duration: 225ms;
23+
-webkit-animation-duration: 175ms;
2424
-moz-transform: rotateY(-90deg) scale(.9);
2525
-moz-animation-name: flipouttoleft;
26-
-moz-animation-duration: 225ms;
26+
-moz-animation-duration: 175ms;
2727
}
2828

2929
.flip.in {
3030
-webkit-animation-name: flipintoright;
31-
-webkit-animation-duration: 350ms;
31+
-webkit-animation-duration: 225ms;
3232
-moz-animation-name: flipintoright;
33-
-moz-animation-duration: 350ms;
33+
-moz-animation-duration: 225ms;
3434
}
3535

3636
.flip.out.reverse {

css/structure/jquery.mobile.transitions.flow.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
-moz-box-shadow: 0 0 20px rgba(0,0,0,.4);
77
}
88
.ui-dialog-page.flow {
9+
-webkit-transform-origin: none;
910
-moz-transform-origin: none;
1011
-webkit-box-shadow: none;
1112
-moz-box-shadow: none;
@@ -14,22 +15,22 @@
1415
-webkit-transform: translateX(-100%) scale(.7);
1516
-webkit-animation-name: flowouttoleft;
1617
-webkit-animation-timing-function: ease;
17-
-webkit-animation-duration: 500ms;
18+
-webkit-animation-duration: 350ms;
1819
-moz-transform: translateX(-100%) scale(.7);
1920
-moz-animation-name: flowouttoleft;
2021
-moz-animation-timing-function: ease;
21-
-moz-animation-duration: 500ms;
22+
-moz-animation-duration: 350ms;
2223
}
2324

2425
.flow.in {
2526
-webkit-transform: translateX(0) scale(1);
2627
-webkit-animation-name: flowinfromright;
2728
-webkit-animation-timing-function: ease;
28-
-webkit-animation-duration: 400ms;
29+
-webkit-animation-duration: 350ms;
2930
-moz-transform: translateX(0) scale(1);
3031
-moz-animation-name: flowinfromright;
3132
-moz-animation-timing-function: ease;
32-
-moz-animation-duration: 400ms;
33+
-moz-animation-duration: 350ms;
3334
}
3435

3536
.flow.out.reverse {

css/structure/jquery.mobile.transitions.pop.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
-webkit-animation-name: fadeout;
1818
-moz-animation-name: fadeout;
1919
opacity: 0;
20-
-webkit-animation-duration: 225ms;
21-
-moz-animation-duration: 225ms;
20+
-webkit-animation-duration: 100ms;
21+
-moz-animation-duration: 100ms;
2222
}
2323

2424
.pop.in.reverse {

css/structure/jquery.mobile.transitions.slide.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,26 @@
1313
-webkit-animation-name: fadein;
1414
-moz-transform: translateX(0);
1515
-moz-animation-name: fadein;
16-
-webkit-animation-duration: 350ms;
17-
-moz-animation-duration: 350ms;
16+
-webkit-animation-duration: 200ms;
17+
-moz-animation-duration: 200ms;
1818
}
1919

2020
.slide.out.reverse {
2121
-webkit-transform: translateX(100%);
2222
-webkit-animation-name: slideouttoright;
2323
-moz-transform: translateX(100%);
2424
-moz-animation-name: slideouttoright;
25+
-webkit-animation-duration: 200ms;
26+
-moz-animation-duration: 200ms;
2527
}
2628

2729
.slide.in.reverse {
2830
-webkit-transform: translateX(0);
2931
-webkit-animation-name: fadein;
3032
-moz-transform: translateX(0);
3133
-moz-animation-name: fadein;
34+
-webkit-animation-duration: 200ms;
35+
-moz-animation-duration: 200ms;
3236
}
3337

3438
@-webkit-keyframes slideouttoleft {

css/structure/jquery.mobile.transitions.slidedown.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,33 @@
22
.slidedown.out {
33
-webkit-animation-name: fadeout;
44
-moz-animation-name: fadeout;
5-
-webkit-animation-duration: 225ms;
6-
-moz-animation-duration: 225ms;
5+
-webkit-animation-duration: 100ms;
6+
-moz-animation-duration: 100ms;
77
}
88

99
.slidedown.in {
1010
-webkit-transform: translateY(0);
1111
-webkit-animation-name: slideinfromtop;
1212
-moz-transform: translateY(0);
1313
-moz-animation-name: slideinfromtop;
14-
-webkit-animation-duration: 350ms;
15-
-moz-animation-duration: 350ms;
14+
-webkit-animation-duration: 250ms;
15+
-moz-animation-duration: 250ms;
1616
}
1717

1818
.slidedown.in.reverse {
1919
-webkit-animation-name: fadein;
2020
-moz-animation-name: fadein;
21+
-webkit-animation-duration: 150ms;
22+
-moz-animation-duration: 150ms;
2123
}
2224

2325
.slidedown.out.reverse {
2426
-webkit-transform: translateY(-100%);
2527
-moz-transform: translateY(-100%);
2628
-webkit-animation-name: slideouttotop;
2729
-moz-animation-name: slideouttotop;
30+
-webkit-animation-duration: 200ms;
31+
-moz-animation-duration: 200ms;
2832
}
2933

3034
@-webkit-keyframes slideinfromtop {

css/structure/jquery.mobile.transitions.slideup.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,33 @@
22
.slideup.out {
33
-webkit-animation-name: fadeout;
44
-moz-animation-name: fadeout;
5-
-webkit-animation-duration: 225ms;
6-
-moz-animation-duration: 225ms;
5+
-webkit-animation-duration: 100ms;
6+
-moz-animation-duration: 100ms;
77
}
88

99
.slideup.in {
1010
-webkit-transform: translateY(0);
1111
-webkit-animation-name: slideinfrombottom;
1212
-moz-transform: translateY(0);
1313
-moz-animation-name: slideinfrombottom;
14-
-webkit-animation-duration: 350ms;
15-
-moz-animation-duration: 350ms;
14+
-webkit-animation-duration: 250ms;
15+
-moz-animation-duration: 250ms;
1616
}
1717

1818
.slideup.in.reverse {
1919
-webkit-animation-name: fadein;
2020
-moz-animation-name: fadein;
21+
-webkit-animation-duration: 150ms;
22+
-moz-animation-duration: 150ms;
2123
}
2224

2325
.slideup.out.reverse {
2426
-webkit-transform: translateY(100%);
2527
-moz-transform: translateY(100%);
2628
-webkit-animation-name: slideouttobottom;
2729
-moz-animation-name: slideouttobottom;
30+
-webkit-animation-duration: 200ms;
31+
-moz-animation-duration: 200ms;
2832
}
2933

3034
@-webkit-keyframes slideinfrombottom {

css/structure/jquery.mobile.transitions.turn.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
-webkit-animation-name: flipouttoleft;
2626
-moz-transform: rotateY(-90deg) scale(.9);
2727
-moz-animation-name: flipouttoleft;
28-
-webkit-animation-duration: 225ms;
29-
-moz-animation-duration: 225ms;
28+
-webkit-animation-duration: 125ms;
29+
-moz-animation-duration: 125ms;
3030
}
3131

3232
.turn.in {
3333
-webkit-animation-name: flipintoright;
3434
-moz-animation-name: flipintoright;
35-
-webkit-animation-duration: 350ms;
36-
-moz-animation-duration: 350ms;
35+
-webkit-animation-duration: 250ms;
36+
-moz-animation-duration: 250ms;
3737

3838
}
3939

0 commit comments

Comments
 (0)