L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-42451-36' of git://github.com/Chocolate-lightning/moodle into MOODLE_36_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2019-08-01 09:53:58 +08:00
parent 99fb1c8c7b ecbd999ca3
commit c89aaced1a
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/css.php
+24
View File
@@ -372,6 +372,30 @@ body {
background-color: rgb(245, 245, 245);
padding: 8px 15px;
}
.w-100 {
width: 100%!important;
}
.flex-row-reverse {
flex-direction: row-reverse!important;
}
.btn-group, .btn-group-vertical {
position: relative;
display: inline-flex;
vertical-align: middle;
}
.mb-3, .my-3 {
margin-bottom: 1rem!important;
}
.mr-auto, .mx-auto {
margin-right: auto!important;
}
.ml-auto, .mx-auto {
margin-left: auto!important;
}
.ml-1, .mx-1 {
margin-left: .25rem!important;
}
/*
End of MDL-43839 IE9 specific CSS.
*/
lib/installlib.php
+5 -5
View File
@@ -385,9 +385,9 @@ function install_print_footer($config, $reload=false) {
global $CFG;
if ($config->stage > INSTALL_WELCOME) {
$first = '<input type="submit" id="previousbutton" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
$first = '<input type="submit" id="previousbutton" class="btn btn-secondary ml-auto" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
} else {
$first = '<input type="submit" id="previousbutton" name="next" value="'.s(get_string('reload')).'" />';
$first = '<input type="submit" id="previousbutton" class="btn btn-secondary ml-auto" name="next" value="'.s(get_string('reload')).'" />';
$first .= '<script type="text/javascript">
//<![CDATA[
var first = document.getElementById("previousbutton");
@@ -398,12 +398,12 @@ function install_print_footer($config, $reload=false) {
}
if ($reload) {
$next = '<input type="submit" id="nextbutton" class="btn btn-primary" name="next" value="'.s(get_string('reload')).'" />';
$next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1 mr-auto" name="next" value="'.s(get_string('reload')).'" />';
} else {
$next = '<input type="submit" id="nextbutton" class="btn btn-primary" name="next" value="'.s(get_string('next')).' &raquo;" />';
$next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1 mr-auto" name="next" value="'.s(get_string('next')).' &raquo;" />';
}
echo '</fieldset><fieldset id="nav_buttons">'.$first.$next.'</fieldset>';
echo '</fieldset><div id="nav_buttons" class="mb-3 btn-group w-100 flex-row-reverse">'.$next.$first.'</div>';
$homelink = '<div class="sitelink">'.
'<a title="Moodle '. $CFG->target_release .'" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">'.