From 37949c189b4fa39fdcd52a346a29623a33d8a6b4 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 30 Oct 2019 14:40:36 +0100 Subject: [PATCH] MDL-66999 theme_boost: @extend remove .form-control-* In MDL-56597 the .error and .warning classes were replaced with .alert-error and alert-warning. --- theme/boost/scss/moodle/admin.scss | 8 -------- theme/boost/style/moodle.css | 23 ++++++----------------- theme/classic/style/moodle.css | 23 ++++++----------------- 3 files changed, 12 insertions(+), 42 deletions(-) diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss index a2bd27b0af6..fb25f1af8d0 100644 --- a/theme/boost/scss/moodle/admin.scss +++ b/theme/boost/scss/moodle/admin.scss @@ -712,14 +712,6 @@ right: 0; overflow: hidden; z-index: $zindex-dropdown; - - &.error { - @extend .form-control-danger; - } - - &.warning { - @extend .form-control-warning; - } } #adminsettings .form-overridden { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 7b02422f8ca..8d693d0ce04 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -9436,10 +9436,8 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .form-control-success, .form-control-warning, -.maintenancewarning.warning, .form-control-danger, -#page-admin-mnet-peers .mform .deletedhostinfo, -.maintenancewarning.error { +#page-admin-mnet-peers .mform .deletedhostinfo { padding-right: 2.25rem; background-repeat: no-repeat; background-position: center right calc(1.5em + 0.75rem + 2px)/4; @@ -16086,8 +16084,7 @@ textarea[data-auto-rows] { .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.maintenancewarning.error { +#page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo { 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; @@ -16101,43 +16098,35 @@ textarea[data-auto-rows] { .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.maintenancewarning.error .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.maintenancewarning.error .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.maintenancewarning.error .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.maintenancewarning.error .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.maintenancewarning.error .custom-control { + #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .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.maintenancewarning.error .form-control { + #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .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.maintenancewarning.error .input-group-addon { + #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .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.maintenancewarning.error .form-control-feedback { + #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .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 341ea1a2f77..c37db34f8e1 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -9684,10 +9684,8 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .form-control-success, .form-control-warning, -.maintenancewarning.warning, .form-control-danger, -#page-admin-mnet-peers .mform .deletedhostinfo, -.maintenancewarning.error { +#page-admin-mnet-peers .mform .deletedhostinfo { padding-right: 2.25rem; background-repeat: no-repeat; background-position: center right calc(1.5em + 0.75rem + 2px)/4; @@ -16355,8 +16353,7 @@ textarea[data-auto-rows] { .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.maintenancewarning.error { +#page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo { 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; @@ -16370,43 +16367,35 @@ textarea[data-auto-rows] { .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.maintenancewarning.error .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.maintenancewarning.error .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.maintenancewarning.error .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.maintenancewarning.error .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.maintenancewarning.error .custom-control { + #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .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.maintenancewarning.error .form-control { + #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .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.maintenancewarning.error .input-group-addon { + #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .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.maintenancewarning.error .form-control-feedback { + #page-admin-mnet-peers .mform .has-danger .editor_atto_content.deletedhostinfo .form-control-feedback { color: #d9534f; } [data-filetypesbrowserbody] [aria-expanded="false"] > [role="group"], -- 2.17.1