Merge branch 'MDL-48199_M27' of git://github.com/lazydaisy/moodle into MOODLE_27_STABLE

Conflicts: theme/bootstrapbase/style/moodle.css
2014-11-17 16:42:47 +00:00
parent fe53059c04 121a45e388
commit e44b4ab746
2 changed files with 3 additions and 2 deletions
@@ -20,6 +20,7 @@
 body.has_dock {
    #page {
        padding-left: (@dockWidth + (@dockTitleMargin * 3));
+        padding-right: @gridGutterWidth;
    }
    div#dock {
        display: inline;
@@ -135,7 +136,7 @@ body.has_dock {

 .dir-rtl {
    &.has_dock #page {
-        padding-left: 0;
+        padding-left: @gridGutterWidth;
        padding-right: (@dockWidth + (@dockTitleMargin * 3));
    }
    #dock {