Merge branch 'MDL-66930-master' of https://github.com/lucaboesch/moodle

mvaraujo · Oct 21, 2019 · d2982a1 · d2982a1
2 parents 95852a3 + 87174e0
commit d2982a1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/mod/quiz/classes/output/edit_renderer.php b/mod/quiz/classes/output/edit_renderer.php
@@ -946,7 +946,7 @@ public function question_name(structure $structure, $slot, $pageurl) {
         $namestr = $qtype->local_name();
 
         $icon = $this->pix_icon('icon', $namestr, $qtype->plugin_name(), array('title' => $namestr,
-                'class' => 'icon activityicon', 'alt' => ' ', 'role' => 'presentation'));
+                'class' => 'activityicon', 'alt' => ' ', 'role' => 'presentation'));
 
         $editicon = $this->pix_icon('t/edit', '', 'moodle', array('title' => ''));
 

diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
@@ -939,7 +939,7 @@ table.quizreviewsummary td.cell {
 }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-    float: left;
+    float: inherit;
     margin: .2em 0 0;
     padding: 0;
 }

diff --git a/theme/boost/scss/moodle/question.scss b/theme/boost/scss/moodle/question.scss
@@ -443,6 +443,15 @@ body.path-question-type {
     }
     img.activityicon {
         margin-left: 0;
+        width: 16px;
+        height: 16px;
+        padding-right: 4px;
+    }
+}
+
+#page-mod-quiz-edit .activity {
+    img.activityicon {
+        vertical-align: text-top;
     }
 }
 
@@ -620,6 +629,7 @@ body.path-question-type {
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
     margin-top: 0;
+    padding-right: 4px;
 }
 
 .path-mod-quiz .statedetails {

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -15173,7 +15173,13 @@ body.path-question-type {
   padding-left: 0; }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-  margin-left: 0; }
+  margin-left: 0;
+  width: 16px;
+  height: 16px;
+  padding-right: 4px; }
+
+#page-mod-quiz-edit .activity img.activityicon {
+  vertical-align: text-top; }
 
 #page-mod-quiz-edit .box.generalbox.questionbank {
   padding: 0.5em; }
@@ -15300,7 +15306,8 @@ body.path-question-type {
   overflow: hidden; }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-  margin-top: 0; }
+  margin-top: 0;
+  padding-right: 4px; }
 
 .path-mod-quiz .statedetails {
   display: block;

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -15439,7 +15439,13 @@ body.path-question-type {
   padding-left: 0; }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-  margin-left: 0; }
+  margin-left: 0;
+  width: 16px;
+  height: 16px;
+  padding-right: 4px; }
+
+#page-mod-quiz-edit .activity img.activityicon {
+  vertical-align: text-top; }
 
 #page-mod-quiz-edit .box.generalbox.questionbank {
   padding: 0.5em; }
@@ -15570,7 +15576,8 @@ body.path-question-type {
   overflow: hidden; }
 
 #page-mod-quiz-edit ul.slots .activityinstance img.activityicon {
-  margin-top: 0; }
+  margin-top: 0;
+  padding-right: 4px; }
 
 .path-mod-quiz .statedetails {
   display: block;