Merge branch 'wip-MDL-39819_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE

Conflicts: theme/bootstrapbase/style/moodle.css
2013-06-04 14:38:36 +08:00
parent f85cb076aa dfb83eb132
commit 2b7e18fded
2 changed files with 2 additions and 1 deletions
@@ -813,6 +813,7 @@ a.ygtvspacer:hover {
 .filemanager-toolbar{
    padding: 5px 8px;
    min-height: 22px;
+    overflow: hidden;
 }
 .fp-pathbar {
    border-top: 1px solid #BBBBBB;