moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sara Arjona 2019-01-15 11:37:07 +01:00
commit 64afd81e0b
2 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
admin/tool/dataprivacy/styles.css
View file

@ -15,16 +15,6 @@
overflow-y: scroll; overflow-y: scroll;
} }
dd a.contactdpo {
/* Reverting dd's left margin */
margin-left: -10px;
}
.card dd a.contactdpo {
/* Reverting dd's left margin */
margin-left: inherit;
}
[data-region="data-requests-table"] .moodle-actionmenu { [data-region="data-requests-table"] .moodle-actionmenu {
min-width: 150px; min-width: 150px;
} }

4
user/classes/output/myprofile/renderer.php
View file

@ -100,11 +100,15 @@ class renderer extends \plugin_renderer_base {
$content = $node->content; $content = $node->content;
$classes = $node->classes; $classes = $node->classes;
if (!empty($content)) { if (!empty($content)) {
if ($header) {
// There is some content to display below this make this a header. // There is some content to display below this make this a header.
$return = \html_writer::tag('dt', $header); $return = \html_writer::tag('dt', $header);
$return .= \html_writer::tag('dd', $content); $return .= \html_writer::tag('dd', $content);
$return = \html_writer::tag('dl', $return); $return = \html_writer::tag('dl', $return);
} else {
$return = \html_writer::span($content);
}
if ($classes) { if ($classes) {
$return = \html_writer::tag('li', $return, array('class' => 'contentnode ' . $classes)); $return = \html_writer::tag('li', $return, array('class' => 'contentnode ' . $classes));
} else { } else {