Merge branch 'master_MDL-31888' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 04:29:39 +0000 (17:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Mar 2012 04:29:39 +0000 (17:29 +1300)
Conflicts:
mod/scorm/styles.css

1  2 
mod/scorm/styles.css

@@@ -27,7 -27,7 +27,8 @@@
  #page-mod-scorm-player #altpopuplink  {position: left; padding: 5px; border: 0px; }
  #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 -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;}