Merge branch 'MDL-41159-master' of git://github.com/damyon/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
Mrmoodle · Aug 20, 2013 · b89fbc4 · b89fbc4
2 parents ead9cce + 048422d
commit b89fbc4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/theme/base/style/filemanager.css b/theme/base/style/filemanager.css
@@ -328,7 +328,7 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
  * Folder Context Menu (File Manager only)
  */
 .filemanager .fp-contextmenu {display:none;}
-.filemanager .fp-iconview .fp-folder.fp-hascontextmenu .fp-contextmenu {display:block;position:absolute;right:7px;bottom:5px;z-index: 2000;}
+.filemanager .fp-iconview .fp-folder.fp-hascontextmenu .fp-contextmenu {display:block;position:absolute;right:7px;bottom:5px;}
 .filemanager .fp-treeview .fp-folder.fp-hascontextmenu .fp-contextmenu,
 .filemanager .fp-tableview .fp-folder.fp-hascontextmenu .fp-contextmenu {display: inline;position: absolute;left: 14px;margin-right: -20px;top: 6px;}
 

diff --git a/theme/bootstrapbase/less/moodle/filemanager.less b/theme/bootstrapbase/less/moodle/filemanager.less
@@ -935,7 +935,6 @@ a.ygtvspacer:hover {
     position: absolute;
     right: 7px;
     bottom: 5px;
-    z-index: 2000;
 }
 .filemanager .fp-treeview .fp-folder.fp-hascontextmenu .fp-contextmenu,
 .filemanager .fp-tableview .fp-folder.fp-hascontextmenu .fp-contextmenu {

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