mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-17 22:45:54 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Monllao 2016-10-25 15:05:17 +08:00
commit 1d58c301c7
3 changed files with 20 additions and 48 deletions
enrol
renderer.php
theme/boost/scss/moodle
core.scssforms.scss

5
enrol/renderer.php

@ -56,7 +56,9 @@ class core_enrol_renderer extends plugin_renderer_base {
if (!empty($buttonhtml)) {
$content .= $buttonhtml;
}
$content .= html_writer::start_tag('div', array('class' => 'form-inline'));
$content .= $mform->render();
$content .= html_writer::end_tag('div');
$content .= $this->output->render($table->get_paging_bar());
@ -104,7 +106,8 @@ class core_enrol_renderer extends plugin_renderer_base {
$attributes = array('type' => 'submit',
'value' => $button->label,
'disabled' => $button->disabled ? 'disabled' : null,
'title' => $button->tooltip);
'title' => $button->tooltip,
'class' => 'btn btn-secondary m-y-1');
if ($button->actions) {
$id = html_writer::random_id('single_button');

49
theme/boost/scss/moodle/core.scss

@ -1070,58 +1070,13 @@ tr.flagged-tag a {
#page-enrol-users {
.enrol_user_buttons {
float: right;
text-align: right;
.enrolusersbutton {
display: inline;
div,
form {
display: inline;
margin-right: 0;
}
}
}
#filterform {
@extend .card;
display: inline-block;
.fitem {
display: inline-block;
line-height: $line-height-base * 2;
margin-right: .3em;
white-space: nowrap;
label {
display: inline;
line-height: $line-height-base;
padding-right: .3em;
}
:before,
:after {
display: inline;
}
}
div,
fieldset {
display: inline-block;
clear: none;
width: auto;
margin: 0;
}
select,
.ftext input {
width: 7em;
}
input,
select {
margin-bottom: 0;
}
@extend .card-block;
}
.user-enroller-panel .uep-search-results .user .details {

14
theme/boost/scss/moodle/forms.scss

@ -397,3 +397,17 @@ select[multiple] {
textarea[data-auto-rows] {
overflow-x: hidden;
}
/** Allow wrapping an mform in a div with the form-inline class to have an inline, responsive form. */
.form-inline {
@include media-breakpoint-up(md) {
.col-md-9,
.col-md-3 {
label {
margin-left: 1rem;
}
margin-bottom: 1rem;
width: auto;
}
}
}