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

Conflicts: theme/bootstrapbase/style/moodle.css
2013-08-20 12:17:16 +08:00
parent 6f44a73369 ea8c248c96
commit bfa4c3f358
17 changed files with 319 additions and 15 deletions
@@ -2098,3 +2098,12 @@ div.badge .expireimage {
        text-align: right;
    }
 }
+
+ul.dragdrop-keyboard-drag li {
+    list-style-type: none;
+}
+
+.block-control-actions .moodle-core-dragdrop-draghandle img {
+    width: 12px;
+    height: 12px;
+}