Permalink
Browse files

Following r.js upgrade, rely on @import to express CSS dependencies

  • Loading branch information...
1 parent d784fbc commit 76fa275fe35ed6ab3ccedeefaa534db0df7eb92a @gseguin gseguin committed Mar 30, 2012
View
2 css/structure/jquery.mobile.structure.css
@@ -2,8 +2,6 @@
@import url( "jquery.mobile.transitions.css" );
@import url( "jquery.mobile.transitions.fade.css" );
@import url( "jquery.mobile.transitions.pop.css" );
-@import url( "jquery.mobile.transitions.slidein.keyframes.css" ); /* move to jquery.mobile.transitions.slide.css once we move to r.js 1.0.8 */
-@import url( "jquery.mobile.transitions.slideout.keyframes.css" ); /* move to jquery.mobile.transitions.slide.css once we move to r.js 1.0.8 */
@import url( "jquery.mobile.transitions.slide.css" );
@import url( "jquery.mobile.transitions.slidefade.css" );
@import url( "jquery.mobile.transitions.slidedown.css" );
View
6 css/structure/jquery.mobile.transitions.slide.css
@@ -1,6 +1,6 @@
-/* import url( "jquery.mobile.transitions.slidein.keyframes.css" ); */
-/* import url( "jquery.mobile.transitions.slideout.keyframes.css" ); */
-/* slide transition - depends on slidein.keyframes and slideout.keyframes */
+@import url( "jquery.mobile.transitions.slidein.keyframes.css" );
+@import url( "jquery.mobile.transitions.slideout.keyframes.css" );
+
.slide.out, .slide.in {
-webkit-animation-timing-function: ease-out;
-webkit-animation-duration: 350ms;
View
5 css/structure/jquery.mobile.transitions.slidefade.css
@@ -1,7 +1,6 @@
-/* import url( "jquery.mobile.transitions.fade.css" ); */
-/* import url( "jquery.mobile.transitions.slideout.keyframes.css" );*/
+@import url( "jquery.mobile.transitions.fade.css" );
+@import url( "jquery.mobile.transitions.slideout.keyframes.css" );
-/* slidefade transition - depends on fadein and slideout.keyframes */
.slidefade.out {
-webkit-transform: translateX(-100%);
-webkit-animation-name: slideouttoleft;

0 comments on commit 76fa275

Please sign in to comment.