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

This commit is contained in:
Jake Dallimore 2018-08-17 16:02:05 +08:00
commit 215ecb017a
7 changed files with 15 additions and 1 deletions

View File

@ -220,6 +220,7 @@ class data_requests_table extends table_sql {
$actionsmenu->set_menu_trigger(get_string('actions'));
$actionsmenu->set_owner_selector('request-actions-' . $requestid);
$actionsmenu->set_alignment(\action_menu::TL, \action_menu::BL);
$actionsmenu->set_constraint('[data-region=data-requests-table] > .no-overflow');
return $OUTPUT->render($actionsmenu);
}

View File

@ -24,3 +24,7 @@ dd a.contactdpo {
/* Reverting dd's left margin */
margin-left: inherit;
}
[data-region="data-requests-table"] .moodle-actionmenu {
min-width: 150px;
}

View File

@ -4389,6 +4389,9 @@ class action_menu implements renderable, templatable {
* The constraint is applied when the dialogue is shown and limits the display of the dialogue to within the
* element the constraint identifies.
*
* This is required whenever the action menu is displayed inside any CSS element with the .no-overflow class
* (flexible_table and any of it's child classes are a likely candidate).
*
* @param string $ancestorselector A snippet of CSS used to identify the ancestor to contrain the dialogue to.
*/
public function set_constraint($ancestorselector) {

View File

@ -286,8 +286,10 @@ form.popupform div {
overflow: auto;
}
// Minimum height required for a menu in a table inside a scrollable div.
.no-overflow > .generaltable {
margin-bottom: 0;
min-height: 10em;
}
// Accessibility features

View File

@ -8999,7 +8999,8 @@ form.popupform div {
overflow: auto; }
.no-overflow > .generaltable {
margin-bottom: 0; }
margin-bottom: 0;
min-height: 10em; }
.accesshide {
position: absolute;

View File

@ -376,8 +376,10 @@ form.popupform div {
.pagelayout-report .no-overflow {
overflow: visible;
}
// Minimum height required for a menu in a table inside a scrollable div.
.no-overflow > .generaltable {
margin-bottom: 0;
min-height: 10em;
}
// Accessibility features

View File

@ -2678,6 +2678,7 @@ form.popupform div {
}
.no-overflow > .generaltable {
margin-bottom: 0;
min-height: 10em;
}
.accesshide {
position: absolute;