Merged MDL-25565 PULL-451 and fixed conflicts

This commit is contained in:
Sam Hemelryk
2011-03-21 11:16:50 +08:00
+7 -1
View File
@@ -698,4 +698,10 @@ body.tag .managelink {padding: 5px;}
.mod-indent-huge {margin-left:300px;}
/* Resourcelib mp3 player size: only width could be changed here, height hardcoded in JS */
.resourcecontent .resourcemediaplugin_mp3 object {height:25px; width: 600px}
.resourcecontent .resourcemediaplugin_mp3 object {height:25px; width: 600px}
/*
Fix for SubScript & SuperScript
------------------------------*/
sub { vertical-align: sub;}
sup { vertical-align: super;