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

Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2013-05-09 11:29:33 +08:00
commit c8f7f2b5f3
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,6 +330,10 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
.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;}
.dir-rtl .filemanager .fp-iconview .fp-folder.fp-hascontextmenu .fp-contextmenu {left:7px;right:inherit;}
.dir-rtl .filemanager .fp-treeview .fp-folder.fp-hascontextmenu .fp-contextmenu,
.dir-rtl .filemanager .fp-tableview .fp-folder.fp-hascontextmenu .fp-contextmenu {left:inherit;right: 16px;margin-right: 0;}
/*
* Drag and drop support (filemanager and filepicker form elements)
*/

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

@ -938,6 +938,17 @@ a.ygtvspacer:hover {
margin-right: -20px;
top: 6px;
}
.dir-rtl .filemanager .fp-iconview .fp-folder.fp-hascontextmenu .fp-contextmenu {
left: 7px;
right: inherit;
}
.dir-rtl .filemanager .fp-treeview .fp-folder.fp-hascontextmenu .fp-contextmenu,
.dir-rtl .filemanager .fp-tableview .fp-folder.fp-hascontextmenu .fp-contextmenu {
left: inherit;
right: 16px;
margin-right: 0;
}
// Drag and drop support (filemanager and filepicker form elements)
.filepicker-filelist .filepicker-container,
.filemanager.fm-noitems .fm-empty-container {

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

File diff suppressed because one or more lines are too long