Merge branch 'MDL-30601' of git://github.com/rwijaya/moodle

2025-03-14 04:30:15 +01:00 · 2012-01-03 10:30:41 +13:00 · 2012-01-03 10:30:41 +13:00 · e525c992ca
commit e525c992ca
parent 03273b5357 e09c5a59a9
3 changed files with 987 additions and 708 deletions
--- a/theme/mymobile/config.php
+++ b/theme/mymobile/config.php
@ -34,7 +34,7 @@ $THEME->parents = array(

 // Set the stylesheets that we want to include for this theme
 $THEME->sheets = array(
-    'jmobilerc2',
+    'jmobile1',
    'core',
    'media'
 );
@ -157,7 +157,7 @@ if ($thisdevice == "default" || $thisdevice == "tablet" || optional_param('mymob
 $THEME->javascripts = array(
    'jquery-1.6.4.min',
    'custom',
-    'jquery.mobile-1.0rc2',
+    'jquery.mobile-1.0',
    'scrollview',
    'easing'
 );
--- a/theme/mymobile/javascript/jquery.mobile-1.0rc2.js
+++ b/theme/mymobile/javascript/jquery.mobile-1.0rc2.js
--- a/theme/mymobile/style/jmobilerc2.css
+++ b/theme/mymobile/style/jmobilerc2.css