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

Conflicts: theme/bootstrapbase/style/moodle.css
2025-01-18 22:08:20 +01:00 · 2013-06-04 14:37:55 +08:00 · 2013-06-04 14:37:55 +08:00 · 93ab081025
commit 93ab081025
parent e404e040d3 873dfb3608
2 changed files with 2 additions and 1 deletions
--- a/theme/bootstrapbase/less/moodle/filemanager.less
+++ b/theme/bootstrapbase/less/moodle/filemanager.less
@ -813,6 +813,7 @@ a.ygtvspacer:hover {
 .filemanager-toolbar{
    padding: 5px 8px;
    min-height: 22px;
+    overflow: hidden;
 }
 .fp-pathbar {
    border-top: 1px solid #BBBBBB;
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css