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

MDL-67735 theme_boost: remove bs2 and bs4alpha compatibility css

Browse source
This commit is contained in:
Bas Brands 2020-01-27 15:06:29 +01:00
parent a0fc902eb1
commit 4394f9e358
113 changed files with 958 additions and 1403 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/badgeslib.php
View file

@ -1232,7 +1232,7 @@ function badges_verify_backpack(int $backpackid) {
$message = get_string('sitebackpackwarning', 'badges', ['url' => $backpackurl, 'warning' => $warning]);
$icon = $OUTPUT->pix_icon('i/warning', get_string('warning', 'moodle'));
return $OUTPUT->container($icon . $message, 'text-error');
return $OUTPUT->container($icon . $message, 'text-danger');
}
}

6
lib/editor/atto/plugins/image/styles.css
View file

@ -30,9 +30,9 @@
margin: 0 0.5em;
}
.atto_image_button_text-top.img-responsive,
.atto_image_button_middle.img-responsive,
.atto_image_button_text-bottom.img-responsive {
.atto_image_button_text-top.img-fluid,
.atto_image_button_middle.img-fluid,
.atto_image_button_text-bottom.img-fluid {
/* If the image is display: block then linking the image to URLs won't work. */
display: inline-block;
max-width: calc(100% - 1em);

22
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js vendored
View file

@ -43,14 +43,14 @@ var COMPONENT = 'atto_table',
},
TEMPLATE = '' +
'<form class="{{CSS.FORM}}">' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_caption">{{get_string "caption" component}}</label>' +
'</div><div class="col-sm-8">' +
'<input type="text" class="form-control {{CSS.CAPTION}}" id="{{elementid}}_atto_table_caption" required />' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_captionposition">' +
'{{get_string "captionposition" component}}</label>' +
@ -62,7 +62,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_headers">{{get_string "headers" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -74,7 +74,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'</div>' +
'{{#if nonedit}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_rows">{{get_string "numberofrows" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -82,7 +82,7 @@ var COMPONENT = 'atto_table',
'id="{{elementid}}_atto_table_rows" size="8" min="1" max="50"/>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_columns" ' +
'>{{get_string "numberofcolumns" component}}</label>' +
@ -97,7 +97,7 @@ var COMPONENT = 'atto_table',
'<fieldset>' +
'<legend class="mdl-align">{{get_string "appearance" component}}</legend>' +
'{{#if allowBorders}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_borders">{{get_string "borders" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -108,7 +108,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_borderstyle">' +
'{{get_string "borderstyles" component}}</label>' +
@ -121,7 +121,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_bordersize">' +
'{{get_string "bordersize" component}}</label>' +
@ -134,7 +134,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_bordercolour">' +
'{{get_string "bordercolour" component}}</label>' +
@ -161,7 +161,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'{{/if}}' +
'{{#if allowBackgroundColour}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_backgroundcolour">' +
'{{get_string "backgroundcolour" component}}</label>' +
@ -189,7 +189,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'{{/if}}' +
'{{#if allowWidth}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_width">' +
'{{get_string "width" component}}</label>' +

2
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js vendored
View file

File diff suppressed because one or more lines are too long

22
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js vendored
View file

@ -43,14 +43,14 @@ var COMPONENT = 'atto_table',
},
TEMPLATE = '' +
'<form class="{{CSS.FORM}}">' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_caption">{{get_string "caption" component}}</label>' +
'</div><div class="col-sm-8">' +
'<input type="text" class="form-control {{CSS.CAPTION}}" id="{{elementid}}_atto_table_caption" required />' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_captionposition">' +
'{{get_string "captionposition" component}}</label>' +
@ -62,7 +62,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_headers">{{get_string "headers" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -74,7 +74,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'</div>' +
'{{#if nonedit}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_rows">{{get_string "numberofrows" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -82,7 +82,7 @@ var COMPONENT = 'atto_table',
'id="{{elementid}}_atto_table_rows" size="8" min="1" max="50"/>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_columns" ' +
'>{{get_string "numberofcolumns" component}}</label>' +
@ -97,7 +97,7 @@ var COMPONENT = 'atto_table',
'<fieldset>' +
'<legend class="mdl-align">{{get_string "appearance" component}}</legend>' +
'{{#if allowBorders}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_borders">{{get_string "borders" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -108,7 +108,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_borderstyle">' +
'{{get_string "borderstyles" component}}</label>' +
@ -121,7 +121,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_bordersize">' +
'{{get_string "bordersize" component}}</label>' +
@ -134,7 +134,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_bordercolour">' +
'{{get_string "bordercolour" component}}</label>' +
@ -161,7 +161,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'{{/if}}' +
'{{#if allowBackgroundColour}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_backgroundcolour">' +
'{{get_string "backgroundcolour" component}}</label>' +
@ -189,7 +189,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'{{/if}}' +
'{{#if allowWidth}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_width">' +
'{{get_string "width" component}}</label>' +

22
lib/editor/atto/plugins/table/yui/src/button/js/button.js vendored
View file

