mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk 2013-08-21 10:56:00 +12:00
commit b89fbc4615
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
theme/base/style/filemanager.css
View File

@ -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;}

1
theme/bootstrapbase/less/moodle/filemanager.less
View File

@ -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 {

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long