Merge branch 'MDL-44356-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

This commit is contained in:
Marina Glancy
2014-03-17 17:10:27 +08:00
3 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -351,7 +351,7 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
.dndsupported .dndupload-ready .dndupload-target {display:block;}
.dndupload-uploadinprogress {display:none;text-align:center;}
.dndupload-uploading .dndupload-uploadinprogress {display:block;}
.dndupload-arrow {background:url([[pix:theme|fp/dnd_arrow]]) center no-repeat;width:100%;height:80px;position:absolute;margin-left: -28px;top: 5px;}
.dndupload-arrow {background:url([[pix:theme|fp/dnd_arrow]]) center no-repeat;width:100%;height:80px;position:absolute;top: 5px;}
.fitem.disabled .filepicker-container, .fitem.disabled .fm-empty-container {display:none;}
.dndupload-progressbars {padding:10px;display:none;}
.dndupload-inprogress .dndupload-progressbars {display:block;}
@@ -1034,7 +1034,6 @@ a.ygtvspacer:hover {
width: 100%;
height: 80px;
position: absolute;
margin-left: -28px;
top: 5px;
}
.fitem.disabled .filepicker-container,
File diff suppressed because one or more lines are too long