Merge branch 'MDL-28235-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 04:37:06 +0000 (17:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 04:37:06 +0000 (17:37 +1300)
1  2 
lib/javascript-static.js
lib/outputrenderers.php
theme/base/style/core.css

Simple merge
Simple merge
@@@ -490,9 -484,10 +490,11 @@@ body.tag .managelink {padding: 5px;
  #helppopupbox {background-color: #eee; border: 1px solid #848484;z-index: 10000 !important;}
  #helppopupbox .yui3-widget-hd {float:right;margin:3px 3px 0 0;}
  #helppopupbox .yui3-widget-bd {margin:0 1em 1em 1em;border-top:1px solid #eee;}
+ #helppopupbox .yui3-widget-ft {text-align: center;}
+ #helppopupbox .yui3-widget-ft .closebtn {margin:0 1em 1em 1em;}
  #helppopupbox .helpheading {font-size: 1em;}
  #helppopupbox .spinner {margin:1em;}
 +.dir-rtl #helppopupbox .yui3-widget-hd {float:left;margin:3px 0 0 3px;}
  
  /**
   * Custom menu