Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

theme/bootstrapbase/less/moodle/question.less

@@ -119,17 +119,38 @@
 }
 #categoryquestions {
     margin: 0;
+    td,
+    th {
+        padding: 0 0.2em;
+    }
+    th {
+        text-align: left;
+        font-weight: normal;
+    }
+    .checkbox {
+        padding-left: 5px;
+    }
+    .checkbox input[type="checkbox"] {
+        margin-left: 0px;
+        float: none;
+    }
+    img.iconsmall {
+        padding: 0;
+    }
+    .iconcol {
+        padding: 3px;
+    }
+    label {
+        margin: 0;
+    }
 }
-#categoryquestions td,
-#categoryquestions th {
-    padding: 0 0.2em;
-}
-#categoryquestions th {
-    text-align: left;
-    font-weight: normal;
-}
-#categoryquestions .checkbox {
-    padding-left: 20px;
+#page-mod-quiz-edit {
+    div.questionbankwindow div.header {
+        margin: 0;
+    }
+    div.questionbankwindow.block {
+        padding: 0;
+    }
 }
 .dir-rtl #categoryquestions th {
     text-align: right;