Skip to content
Browse files

#27 close

  • Loading branch information...
1 parent 2028dd4 commit 5b4686aff61ec2bc18b600eb125ca44c2c15d3b2 @hiroprotagonist committed
Showing with 36 additions and 22 deletions.
  1. +5 −3 examples/singlepage.html
  2. +31 −19 jquery.mobile.actionsheet.css
View
8 examples/singlepage.html
@@ -3,11 +3,13 @@
<head>
<title>Test 1 2 3</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css" />
+ <link rel="stylesheet" href="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.css" />
+ <script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
+ <script src="http://code.jquery.com/mobile/1.1.0/jquery.mobile-1.1.0.min.js"></script>
+
<link rel="stylesheet" href="../jquery.mobile.actionsheet.css" />
- <script type="text/javascript" src="http://code.jquery.com/jquery-1.6.4.min.js"></script>
- <script type="text/javascript" src="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.js"></script>
<script type="text/javascript" src="../jquery.mobile.actionsheet.js"></script>
+
<style type='text/css' rel='stylesheet'>
#login { background:transparent; }
#login input { display:inline; width:86%; padding:5px; margin:7px; }
View
50 jquery.mobile.actionsheet.css
@@ -34,23 +34,6 @@
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5E6369', endColorstr='#303339',GradientType=0 ); /* ie */
background: -o-linear-gradient(top, #5E6369 0%,#52575D 1%,#40454E 46%,#141D26 50%,#252F38 98%,#303339 100%); /* opera */
}
-@-webkit-keyframes actionsheet-open-fade {
- from {
- opacity: 0;
- }
- to {
- opacity: 1;
- }
-}
-
-@-webkit-keyframes actionsheet-close-fade {
- from {
- opacity: 1;
- }
- to {
- opacity: 0;
- }
-}
@-webkit-keyframes actionsheet-open-slideup {
0% {
-webkit-transform: translateY(1100px);
@@ -64,7 +47,7 @@
}
@-webkit-keyframes actionsheet-close-slideup {
0% {
- -webkit-transform: translateY(0);
+ -webkit-transform: translateY(0);
}
30% {
-webkit-transform: translateY(-30px);
@@ -74,14 +57,43 @@
-webkit-transform: translateY(300px);
}
}
+@-moz-keyframes actionsheet-open-slideup {
+ 0% {
+ -moz-transform: translateY(1100px);
+ }
+ 70% {
+ -moz-transform: translateY(-20px);
+ }
+ 100% {
+ -moz-transform: translateY(0);
+ }
+}
+@-moz-keyframes actionsheet-close-slideup {
+ 0% {
+ -moz-transform: translateY(0);
+ }
+ 30% {
+ -moz-transform: translateY(-30px);
+ }
+ 100% {
+ opacity: 0;
+ -moz-transform: translateY(300px);
+ }
+}
.ui-actionsheet-animateIn {
-webkit-animation-name: actionsheet-open-slideup;
-webkit-animation-delay: 0;
-webkit-animation-duration: 500ms;
+ -moz-animation-name: actionsheet-open-slideup;
+ -moz-animation-delay: 0;
+ -moz-animation-duration: 500ms;
}
.ui-actionsheet-animateOut {
-webkit-animation-name: actionsheet-close-slideup;
-webkit-animation-delay: 0;
- -webkit-animation-duration: 500ms;
+ -webkit-animation-duration: 500ms;
+ -moz-animation-name: actionsheet-close-slideup;
+ -moz-animation-delay: 0;
+ -moz-animation-duration: 500ms;
}

1 comment on commit 5b4686a

@brodybits

Extra whitespace at the end of line #50

Please sign in to comment.
Something went wrong with that request. Please try again.