@ -41,14 +41,14 @@ var COMPONENT = 'atto_table',
},
TEMPLATE = '' +
'<form class="{{CSS.FORM}}">' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_caption">{{get_string "caption" component}}</label>' +
'</div><div class="col-sm-8">' +
'<input type="text" class="form-control {{CSS.CAPTION}}" id="{{elementid}}_atto_table_caption" required />' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_captionposition">' +
'{{get_string "captionposition" component}}</label>' +
@ -60,7 +60,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_headers">{{get_string "headers" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -72,7 +72,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'</div>' +
'{{#if nonedit}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_rows">{{get_string "numberofrows" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -80,7 +80,7 @@ var COMPONENT = 'atto_table',
'id="{{elementid}}_atto_table_rows" size="8" min="1" max="50"/>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_columns" ' +
'>{{get_string "numberofcolumns" component}}</label>' +
@ -95,7 +95,7 @@ var COMPONENT = 'atto_table',
'<fieldset>' +
'<legend class="mdl-align">{{get_string "appearance" component}}</legend>' +
'{{#if allowBorders}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_borders">{{get_string "borders" component}}</label>' +
'</div><div class="col-sm-8">' +
@ -106,7 +106,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_borderstyle">' +
'{{get_string "borderstyles" component}}</label>' +
@ -119,7 +119,7 @@ var COMPONENT = 'atto_table',
'</select>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_bordersize">' +
'{{get_string "bordersize" component}}</label>' +
@ -132,7 +132,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'</div>' +
'</div>' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_bordercolour">' +
'{{get_string "bordercolour" component}}</label>' +
@ -159,7 +159,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'{{/if}}' +
'{{#if allowBackgroundColour}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_backgroundcolour">' +
'{{get_string "backgroundcolour" component}}</label>' +
@ -187,7 +187,7 @@ var COMPONENT = 'atto_table',
'</div>' +
'{{/if}}' +
'{{#if allowWidth}}' +
'<div class="mb-1 form-group row-fluid">' +
'<div class="mb-1 form-group row">' +
'<div class="col-sm-4">' +
'<label for="{{elementid}}_atto_table_width">' +
'{{get_string "width" component}}</label>' +

2
lib/form/filemanager.js
View file

@ -813,7 +813,7 @@ M.form_filemanager.init = function(Y, options) {
var message = '';
var confirmmsg = M.util.get_string('confirmrenamefile', 'repository', fileinfo.refcount);
dialog_options.message = message.concat('<p>', confirmmsg, '</p>',
'<ul class="p-x-2">', warnings, '</ul>');
'<ul class="px-5">', warnings, '</ul>');
this.show_confirm_dialog(dialog_options);
return;
}

4
lib/outputrenderers.php
View file

@ -788,7 +788,7 @@ class core_renderer extends renderer_base {
$timeleft = $CFG->maintenance_later - time();
// If timeleft less than 30 sec, set the class on block to error to highlight.
$errorclass = ($timeleft < 30) ? 'alert-error alert-danger' : 'alert-warning';
$output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning m-a-1 alert');
$output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning m-3 alert');
$a = new stdClass();
$a->hour = (int)($timeleft / 3600);
$a->min = (int)(($timeleft / 60) % 60);
@ -1979,7 +1979,7 @@ class core_renderer extends renderer_base {
$output = $this->box_start('generalbox modal modal-dialog modal-in-page show', 'notice', $attributes);
$output .= $this->box_start('modal-content', 'modal-content');
$output .= $this->box_start('modal-header p-x-1', 'modal-header');
$output .= $this->box_start('modal-header px-3', 'modal-header');
$output .= html_writer::tag('h4', get_string('confirm'));
$output .= $this->box_end();
$attributes = [

2
lib/templates/auth_digital_minor_page.mustache
View file

@ -43,7 +43,7 @@
<div class="card-title">
<h3>{{#str}}considereddigitalminor{{/str}}</h3>
</div>
<div class="p-t-1 p-b-2">
<div class="pt-3 pb-5">
<p>{{#str}}digitalminor_desc{{/str}}</p>
<p class="mb-0">{{{supportname}}}</p>
<p class="mb-0">{{{supportemail}}}</p>

2
lib/templates/filemanager_uploadform.mustache
View file

@ -28,7 +28,7 @@
<div class="fp-formset">
<div class="fp-file form-group">
<label>{{#str}}attachment, repository{{/str}}</label>
<div class="p-x-1">
<div class="px-3">
<input type="file"/>
</div>
</div>

2
lib/tests/weblib_test.php
View file

@ -806,7 +806,7 @@ EXPECTED;
$html = "<p>This is a test.</p><p><img src=\"${url1}\" alt=\"\" role=\"presentation\"></p>
<br>Test content.<p></p><p><img src=\"{$url2}\" alt=\"\" width=\"2048\" height=\"1536\"
role=\"presentation\" class=\"img-responsive atto_image_button_text-bottom\"><br></p>";
role=\"presentation\" class=\"img-fluid atto_image_button_text-bottom\"><br></p>";
$draftareas = array(
array(
'urlbase' => 'draftfile.php',