Permalink
Browse files

Merge branch 'm22_MDL-31888' of git://github.com/danmarsden/moodle in…

…to MOODLE_22_STABLE

Conflicts:
	mod/scorm/styles.css
  • Loading branch information...
2 parents 12d0b6c + cbf6a49 commit b3fe3fb6c8b0b7f51d566775ead551c10a0733e5 Sam Hemelryk committed Mar 12, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 mod/scorm/styles.css
@@ -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;}

0 comments on commit b3fe3fb

Please sign in to comment.