From 75e43f3d39c777ce92748f1f0d8efca651b8bd1e Mon Sep 17 00:00:00 2001 From: Ghislain Seguin Date: Thu, 12 Jan 2012 10:09:25 -0800 Subject: [PATCH] Finished merging branch 'out-in-transition', I had trailing commas in there instead of semi-colons --- css/themes/default/jquery.mobile.css | 8 ++++++++ css/themes/valencia/jquery.mobile.css | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/css/themes/default/jquery.mobile.css b/css/themes/default/jquery.mobile.css index f0204d28..10aef647 100644 --- a/css/themes/default/jquery.mobile.css +++ b/css/themes/default/jquery.mobile.css @@ -1,6 +1,14 @@ @import url( "jquery.mobile.theme.css" ); @import url( "../../structure/jquery.mobile.core.css" ); @import url( "../../structure/jquery.mobile.transitions.css" ); +@import url( "../../structure/jquery.mobile.transitions.fade.css" ); +@import url( "../../structure/jquery.mobile.transitions.pop.css" ); +@import url( "../../structure/jquery.mobile.transitions.slide.css" ); +@import url( "../../structure/jquery.mobile.transitions.slidedown.css" ); +@import url( "../../structure/jquery.mobile.transitions.slideup.css" ); +@import url( "../../structure/jquery.mobile.transitions.flip.css" ); +@import url( "../../structure/jquery.mobile.transitions.turn.css" ); +@import url( "../../structure/jquery.mobile.transitions.flow.css" ); @import url( "../../structure/jquery.mobile.grids.css" ); @import url( "../../structure/jquery.mobile.headerfooter.css" ); @import url( "../../structure/jquery.mobile.navbar.css" ); diff --git a/css/themes/valencia/jquery.mobile.css b/css/themes/valencia/jquery.mobile.css index f0204d28..10aef647 100644 --- a/css/themes/valencia/jquery.mobile.css +++ b/css/themes/valencia/jquery.mobile.css @@ -1,6 +1,14 @@ @import url( "jquery.mobile.theme.css" ); @import url( "../../structure/jquery.mobile.core.css" ); @import url( "../../structure/jquery.mobile.transitions.css" ); +@import url( "../../structure/jquery.mobile.transitions.fade.css" ); +@import url( "../../structure/jquery.mobile.transitions.pop.css" ); +@import url( "../../structure/jquery.mobile.transitions.slide.css" ); +@import url( "../../structure/jquery.mobile.transitions.slidedown.css" ); +@import url( "../../structure/jquery.mobile.transitions.slideup.css" ); +@import url( "../../structure/jquery.mobile.transitions.flip.css" ); +@import url( "../../structure/jquery.mobile.transitions.turn.css" ); +@import url( "../../structure/jquery.mobile.transitions.flow.css" ); @import url( "../../structure/jquery.mobile.grids.css" ); @import url( "../../structure/jquery.mobile.headerfooter.css" ); @import url( "../../structure/jquery.mobile.navbar.css" );