Permalink
Browse files

Merge branch 'wip-MDL-36960-m24' of git://github.com/amygroshek/moodl…

…e into MOODLE_24_STABLE
  • Loading branch information...
2 parents 0c767bf + 90d7403 commit 9b1f784178e7134a1c9701802d45791d9a58e5a9 @danpoltawski danpoltawski committed Dec 6, 2012
Showing with 4 additions and 1 deletion.
  1. +1 −1 blocks/dock.js
  2. +3 −0 theme/base/style/dock.css
View
@@ -516,7 +516,7 @@ M.core_dock.fixTitleOrientation = function(item, title, text) {
// We need to fix a font-size - sorry theme designers.
var fontsize = '11px';
var transform = (clockwise) ? 'rotate(90deg)' : 'rotate(270deg)';
- var test = Y.Node.create('<h2><span style="font-size:'+fontsize+';position:absolute;">'+text+'</span></h2>');
+ var test = Y.Node.create('<h2><span class="transform-test-node" style="font-size:'+fontsize+';">'+text+'</span></h2>');
this.nodes.body.insert(test, 0);
var width = test.one('span').get('offsetWidth') * 1.2;
var height = test.one('span').get('offsetHeight');
@@ -42,3 +42,6 @@ body.has_dock {margin-left:30px;}
.dir-rtl #dock {left:auto;right: 0%; border-left: 1px solid #DDD;}
.dir-rtl #dock .dockedtitle { border-bottom: 1px solid #DDD;border-top: 1px solid #EEE; cursor: pointer;}
body.dir-rtl.has_dock {margin-left: 0px; margin-right: 30px}
+
+/* Test span used to calculate positioning of docked item labels */
+.transform-test-node { position:absolute;line-height:normal; }

0 comments on commit 9b1f784

Please sign in to comment.