Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle

Conflicts:
	mod/scorm/styles.css
This commit is contained in:
Sam Hemelryk
2012-03-12 17:29:39 +13:00
+2 -1
View File
@@ -28,6 +28,7 @@
#page-mod-scorm-player #scormmode {float: left; border: 0px; }
#page-mod-scorm-player.pagelayout-popup #page-content .region-content {padding: 0px; }
#page-mod-scorm-player.pagelayout-popup #page-wrapper {width:100%;}
#page-mod-scorm-player .yui-layout-scroll div.yui-layout-bd {overflow:visible;}
.path-mod-scorm.forcejavascript .scorm-center { display:none;}
.path-mod-scorm.forcejavascript .toc { display:none;}
@@ -36,4 +37,4 @@
.path-mod-scorm.jsenabled .forcejavascriptmessage {display: none;}
.path-mod-scorm.jsenabled .scorm-center { display:block;}
.path-mod-scorm.jsenabled .toc { display:block;}
.path-mod-scorm.jsenabled #scormpage #tocbox { display:block;}
.path-mod-scorm.jsenabled #scormpage #tocbox { display:block;}