Merge branch 'MDL-56209-master' of git://github.com/FMCorz/moodle

This commit is contained in:
Dan Poltawski 2016-10-10 15:18:24 +01:00
commit bd296fc280
2 changed files with 19 additions and 1 deletions

View File

@ -36,7 +36,7 @@ abstract class action_column_base extends column_base {
protected function print_icon($icon, $title, $url) {
global $OUTPUT;
echo '<a title="' . $title . '" href="' . $url . '">
<img src="' . $OUTPUT->pix_url($icon) . '" class="iconsmall" alt="' . $title . '" /></a>';
<img src="' . $OUTPUT->pix_url($icon) . '" class="iconsmall icon" alt="' . $title . '" /></a>';
}
public function get_required_fields() {

View File

@ -165,6 +165,13 @@
.iconcol {
padding: 3px;
box-sizing: content-box;
.icon {
margin: 0;
width: 12px;
height: 12px;
}
}
label {
@ -433,6 +440,17 @@ body.path-question-type {
// imported from quiz.css
#page-mod-quiz-edit ul.slots .activityinstance {
> a {
display: inline;
text-indent: 0;
padding-left: 0;
}
img.activityicon {
margin-left: 0;
}
}
#page-mod-quiz-edit .box.generalbox.questionbank {
padding: 0.5em;
}