From 579ca95f1d5c9a502f7923bf9a0ea9241500572b Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 30 Oct 2019 15:00:35 +0100 Subject: [PATCH] MDL-66999 theme_boost: @extend replace .alert use bs4 .alert .alert-type classes instead of extending .alert --- admin/mnet/peer_forms.php | 2 +- admin/renderer.php | 4 +-- admin/templates/setting.mustache | 4 +-- admin/tool/filetypes/renderer.php | 2 +- admin/tool/filetypes/styles.css | 7 ---- lib/adminlib.php | 6 ++-- theme/boost/scss/moodle/admin.scss | 16 ---------- theme/boost/style/moodle.css | 51 +++++++----------------------- theme/classic/style/moodle.css | 51 +++++++----------------------- 9 files changed, 33 insertions(+), 110 deletions(-) diff --git a/admin/mnet/peer_forms.php b/admin/mnet/peer_forms.php index 5769e6de24c..cd24ec160fd 100644 --- a/admin/mnet/peer_forms.php +++ b/admin/mnet/peer_forms.php @@ -156,7 +156,7 @@ class mnet_review_host_form extends moodleform { if ($mnet_peer && !empty($mnet_peer->deleted)) { $radioarray = array(); $radioarray[] = $mform->createElement('static', 'deletedinfo', '', - $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'deletedhostinfo')); + $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'alert alert-warning')); $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('yes'), 1); $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('no'), 0); $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false); diff --git a/admin/renderer.php b/admin/renderer.php index 940c33f16d6..fb4ce524522 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -253,7 +253,7 @@ class core_admin_renderer extends plugin_renderer_base { $out .= $this->output->container(get_string('cancelinstallinfodir', 'core_plugin', $pluginfo->rootdir)); if ($repotype = $pluginman->plugin_external_source($pluginfo->component)) { $out .= $this->output->container(get_string('uninstalldeleteconfirmexternal', 'core_plugin', $repotype), - 'uninstalldeleteconfirmexternal'); + 'alert alert-warning mt-2'); } } @@ -432,7 +432,7 @@ class core_admin_renderer extends plugin_renderer_base { if ($repotype = $pluginman->plugin_external_source($pluginfo->component)) { $confirm .= $this->output->container(get_string('uninstalldeleteconfirmexternal', 'core_plugin', $repotype), - 'uninstalldeleteconfirmexternal'); + 'alert alert-warning mt-2'); } // After any uninstall we must execute full upgrade to finish the cleanup! diff --git a/admin/templates/setting.mustache b/admin/templates/setting.mustache index af78e7e4fbf..a3a3a227f26 100644 --- a/admin/templates/setting.mustache +++ b/admin/templates/setting.mustache @@ -52,10 +52,10 @@ {{{name}}} diff --git a/admin/tool/filetypes/renderer.php b/admin/tool/filetypes/renderer.php index 238f6861ecc..f283af177f0 100644 --- a/admin/tool/filetypes/renderer.php +++ b/admin/tool/filetypes/renderer.php @@ -52,7 +52,7 @@ class tool_filetypes_renderer extends plugin_renderer_base { $out = $this->heading(get_string('pluginname', 'tool_filetypes')); if ($restricted) { $out .= html_writer::div( - html_writer::div(get_string('configoverride', 'admin'), 'form-overridden'), + html_writer::div(get_string('configoverride', 'admin'), 'alert alert-info'), '', array('id' => 'adminsettings')); } if (count($combined) > 1) { diff --git a/admin/tool/filetypes/styles.css b/admin/tool/filetypes/styles.css index ed2353ab9fd..c8375ee7703 100644 --- a/admin/tool/filetypes/styles.css +++ b/admin/tool/filetypes/styles.css @@ -23,10 +23,3 @@ .path-admin-tool-filetypes .generaltable .nonstandard { font-weight: bold; } - -/* Spacing around the 'Defined in config.php' stripe */ -.path-admin-tool-filetypes .form-overridden { - display: inline-block; - margin-bottom: 1em; - padding: 4px 6px; -} diff --git a/lib/adminlib.php b/lib/adminlib.php index cb3515e39b9..a029fd0da0b 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -2757,7 +2757,7 @@ class admin_setting_configfile extends admin_setting_configtext { ]; if ($context->readonly) { - $this->visiblename .= '
'.get_string('execpathnotallowed', 'admin').'
'; + $this->visiblename .= '
'.get_string('execpathnotallowed', 'admin').'
'; } $element = $OUTPUT->render_from_template('core_admin/setting_configfile', $context); @@ -2818,7 +2818,7 @@ class admin_setting_configexecutable extends admin_setting_configfile { ]; if (!empty($CFG->preventexecpath)) { - $this->visiblename .= '
'.get_string('execpathnotallowed', 'admin').'
'; + $this->visiblename .= '
'.get_string('execpathnotallowed', 'admin').'
'; } $element = $OUTPUT->render_from_template('core_admin/setting_configexecutable', $context); @@ -2858,7 +2858,7 @@ class admin_setting_configdirectory extends admin_setting_configfile { ]; if (!empty($CFG->preventexecpath)) { - $this->visiblename .= '
'.get_string('execpathnotallowed', 'admin').'
'; + $this->visiblename .= '
'.get_string('execpathnotallowed', 'admin').'
'; } $element = $OUTPUT->render_from_template('core_admin/setting_configdirectory', $context); diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss index fb25f1af8d0..2b505b38720 100644 --- a/theme/boost/scss/moodle/admin.scss +++ b/theme/boost/scss/moodle/admin.scss @@ -658,12 +658,6 @@ } } -.uninstalldeleteconfirmexternal { - @extend .alert-warning; - padding: 0.5em 1em; - margin: 5px 0 10px 0; -} - #page-admin-index .upgradepluginsinfo { text-align: center; } @@ -678,12 +672,6 @@ font-size: $font-size-sm; } -#page-admin-mnet-peers .mform .deletedhostinfo { - @extend .form-control-danger; - padding: 4px; - margin-bottom: 5px; -} - #core-cache-plugin-summaries table, #core-cache-store-summaries table { width: 100%; @@ -714,10 +702,6 @@ z-index: $zindex-dropdown; } -#adminsettings .form-overridden { - @extend .alert-info; -} - .modal.modal-in-page { z-index: 0; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 8d693d0ce04..57ed89e987b 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -6045,24 +6045,24 @@ p.arrow_button input[type="button"], .alert-success .alert-link, .que .comment .alert-link { color: #1f3e1f; } -.alert-info, #adminsettings .form-overridden, .que .formulation, .assignfeedback_editpdf_widget .label { +.alert-info, .que .formulation, .assignfeedback_editpdf_widget .label { color: #2f6473; background-color: #def2f8; border-color: #d1edf6; } - .alert-info hr, #adminsettings .form-overridden hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { + .alert-info hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { border-top-color: #bce5f2; } - .alert-info .alert-link, #adminsettings .form-overridden .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { + .alert-info .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { color: #20454f; } -.alert-warning, .uninstalldeleteconfirmexternal, +.alert-warning, .que .outcome, .que .comment { color: #7d5a29; background-color: #fcefdc; border-color: #fbe8cd; } - .alert-warning hr, .uninstalldeleteconfirmexternal hr, .que .outcome hr, .que .comment hr { + .alert-warning hr, .que .outcome hr, .que .comment hr { border-top-color: #f9ddb5; } - .alert-warning .alert-link, .uninstalldeleteconfirmexternal .alert-link, .que .outcome .alert-link, .que .comment .alert-link { + .alert-warning .alert-link, .que .outcome .alert-link, .que .comment .alert-link { color: #573e1c; } .alert-danger { @@ -9436,8 +9436,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .form-control-success, .form-control-warning, -.form-control-danger, -#page-admin-mnet-peers .mform .deletedhostinfo { +.form-control-danger { padding-right: 2.25rem; background-repeat: no-repeat; background-position: center right calc(1.5em + 0.75rem + 2px)/4; @@ -12110,10 +12109,6 @@ body.h5p-embed .h5pmessages { .plugins-management-confirm-buttons .continue input { margin: 0; } -.uninstalldeleteconfirmexternal { - padding: 0.5em 1em; - margin: 5px 0 10px 0; } - #page-admin-index .upgradepluginsinfo { text-align: center; } @@ -12125,10 +12120,6 @@ body.h5p-embed .h5pmessages { margin-bottom: 1em; font-size: 0.8203125rem; } -#page-admin-mnet-peers .mform .deletedhostinfo { - padding: 4px; - margin-bottom: 5px; } - #core-cache-plugin-summaries table, #core-cache-store-summaries table { width: 100%; } @@ -16082,9 +16073,7 @@ textarea[data-auto-rows] { /** Atto fields do not have form-control because that would break the layout of the editor. So they need these extra styles to highlight the editor when there is a validation error. */ .has-danger .editor_atto_content.form-control, -.has-danger .editor_atto_content.form-control-danger, -.has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo, -#page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo { +.has-danger .editor_atto_content.form-control-danger { background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23d9534f' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E"); padding-right: 2.25rem; background-repeat: no-repeat; @@ -16096,37 +16085,21 @@ textarea[data-auto-rows] { .has-danger .editor_atto_content.form-control .form-check-inline, .has-danger .editor_atto_content.form-control .custom-control, .has-danger .editor_atto_content.form-control-danger .form-control-feedback, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-control-feedback, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control-feedback, .has-danger .editor_atto_content.form-control-danger .form-control-label, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-control-label, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control-label, .has-danger .editor_atto_content.form-control-danger .form-check-label, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-check-label, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-check-label, .has-danger .editor_atto_content.form-control-danger .form-check-inline, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-check-inline, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-check-inline, - .has-danger .editor_atto_content.form-control-danger .custom-control, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .custom-control, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .custom-control { + .has-danger .editor_atto_content.form-control-danger .custom-control { color: #d9534f; } .has-danger .editor_atto_content.form-control .form-control, - .has-danger .editor_atto_content.form-control-danger .form-control, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-control, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control { + .has-danger .editor_atto_content.form-control-danger .form-control { border-color: #d9534f; } .has-danger .editor_atto_content.form-control .input-group-addon, - .has-danger .editor_atto_content.form-control-danger .input-group-addon, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .input-group-addon, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .input-group-addon { + .has-danger .editor_atto_content.form-control-danger .input-group-addon { color: #d9534f; border-color: #d9534f; background-color: #fdf7f7; } .has-danger .editor_atto_content.form-control .form-control-feedback, - .has-danger .editor_atto_content.form-control-danger .form-control-feedback, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-control-feedback, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control-feedback { + .has-danger .editor_atto_content.form-control-danger .form-control-feedback { color: #d9534f; } [data-filetypesbrowserbody] [aria-expanded="false"] > [role="group"], diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index c37db34f8e1..15a0e986ef2 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -6241,24 +6241,24 @@ p.arrow_button input[type="button"], .alert-success .alert-link, .que .comment .alert-link { color: #1f3e1f; } -.alert-info, #adminsettings .form-overridden, .que .formulation, .assignfeedback_editpdf_widget .label { +.alert-info, .que .formulation, .assignfeedback_editpdf_widget .label { color: #2f6473; background-color: #def2f8; border-color: #d1edf6; } - .alert-info hr, #adminsettings .form-overridden hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { + .alert-info hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { border-top-color: #bce5f2; } - .alert-info .alert-link, #adminsettings .form-overridden .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { + .alert-info .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { color: #20454f; } -.alert-warning, .uninstalldeleteconfirmexternal, +.alert-warning, .que .outcome, .que .comment { color: #7d5a29; background-color: #fcefdc; border-color: #fbe8cd; } - .alert-warning hr, .uninstalldeleteconfirmexternal hr, .que .outcome hr, .que .comment hr { + .alert-warning hr, .que .outcome hr, .que .comment hr { border-top-color: #f9ddb5; } - .alert-warning .alert-link, .uninstalldeleteconfirmexternal .alert-link, .que .outcome .alert-link, .que .comment .alert-link { + .alert-warning .alert-link, .que .outcome .alert-link, .que .comment .alert-link { color: #573e1c; } .alert-danger { @@ -9684,8 +9684,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .form-control-success, .form-control-warning, -.form-control-danger, -#page-admin-mnet-peers .mform .deletedhostinfo { +.form-control-danger { padding-right: 2.25rem; background-repeat: no-repeat; background-position: center right calc(1.5em + 0.75rem + 2px)/4; @@ -12366,10 +12365,6 @@ body.h5p-embed .h5pmessages { .plugins-management-confirm-buttons .continue input { margin: 0; } -.uninstalldeleteconfirmexternal { - padding: 0.5em 1em; - margin: 5px 0 10px 0; } - #page-admin-index .upgradepluginsinfo { text-align: center; } @@ -12381,10 +12376,6 @@ body.h5p-embed .h5pmessages { margin-bottom: 1em; font-size: 0.8203125rem; } -#page-admin-mnet-peers .mform .deletedhostinfo { - padding: 4px; - margin-bottom: 5px; } - #core-cache-plugin-summaries table, #core-cache-store-summaries table { width: 100%; } @@ -16351,9 +16342,7 @@ textarea[data-auto-rows] { /** Atto fields do not have form-control because that would break the layout of the editor. So they need these extra styles to highlight the editor when there is a validation error. */ .has-danger .editor_atto_content.form-control, -.has-danger .editor_atto_content.form-control-danger, -.has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo, -#page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo { +.has-danger .editor_atto_content.form-control-danger { background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23d9534f' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E"); padding-right: 2.25rem; background-repeat: no-repeat; @@ -16365,37 +16354,21 @@ textarea[data-auto-rows] { .has-danger .editor_atto_content.form-control .form-check-inline, .has-danger .editor_atto_content.form-control .custom-control, .has-danger .editor_atto_content.form-control-danger .form-control-feedback, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-control-feedback, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control-feedback, .has-danger .editor_atto_content.form-control-danger .form-control-label, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-control-label, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control-label, .has-danger .editor_atto_content.form-control-danger .form-check-label, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-check-label, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-check-label, .has-danger .editor_atto_content.form-control-danger .form-check-inline, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-check-inline, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-check-inline, - .has-danger .editor_atto_content.form-control-danger .custom-control, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .custom-control, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .custom-control { + .has-danger .editor_atto_content.form-control-danger .custom-control { color: #d9534f; } .has-danger .editor_atto_content.form-control .form-control, - .has-danger .editor_atto_content.form-control-danger .form-control, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-control, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control { + .has-danger .editor_atto_content.form-control-danger .form-control { border-color: #d9534f; } .has-danger .editor_atto_content.form-control .input-group-addon, - .has-danger .editor_atto_content.form-control-danger .input-group-addon, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .input-group-addon, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .input-group-addon { + .has-danger .editor_atto_content.form-control-danger .input-group-addon { color: #d9534f; border-color: #d9534f; background-color: #fdf7f7; } .has-danger .editor_atto_content.form-control .form-control-feedback, - .has-danger .editor_atto_content.form-control-danger .form-control-feedback, - .has-danger #page-admin-mnet-peers .mform .editor_atto_content.deletedhostinfo .form-control-feedback, - #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control-feedback { + .has-danger .editor_atto_content.form-control-danger .form-control-feedback { color: #d9534f; } [data-filetypesbrowserbody] [aria-expanded="false"] > [role="group"], -- 2.17.1