Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
2025-08-07 18:06:51 +02:00 · 2013-10-08 08:48:43 +13:00 · 2013-10-08 08:48:43 +13:00 · 6455dec02d
commit 6455dec02d
parent 81a939be02 09bfdcb091
3 changed files with 2 additions and 3 deletions
--- a/theme/bootstrapbase/less/moodle/filemanager.less
+++ b/theme/bootstrapbase/less/moodle/filemanager.less
@ -116,7 +116,6 @@
 }
 .filepicker.moodle-dialogue-fullscreen .file-picker .fp-content {
    width: 100%;
-    height: 100%;
 }
 .dir-rtl .file-picker .fp-repo-items {
    margin-right: 181px;
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css