L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk
2013-10-01 10:17:13 +13:00
parent bd5797e6cc 0fb7a8a3dd
commit 7bd5d84fd8
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/bootstrapbase/less/moodle/filemanager.less
+4 -2
View File
@@ -1075,10 +1075,12 @@ a.ygtvspacer:hover {
.filemanager.fp-select.fp-zip .fp-file-zip {
display: none;
}
.filemanager.fp-select .fp-file-setmain {
.filemanager.fp-select .fp-file-setmain,
.filemanager.fp-select .fp-file-setmain-help {
display: none;
}
.filemanager.fp-select.fp-cansetmain .fp-file-setmain {
.filemanager.fp-select.fp-cansetmain .fp-file-setmain,
.filemanager.fp-select.fp-cansetmain .fp-file-setmain-help {
display: inline-block;
.ie7-inline-block();
}