Merge branch 'MDL-45930-master' of git://github.com/danpoltawski/moodle

iFixit · Jan 7, 2015 · ac667aa · ac667aa
2 parents ac38af7 + 41284e8
commit ac667aa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/theme/base/style/filemanager.css b/theme/base/style/filemanager.css
@@ -251,6 +251,7 @@ a.ygtvspacer:hover {color:transparent;text-decoration:none;}
 .file-picker.fp-select.loading .fp-select-loading {display:block;}
 .file-picker.fp-select.loading form {display:none;}
 .fp-select .fp-dimensions.fp-unknown {display:none;}
+.fp-select .fp-size.fp-unknown {display:none;}
 
  /*
  * File Manager

diff --git a/theme/bootstrapbase/less/moodle/filemanager.less b/theme/bootstrapbase/less/moodle/filemanager.less
@@ -760,6 +760,9 @@ a.ygtvspacer:hover {
 .fp-select .fp-dimensions.fp-unknown {
     display: none;
 }
+.fp-select .fp-size.fp-unknown {
+    display: none;
+}
 // File Manager
 .filemanager-loading{
     display: none;

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css