Skip to content

Commit c89aace

Browse files
committed
Merge branch 'MDL-42451-36' of git://github.com/Chocolate-lightning/moodle into MOODLE_36_STABLE
2 parents 99fb1c8 + ecbd999 commit c89aace

File tree

2 files changed

+29
-5
lines changed

2 files changed

+29
-5
lines changed

install/css.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,30 @@
372372
background-color: rgb(245, 245, 245);
373373
padding: 8px 15px;
374374
}
375+
376+
.w-100 {
377+
width: 100%!important;
378+
}
379+
.flex-row-reverse {
380+
flex-direction: row-reverse!important;
381+
}
382+
.btn-group, .btn-group-vertical {
383+
position: relative;
384+
display: inline-flex;
385+
vertical-align: middle;
386+
}
387+
.mb-3, .my-3 {
388+
margin-bottom: 1rem!important;
389+
}
390+
.mr-auto, .mx-auto {
391+
margin-right: auto!important;
392+
}
393+
.ml-auto, .mx-auto {
394+
margin-left: auto!important;
395+
}
396+
.ml-1, .mx-1 {
397+
margin-left: .25rem!important;
398+
}
375399
/*
376400
End of MDL-43839 IE9 specific CSS.
377401
*/

lib/installlib.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,9 @@ function install_print_footer($config, $reload=false) {
385385
global $CFG;
386386

387387
if ($config->stage > INSTALL_WELCOME) {
388-
$first = '<input type="submit" id="previousbutton" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
388+
$first = '<input type="submit" id="previousbutton" class="btn btn-secondary ml-auto" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
389389
} else {
390-
$first = '<input type="submit" id="previousbutton" name="next" value="'.s(get_string('reload')).'" />';
390+
$first = '<input type="submit" id="previousbutton" class="btn btn-secondary ml-auto" name="next" value="'.s(get_string('reload')).'" />';
391391
$first .= '<script type="text/javascript">
392392
//<![CDATA[
393393
var first = document.getElementById("previousbutton");
@@ -398,12 +398,12 @@ function install_print_footer($config, $reload=false) {
398398
}
399399

400400
if ($reload) {
401-
$next = '<input type="submit" id="nextbutton" class="btn btn-primary" name="next" value="'.s(get_string('reload')).'" />';
401+
$next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1 mr-auto" name="next" value="'.s(get_string('reload')).'" />';
402402
} else {
403-
$next = '<input type="submit" id="nextbutton" class="btn btn-primary" name="next" value="'.s(get_string('next')).' &raquo;" />';
403+
$next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1 mr-auto" name="next" value="'.s(get_string('next')).' &raquo;" />';
404404
}
405405

406-
echo '</fieldset><fieldset id="nav_buttons">'.$first.$next.'</fieldset>';
406+
echo '</fieldset><div id="nav_buttons" class="mb-3 btn-group w-100 flex-row-reverse">'.$next.$first.'</div>';
407407

408408
$homelink = '<div class="sitelink">'.
409409
'<a title="Moodle '. $CFG->target_release .'" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">'.

0 commit comments

Comments
 (0)