From 275f690f114e7831e47fb5a3afac34971c5324f0 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 28 Oct 2019 14:54:31 +0100 Subject: [PATCH 01/23] MDL-66999 theme_boost: @extend for admin warnings --- admin/renderer.php | 14 ++-- lib/adminlib.php | 30 ++++----- report/backups/index.php | 20 +++--- report/performance/locallib.php | 8 +-- report/security/index.php | 10 +-- theme/boost/scss/moodle/admin.scss | 50 -------------- theme/boost/style/moodle.css | 105 +++++++---------------------- theme/classic/style/moodle.css | 105 +++++++---------------------- 8 files changed, 91 insertions(+), 251 deletions(-) diff --git a/admin/renderer.php b/admin/renderer.php index 5abd08eaebb..940c33f16d6 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -511,7 +511,7 @@ class core_admin_renderer extends plugin_renderer_base { * @return string HTML to output. */ protected function warning($message, $type = 'warning') { - return $this->box($message, 'generalbox admin' . $type); + return $this->box($message, 'generalbox alert alert-' . $type); } /** @@ -526,7 +526,7 @@ class core_admin_renderer extends plugin_renderer_base { return $this->warning(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot)); } else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) { - return $this->warning(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'error'); + return $this->warning(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'danger'); } else { return ''; @@ -544,7 +544,7 @@ class core_admin_renderer extends plugin_renderer_base { if ($devlibdir) { $moreinfo = new moodle_url('/report/security/index.php'); $warning = get_string('devlibdirpresent', 'core_admin', ['moreinfourl' => $moreinfo->out()]); - return $this->warning($warning, 'error'); + return $this->warning($warning, 'danger'); } else { return ''; @@ -721,7 +721,7 @@ class core_admin_renderer extends plugin_renderer_base { return $this->warning( $this->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) . $this->container($this->doc_link('admin/versions', get_string('morehelp'))), - 'error'); + 'danger'); } /* @@ -737,7 +737,7 @@ class core_admin_renderer extends plugin_renderer_base { } $warning = (get_string('testsiteupgradewarning', 'admin', $testsite)); - return $this->warning($warning, 'error'); + return $this->warning($warning, 'danger'); } /** @@ -772,7 +772,7 @@ class core_admin_renderer extends plugin_renderer_base { $level = 'warning'; if ($maturity == MATURITY_ALPHA) { - $level = 'error'; + $level = 'danger'; } $maturitylevel = get_string('maturity' . $maturity, 'admin'); @@ -954,7 +954,7 @@ class core_admin_renderer extends plugin_renderer_base { protected function release_notes_link() { $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases'); $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack - return $this->box($releasenoteslink, 'generalbox releasenoteslink'); + return $this->box($releasenoteslink, 'generalbox alert alert-info'); } /** diff --git a/lib/adminlib.php b/lib/adminlib.php index 1f731a46f6e..cb3515e39b9 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -9546,7 +9546,7 @@ class admin_setting_webservicesoverview extends admin_setting { $url = new moodle_url("/admin/search.php?query=enablewebservices"); $row[0] = "1. " . html_writer::tag('a', get_string('enablews', 'webservice'), array('href' => $url)); - $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); + $status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger')); if ($CFG->enablewebservices) { $status = get_string('yes'); } @@ -9559,7 +9559,7 @@ class admin_setting_webservicesoverview extends admin_setting { $url = new moodle_url("/admin/settings.php?section=webserviceprotocols"); $row[0] = "2. " . html_writer::tag('a', get_string('enableprotocols', 'webservice'), array('href' => $url)); - $status = html_writer::tag('span', get_string('none'), array('class' => 'statuscritical')); + $status = html_writer::tag('span', get_string('none'), array('class' => 'badge badge-danger')); //retrieve activated protocol $active_protocols = empty($CFG->webserviceprotocols) ? array() : explode(',', $CFG->webserviceprotocols); @@ -9670,7 +9670,7 @@ class admin_setting_webservicesoverview extends admin_setting { $url = new moodle_url("/admin/search.php?query=enablewebservices"); $row[0] = "1. " . html_writer::tag('a', get_string('enablews', 'webservice'), array('href' => $url)); - $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); + $status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger')); if ($CFG->enablewebservices) { $status = get_string('yes'); } @@ -9683,7 +9683,7 @@ class admin_setting_webservicesoverview extends admin_setting { $url = new moodle_url("/admin/settings.php?section=webserviceprotocols"); $row[0] = "2. " . html_writer::tag('a', get_string('enableprotocols', 'webservice'), array('href' => $url)); - $status = html_writer::tag('span', get_string('none'), array('class' => 'statuscritical')); + $status = html_writer::tag('span', get_string('none'), array('class' => 'badge badge-danger')); //retrieve activated protocol $active_protocols = empty($CFG->webserviceprotocols) ? array() : explode(',', $CFG->webserviceprotocols); @@ -10768,10 +10768,10 @@ class admin_setting_searchsetupinfo extends admin_setting { $row[0] = '1. ' . html_writer::tag('a', get_string('selectsearchengine', 'admin'), array('href' => $url)); - $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); + $status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger')); if (!empty($CFG->searchengine)) { $status = html_writer::tag('span', get_string('pluginname', 'search_' . $CFG->searchengine), - array('class' => 'statusok')); + array('class' => 'badge badge-success')); } $row[1] = $status; @@ -10783,9 +10783,9 @@ class admin_setting_searchsetupinfo extends admin_setting { $row[0] = '2. ' . html_writer::tag('a', get_string('enablesearchareas', 'admin'), array('href' => $url)); - $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); + $status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger')); if ($anyenabled) { - $status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok')); + $status = html_writer::tag('span', get_string('yes'), array('class' => 'badge badge-success')); } $row[1] = $status; @@ -10795,7 +10795,7 @@ class admin_setting_searchsetupinfo extends admin_setting { $row = array(); if (empty($CFG->searchengine)) { $row[0] = '3. ' . get_string('setupsearchengine', 'admin'); - $row[1] = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); + $row[1] = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger')); } else { $url = new moodle_url('/admin/settings.php?section=search' . $CFG->searchengine); $row[0] = '3. ' . html_writer::tag('a', get_string('setupsearchengine', 'admin'), @@ -10808,9 +10808,9 @@ class admin_setting_searchsetupinfo extends admin_setting { $serverstatus = $e->getMessage(); } if ($serverstatus === true) { - $status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok')); + $status = html_writer::tag('span', get_string('yes'), array('class' => 'badge badge-success')); } else { - $status = html_writer::tag('span', $serverstatus, array('class' => 'statuscritical')); + $status = html_writer::tag('span', $serverstatus, array('class' => 'badge badge-danger')); } $row[1] = $status; } @@ -10821,9 +10821,9 @@ class admin_setting_searchsetupinfo extends admin_setting { $url = new moodle_url('/admin/searchareas.php'); $row[0] = '4. ' . html_writer::tag('a', get_string('indexdata', 'admin'), array('href' => $url)); if ($anyindexed) { - $status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok')); + $status = html_writer::tag('span', get_string('yes'), array('class' => 'badge badge-success')); } else { - $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); + $status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger')); } $row[1] = $status; $table->data[] = $row; @@ -10833,9 +10833,9 @@ class admin_setting_searchsetupinfo extends admin_setting { $url = new moodle_url("/admin/search.php?query=enableglobalsearch"); $row[0] = '5. ' . html_writer::tag('a', get_string('enableglobalsearch', 'admin'), array('href' => $url)); - $status = html_writer::tag('span', get_string('no'), array('class' => 'statuscritical')); + $status = html_writer::tag('span', get_string('no'), array('class' => 'badge badge-danger')); if (\core_search\manager::is_global_search_enabled()) { - $status = html_writer::tag('span', get_string('yes'), array('class' => 'statusok')); + $status = html_writer::tag('span', get_string('yes'), array('class' => 'badge badge-success')); } $row[1] = $status; $table->data[] = $row; diff --git a/report/backups/index.php b/report/backups/index.php index 91090a72d16..22b128859a8 100644 --- a/report/backups/index.php +++ b/report/backups/index.php @@ -63,13 +63,13 @@ if ($courseid) { // Get the backup status. if ($backup->status == backup::STATUS_FINISHED_OK) { $status = $strok; - $statusclass = 'backup-ok'; // Green. + $statusclass = 'table-success'; // Green. } else if ($backup->status == backup::STATUS_AWAITING || $backup->status == backup::STATUS_EXECUTING) { $status = $strunfinished; - $statusclass = 'backup-unfinished'; // Red. + $statusclass = 'table-danger'; // Red. } else { // Else show error. $status = $strerror; - $statusclass = 'backup-error'; // Red. + $statusclass = 'table-danger'; // Red. } $table = new html_table(); @@ -140,25 +140,25 @@ foreach ($rs as $backuprow) { // Prepare a cell to display the status of the entry. if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_OK) { $status = $strok; - $statusclass = 'backup-ok'; // Green. + $statusclass = 'table-success'; // Green. } else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_UNFINISHED) { $status = $strunfinished; - $statusclass = 'backup-unfinished'; // Red. + $statusclass = 'table-danger'; // Red. } else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_SKIPPED) { $status = $strskipped; - $statusclass = 'backup-skipped'; // Green. + $statusclass = 'table-success'; // Green. } else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_WARNING) { $status = $strwarning; - $statusclass = 'backup-warning'; // Orange. + $statusclass = 'table-warning'; // Orange. } else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_NOTYETRUN) { $status = $strnotyetrun; - $statusclass = 'backup-notyetrun'; + $statusclass = 'table-success'; } else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_QUEUED) { $status = $strqueued; - $statusclass = 'backup-queued'; + $statusclass = 'table-success'; } else { $status = $strerror; - $statusclass = 'backup-error'; // Red. + $statusclass = 'table-danger'; // Red. } $status = new html_table_cell($status); $status->attributes = array('class' => $statusclass); diff --git a/report/performance/locallib.php b/report/performance/locallib.php index acb607986d2..ff11ee7b1e7 100644 --- a/report/performance/locallib.php +++ b/report/performance/locallib.php @@ -117,10 +117,10 @@ class report_performance { */ public function add_issue_to_table(&$table, $issueresult, $detailed = false) { global $OUTPUT; - $statusarr = array(self::REPORT_PERFORMANCE_OK => 'statusok', - self::REPORT_PERFORMANCE_WARNING => 'statuswarning', - self::REPORT_PERFORMANCE_SERIOUS => 'statusserious', - self::REPORT_PERFORMANCE_CRITICAL => 'statuscritical'); + $statusarr = array(self::REPORT_PERFORMANCE_OK => 'badge badge-success', + self::REPORT_PERFORMANCE_WARNING => 'badge badge-warning', + self::REPORT_PERFORMANCE_SERIOUS => 'badge badge-danger', + self::REPORT_PERFORMANCE_CRITICAL => 'badge badge-danger'); $row = array(); if ($detailed) { diff --git a/report/security/index.php b/report/security/index.php index 29fb038dba8..d0dab6122a7 100644 --- a/report/security/index.php +++ b/report/security/index.php @@ -51,11 +51,11 @@ echo $OUTPUT->heading(get_string('pluginname', 'report_security')); echo '
'.get_string('timewarning', 'report_security').'
'; -$strok = ''.get_string('statusok', 'report_security').''; -$strinfo = ''.get_string('statusinfo', 'report_security').''; -$strwarning = ''.get_string('statuswarning', 'report_security').''; -$strserious = ''.get_string('statusserious', 'report_security').''; -$strcritical = ''.get_string('statuscritical', 'report_security').''; +$strok = ''.get_string('statusok', 'report_security').''; +$strinfo = ''.get_string('statusinfo', 'report_security').''; +$strwarning = ''.get_string('statuswarning', 'report_security').''; +$strserious = ''.get_string('statusserious', 'report_security').''; +$strcritical = ''.get_string('statuscritical', 'report_security').''; $strissue = get_string('issue', 'report_security'); $strstatus = get_string('status', 'report_security'); diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss index 323e9ff5b16..8b0da3a61eb 100644 --- a/theme/boost/scss/moodle/admin.scss +++ b/theme/boost/scss/moodle/admin.scss @@ -61,42 +61,10 @@ display: none; } -.statusok { - @extend .tag; - @extend .tag-success; -} - -.statuswarning { - @extend .tag; - @extend .tag-warning; -} - -.statusserious, -.statuscritical { - @extend .tag; - @extend .tag-danger; -} - #page-admin-report-capability-index #capabilitysearch { width: 30em; } -#page-admin-report-backups-index .backup-error, -#page-admin-report-backups-index .backup-unfinished { - @extend .tag-danger; -} - -#page-admin-report-backups-index .backup-skipped, -#page-admin-report-backups-index .backup-ok, -#page-admin-report-backups-index .backup-notyetrun, -#page-admin-report-backups-index .backup-queued { - @extend .tag-success; -} - -#page-admin-report-backups-index .backup-warning { - @extend .tag-warning; -} - #page-admin-qtypes .disabled, #page-admin-qbehaviours .disabled { @extend .text-muted; @@ -184,24 +152,6 @@ text-align: left; } -#page-admin-index .releasenoteslink, -#page-admin-index .adminwarning, -#page-admin-index .adminerror { - @extend .alert; -} - -#page-admin-index .adminwarning { - @extend .alert-warning; -} - -#page-admin-index .adminerror { - @extend .alert-danger; -} - -#page-admin-index .releasenoteslink { - @extend .alert-info; -} - #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo span { display: block; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 1f6778271a3..ff9c8d9c967 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -2308,14 +2308,10 @@ .fa-meetup:before { content: ""; } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, -.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, -.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, +.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, -.path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, -.path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, +.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .tag_list > b { @@ -5999,9 +5995,7 @@ p.arrow_button input[type="button"], padding-right: 0; padding-left: 0; } -.alert, #page-admin-index .releasenoteslink, -#page-admin-index .adminwarning, -#page-admin-index .adminerror, .que .formulation, +.alert, .que .formulation, .que .outcome, .que .comment, .assignfeedback_editpdf_widget .label { position: relative; @@ -6052,35 +6046,33 @@ p.arrow_button input[type="button"], .alert-success .alert-link, .que .comment .alert-link { color: #1f3e1f; } -.alert-info, #page-admin-index .releasenoteslink, #adminsettings .form-overridden, .que .formulation, .assignfeedback_editpdf_widget .label { +.alert-info, #adminsettings .form-overridden, .que .formulation, .assignfeedback_editpdf_widget .label { color: #2f6473; background-color: #def2f8; border-color: #d1edf6; } - .alert-info hr, #page-admin-index .releasenoteslink hr, #adminsettings .form-overridden hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { + .alert-info hr, #adminsettings .form-overridden hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { border-top-color: #bce5f2; } - .alert-info .alert-link, #page-admin-index .releasenoteslink .alert-link, #adminsettings .form-overridden .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { + .alert-info .alert-link, #adminsettings .form-overridden .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { color: #20454f; } -.alert-warning, -#page-admin-index .adminwarning, .uninstalldeleteconfirmexternal, +.alert-warning, .uninstalldeleteconfirmexternal, .que .outcome, .que .comment { color: #7d5a29; background-color: #fcefdc; border-color: #fbe8cd; } - .alert-warning hr, #page-admin-index .adminwarning hr, .uninstalldeleteconfirmexternal hr, .que .outcome hr, .que .comment hr { + .alert-warning hr, .uninstalldeleteconfirmexternal hr, .que .outcome hr, .que .comment hr { border-top-color: #f9ddb5; } - .alert-warning .alert-link, #page-admin-index .adminwarning .alert-link, .uninstalldeleteconfirmexternal .alert-link, .que .outcome .alert-link, .que .comment .alert-link { + .alert-warning .alert-link, .uninstalldeleteconfirmexternal .alert-link, .que .outcome .alert-link, .que .comment .alert-link { color: #573e1c; } -.alert-danger, -#page-admin-index .adminerror { +.alert-danger { color: #712b29; background-color: #f7dddc; border-color: #f4cfce; } - .alert-danger hr, #page-admin-index .adminerror hr { + .alert-danger hr { border-top-color: #efbbb9; } - .alert-danger .alert-link, #page-admin-index .adminerror .alert-link { + .alert-danger .alert-link { color: #4c1d1b; } .alert-light { @@ -7728,14 +7720,10 @@ button.bg-dark:focus { top: 0; z-index: 1020; } } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, -.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, -.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, +.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, -.path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, -.path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, +.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .tag_list > b { @@ -9453,8 +9441,7 @@ a.dimmed_text:visited, /* stylelint-disable function-url-scheme-blacklist */ /* stylelint-enable function-url-scheme-blacklist */ -.tag, .statusok, .statuswarning, .statusserious, -.statuscritical, .que .correctness, .label { +.tag, .que .correctness, .label { display: inline-block; padding: 0.25rem 0.4em; font-size: 75%; @@ -9464,8 +9451,7 @@ a.dimmed_text:visited, text-align: center; white-space: nowrap; vertical-align: baseline; } - .tag:empty, .statusok:empty, .statuswarning:empty, .statusserious:empty, - .statuscritical:empty, .que .correctness:empty, .label:empty { + .tag:empty, .que .correctness:empty, .label:empty { display: none; } .form-control-success, @@ -9489,18 +9475,9 @@ a.dimmed_text:visited, .tag-primary[href]:hover, .tag-primary[href]:focus { background-color: #0d5ca2; } -.tag-success, .statusok, #page-admin-report-backups-index .backup-skipped, -#page-admin-report-backups-index .backup-ok, -#page-admin-report-backups-index .backup-notyetrun, -#page-admin-report-backups-index .backup-queued { +.tag-success { background-color: #5cb85c; } - .tag-success[href]:hover, .statusok[href]:hover, #page-admin-report-backups-index .backup-skipped[href]:hover, - #page-admin-report-backups-index .backup-ok[href]:hover, - #page-admin-report-backups-index .backup-notyetrun[href]:hover, - #page-admin-report-backups-index .backup-queued[href]:hover, .tag-success[href]:focus, .statusok[href]:focus, #page-admin-report-backups-index .backup-skipped[href]:focus, - #page-admin-report-backups-index .backup-ok[href]:focus, - #page-admin-report-backups-index .backup-notyetrun[href]:focus, - #page-admin-report-backups-index .backup-queued[href]:focus { + .tag-success[href]:hover, .tag-success[href]:focus { background-color: #449d44; } .tag-info, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release { @@ -9508,23 +9485,17 @@ a.dimmed_text:visited, .tag-info[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release[href]:hover, .tag-info[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release[href]:focus { background-color: #31b0d5; } -.tag-warning, .statuswarning, #page-admin-report-backups-index .backup-warning, #page-admin-index .updateplugin .updatepluginconfirmexternal, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release, +.tag-warning, #page-admin-index .updateplugin .updatepluginconfirmexternal, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release { background-color: #ff7518; } - .tag-warning[href]:hover, .statuswarning[href]:hover, #page-admin-report-backups-index .backup-warning[href]:hover, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:hover, - #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:hover, .tag-warning[href]:focus, .statuswarning[href]:focus, #page-admin-report-backups-index .backup-warning[href]:focus, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:focus, + .tag-warning[href]:hover, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:hover, + #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:hover, .tag-warning[href]:focus, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:focus { background-color: #e45c00; } -.tag-danger, .statusserious, -.statuscritical, #page-admin-report-backups-index .backup-error, -#page-admin-report-backups-index .backup-unfinished, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release { +.tag-danger, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release { background-color: #d9534f; } - .tag-danger[href]:hover, .statusserious[href]:hover, - .statuscritical[href]:hover, #page-admin-report-backups-index .backup-error[href]:hover, - #page-admin-report-backups-index .backup-unfinished[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:hover, .tag-danger[href]:focus, .statusserious[href]:focus, - .statuscritical[href]:focus, #page-admin-report-backups-index .backup-error[href]:focus, - #page-admin-report-backups-index .backup-unfinished[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:focus { + .tag-danger[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:hover, .tag-danger[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:focus { background-color: #c9302c; } .custom-select { @@ -13504,12 +13475,6 @@ span.editinstructions { margin: 0.4rem 1rem 0.45rem; } #course-category-listings .select-a-category .notifymessage, #course-category-listings .select-a-category .alert, - #course-category-listings .select-a-category #page-admin-index .releasenoteslink, - #page-admin-index #course-category-listings .select-a-category .releasenoteslink, - #course-category-listings .select-a-category #page-admin-index .adminwarning, - #page-admin-index #course-category-listings .select-a-category .adminwarning, - #course-category-listings .select-a-category #page-admin-index .adminerror, - #page-admin-index #course-category-listings .select-a-category .adminerror, #course-category-listings .select-a-category .que .formulation, .que #course-category-listings .select-a-category .formulation, #course-category-listings .select-a-category .que .outcome, @@ -15112,17 +15077,7 @@ body.path-question-type { font: inherit; position: static; padding-right: .3em; } - body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminwarning, - body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminwarning, - body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, - body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, - body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminwarning, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminwarning, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminwarning, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminwarning, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminerror, - body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminerror, - body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminerror, - body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, - body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminerror, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminerror, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminerror, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, + body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome, @@ -15137,17 +15092,7 @@ body.path-question-type { body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, body.path-question-type .form-group #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminwarning, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminwarning, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminwarning, body.path-question-type .form-group #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminwarning, body.path-question-type .form-buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminwarning, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminwarning, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminerror, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminerror, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminerror, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminerror, body.path-question-type .form-buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminerror, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminerror, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, + body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome, diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 2b347c5403b..5e1ed7dc417 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -2308,14 +2308,10 @@ .fa-meetup:before { content: ""; } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, -.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, -.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, +.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, -.path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, -.path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, +.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .tag_list > b { @@ -6194,9 +6190,7 @@ p.arrow_button input[type="button"], padding-left: 0; border-radius: 0; } -.alert, #page-admin-index .releasenoteslink, -#page-admin-index .adminwarning, -#page-admin-index .adminerror, .que .formulation, +.alert, .que .formulation, .que .outcome, .que .comment, .assignfeedback_editpdf_widget .label { position: relative; @@ -6248,35 +6242,33 @@ p.arrow_button input[type="button"], .alert-success .alert-link, .que .comment .alert-link { color: #1f3e1f; } -.alert-info, #page-admin-index .releasenoteslink, #adminsettings .form-overridden, .que .formulation, .assignfeedback_editpdf_widget .label { +.alert-info, #adminsettings .form-overridden, .que .formulation, .assignfeedback_editpdf_widget .label { color: #2f6473; background-color: #def2f8; border-color: #d1edf6; } - .alert-info hr, #page-admin-index .releasenoteslink hr, #adminsettings .form-overridden hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { + .alert-info hr, #adminsettings .form-overridden hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { border-top-color: #bce5f2; } - .alert-info .alert-link, #page-admin-index .releasenoteslink .alert-link, #adminsettings .form-overridden .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { + .alert-info .alert-link, #adminsettings .form-overridden .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { color: #20454f; } -.alert-warning, -#page-admin-index .adminwarning, .uninstalldeleteconfirmexternal, +.alert-warning, .uninstalldeleteconfirmexternal, .que .outcome, .que .comment { color: #7d5a29; background-color: #fcefdc; border-color: #fbe8cd; } - .alert-warning hr, #page-admin-index .adminwarning hr, .uninstalldeleteconfirmexternal hr, .que .outcome hr, .que .comment hr { + .alert-warning hr, .uninstalldeleteconfirmexternal hr, .que .outcome hr, .que .comment hr { border-top-color: #f9ddb5; } - .alert-warning .alert-link, #page-admin-index .adminwarning .alert-link, .uninstalldeleteconfirmexternal .alert-link, .que .outcome .alert-link, .que .comment .alert-link { + .alert-warning .alert-link, .uninstalldeleteconfirmexternal .alert-link, .que .outcome .alert-link, .que .comment .alert-link { color: #573e1c; } -.alert-danger, -#page-admin-index .adminerror { +.alert-danger { color: #712b29; background-color: #f7dddc; border-color: #f4cfce; } - .alert-danger hr, #page-admin-index .adminerror hr { + .alert-danger hr { border-top-color: #efbbb9; } - .alert-danger .alert-link, #page-admin-index .adminerror .alert-link { + .alert-danger .alert-link { color: #4c1d1b; } .alert-light { @@ -7975,14 +7967,10 @@ button.bg-dark:focus { top: 0; z-index: 1020; } } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, -.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, -.path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, +.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, -.path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, -.path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, +.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .tag_list > b { @@ -9700,8 +9688,7 @@ a.dimmed_text:visited, /* stylelint-disable function-url-scheme-blacklist */ /* stylelint-enable function-url-scheme-blacklist */ -.tag, .statusok, .statuswarning, .statusserious, -.statuscritical, .que .correctness, .label { +.tag, .que .correctness, .label { display: inline-block; padding: 0.25rem 0.4em; font-size: 75%; @@ -9712,8 +9699,7 @@ a.dimmed_text:visited, white-space: nowrap; vertical-align: baseline; border-radius: 0.25rem; } - .tag:empty, .statusok:empty, .statuswarning:empty, .statusserious:empty, - .statuscritical:empty, .que .correctness:empty, .label:empty { + .tag:empty, .que .correctness:empty, .label:empty { display: none; } .form-control-success, @@ -9737,18 +9723,9 @@ a.dimmed_text:visited, .tag-primary[href]:hover, .tag-primary[href]:focus { background-color: #0d5ca2; } -.tag-success, .statusok, #page-admin-report-backups-index .backup-skipped, -#page-admin-report-backups-index .backup-ok, -#page-admin-report-backups-index .backup-notyetrun, -#page-admin-report-backups-index .backup-queued { +.tag-success { background-color: #5cb85c; } - .tag-success[href]:hover, .statusok[href]:hover, #page-admin-report-backups-index .backup-skipped[href]:hover, - #page-admin-report-backups-index .backup-ok[href]:hover, - #page-admin-report-backups-index .backup-notyetrun[href]:hover, - #page-admin-report-backups-index .backup-queued[href]:hover, .tag-success[href]:focus, .statusok[href]:focus, #page-admin-report-backups-index .backup-skipped[href]:focus, - #page-admin-report-backups-index .backup-ok[href]:focus, - #page-admin-report-backups-index .backup-notyetrun[href]:focus, - #page-admin-report-backups-index .backup-queued[href]:focus { + .tag-success[href]:hover, .tag-success[href]:focus { background-color: #449d44; } .tag-info, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release { @@ -9756,23 +9733,17 @@ a.dimmed_text:visited, .tag-info[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release[href]:hover, .tag-info[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release[href]:focus { background-color: #31b0d5; } -.tag-warning, .statuswarning, #page-admin-report-backups-index .backup-warning, #page-admin-index .updateplugin .updatepluginconfirmexternal, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release, +.tag-warning, #page-admin-index .updateplugin .updatepluginconfirmexternal, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release { background-color: #ff7518; } - .tag-warning[href]:hover, .statuswarning[href]:hover, #page-admin-report-backups-index .backup-warning[href]:hover, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:hover, - #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:hover, .tag-warning[href]:focus, .statuswarning[href]:focus, #page-admin-report-backups-index .backup-warning[href]:focus, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:focus, + .tag-warning[href]:hover, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:hover, + #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:hover, .tag-warning[href]:focus, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:focus { background-color: #e45c00; } -.tag-danger, .statusserious, -.statuscritical, #page-admin-report-backups-index .backup-error, -#page-admin-report-backups-index .backup-unfinished, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release { +.tag-danger, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release { background-color: #d9534f; } - .tag-danger[href]:hover, .statusserious[href]:hover, - .statuscritical[href]:hover, #page-admin-report-backups-index .backup-error[href]:hover, - #page-admin-report-backups-index .backup-unfinished[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:hover, .tag-danger[href]:focus, .statusserious[href]:focus, - .statuscritical[href]:focus, #page-admin-report-backups-index .backup-error[href]:focus, - #page-admin-report-backups-index .backup-unfinished[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:focus { + .tag-danger[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:hover, .tag-danger[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:focus { background-color: #c9302c; } .custom-select { @@ -13762,12 +13733,6 @@ span.editinstructions { margin: 0.4rem 1rem 0.45rem; } #course-category-listings .select-a-category .notifymessage, #course-category-listings .select-a-category .alert, - #course-category-listings .select-a-category #page-admin-index .releasenoteslink, - #page-admin-index #course-category-listings .select-a-category .releasenoteslink, - #course-category-listings .select-a-category #page-admin-index .adminwarning, - #page-admin-index #course-category-listings .select-a-category .adminwarning, - #course-category-listings .select-a-category #page-admin-index .adminerror, - #page-admin-index #course-category-listings .select-a-category .adminerror, #course-category-listings .select-a-category .que .formulation, .que #course-category-listings .select-a-category .formulation, #course-category-listings .select-a-category .que .outcome, @@ -15374,17 +15339,7 @@ body.path-question-type { font: inherit; position: static; padding-right: .3em; } - body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminwarning, - body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminwarning, - body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, - body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, - body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminwarning, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminwarning, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminwarning, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminwarning, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminerror, - body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminerror, - body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminerror, - body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, - body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum .nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminerror, body.path-question-type .form-buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminerror, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminerror, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum .nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, + body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome, @@ -15399,17 +15354,7 @@ body.path-question-type { body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.releasenoteslink, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, body.path-question-type .form-group #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.releasenoteslink, body.path-question-type .form-buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.releasenoteslink, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.releasenoteslink, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.releasenoteslink, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.releasenoteslink, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.releasenoteslink, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.releasenoteslink, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.releasenoteslink, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminwarning, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminwarning, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminwarning, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminwarning, body.path-question-type .form-group #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminwarning, body.path-question-type .form-buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminwarning, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminwarning, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminwarning, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminwarning, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminwarning, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminwarning, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminwarning, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-group .discussionlocked.adminerror, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .form-buttons .discussionlocked.adminerror, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index .path-admin body.path-question-type .buttons .discussionlocked.adminerror, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode #page-admin-index .discussionlocked.adminerror, .path-mod-forum.nested-v2-display-mode #page-admin-index body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.adminerror, body.path-question-type .form-buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.adminerror, body.path-question-type .path-admin .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.adminerror, .path-admin body.path-question-type .buttons #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.adminerror, body.path-question-type .fp-content-center form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.adminerror, .fp-content-center body.path-question-type form + div #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.adminerror, body.path-question-type div.backup-section + form #page-admin-index .path-mod-forum.nested-v2-display-mode .discussionlocked.adminerror, #page-admin-index .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.adminerror, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, + body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome, From 2af7619b86757173499e568c05fcb0658dca2f80 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 28 Oct 2019 15:18:25 +0100 Subject: [PATCH 02/23] MDL-66999 theme_boost: @extend remove unused admin css --- theme/boost/scss/moodle/admin.scss | 17 ----------------- theme/boost/style/moodle.css | 15 ++++++--------- theme/classic/style/moodle.css | 15 ++++++--------- 3 files changed, 12 insertions(+), 35 deletions(-) diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss index 8b0da3a61eb..73edcb9e11a 100644 --- a/theme/boost/scss/moodle/admin.scss +++ b/theme/boost/scss/moodle/admin.scss @@ -160,10 +160,6 @@ margin-bottom: 0.5em; } -#page-admin-index .updateplugin .updatepluginconfirmexternal { - @extend .tag-warning; -} - #page-admin-user-user_bulk #users .fgroup { white-space: nowrap; } @@ -420,19 +416,6 @@ text-align: center; } -#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release { - @extend .tag-info; -} - -#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release, -#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release { - @extend .tag-warning; -} - -#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release { - @extend .tag-danger; -} - // Plugins overview page at admin/plugins.php #page-admin-plugins { #plugins-overview-panel { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index ff9c8d9c967..0e95ec7af5a 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -9480,22 +9480,19 @@ a.dimmed_text:visited, .tag-success[href]:hover, .tag-success[href]:focus { background-color: #449d44; } -.tag-info, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release { +.tag-info { background-color: #5bc0de; } - .tag-info[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release[href]:hover, .tag-info[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release[href]:focus { + .tag-info[href]:hover, .tag-info[href]:focus { background-color: #31b0d5; } -.tag-warning, #page-admin-index .updateplugin .updatepluginconfirmexternal, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release, -#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release { +.tag-warning { background-color: #ff7518; } - .tag-warning[href]:hover, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:hover, - #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:hover, .tag-warning[href]:focus, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:focus, - #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:focus { + .tag-warning[href]:hover, .tag-warning[href]:focus { background-color: #e45c00; } -.tag-danger, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release { +.tag-danger { background-color: #d9534f; } - .tag-danger[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:hover, .tag-danger[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:focus { + .tag-danger[href]:hover, .tag-danger[href]:focus { background-color: #c9302c; } .custom-select { diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 5e1ed7dc417..15d12e41405 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -9728,22 +9728,19 @@ a.dimmed_text:visited, .tag-success[href]:hover, .tag-success[href]:focus { background-color: #449d44; } -.tag-info, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release { +.tag-info { background-color: #5bc0de; } - .tag-info[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release[href]:hover, .tag-info[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release[href]:focus { + .tag-info[href]:hover, .tag-info[href]:focus { background-color: #31b0d5; } -.tag-warning, #page-admin-index .updateplugin .updatepluginconfirmexternal, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release, -#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release { +.tag-warning { background-color: #ff7518; } - .tag-warning[href]:hover, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:hover, - #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:hover, .tag-warning[href]:focus, #page-admin-index .updateplugin .updatepluginconfirmexternal[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release[href]:focus, - #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release[href]:focus { + .tag-warning[href]:hover, .tag-warning[href]:focus { background-color: #e45c00; } -.tag-danger, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release { +.tag-danger { background-color: #d9534f; } - .tag-danger[href]:hover, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:hover, .tag-danger[href]:focus, #page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release[href]:focus { + .tag-danger[href]:hover, .tag-danger[href]:focus { background-color: #c9302c; } .custom-select { From 6239d80855fc1f50f940755f51553a96ac9d961b Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 28 Oct 2019 15:26:22 +0100 Subject: [PATCH 03/23] MDL-66999 theme_boost: @extend text-muted replace all instances of @extend .text-muted with color: $text-muted --- admin/qbehaviours.php | 2 +- admin/qtypes.php | 2 +- theme/boost/scss/moodle/admin.scss | 21 +-- theme/boost/scss/moodle/backup-restore.scss | 2 +- theme/boost/scss/moodle/calendar.scss | 2 +- theme/boost/scss/moodle/core.scss | 4 +- theme/boost/scss/moodle/course.scss | 12 +- theme/boost/scss/moodle/filemanager.scss | 2 +- theme/boost/scss/moodle/forms.scss | 6 +- theme/boost/style/moodle.css | 183 +++++++++----------- theme/classic/style/moodle.css | 183 +++++++++----------- 11 files changed, 180 insertions(+), 239 deletions(-) diff --git a/admin/qbehaviours.php b/admin/qbehaviours.php index ae01d317292..9edd3f09522 100644 --- a/admin/qbehaviours.php +++ b/admin/qbehaviours.php @@ -170,7 +170,7 @@ foreach ($sortedbehaviours as $behaviour => $behaviourname) { if ($version) { $row[] = $version; } else { - $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled')); + $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'text-muted')); } // Other question types required by this one. diff --git a/admin/qtypes.php b/admin/qtypes.php index a6bc06a4abd..47046983044 100644 --- a/admin/qtypes.php +++ b/admin/qtypes.php @@ -172,7 +172,7 @@ foreach ($sortedqtypes as $qtypename => $localname) { if ($version) { $row[] = $version; } else { - $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled')); + $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'text-muted')); } // Other question types required by this one. diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss index 73edcb9e11a..37b85b53a9e 100644 --- a/theme/boost/scss/moodle/admin.scss +++ b/theme/boost/scss/moodle/admin.scss @@ -65,11 +65,6 @@ width: 30em; } -#page-admin-qtypes .disabled, -#page-admin-qbehaviours .disabled { - @extend .text-muted; -} - #page-admin-qtypes #qtypes div, #page-admin-qtypes #qtypes form, #page-admin-qbehaviours #qbehaviours div, @@ -457,7 +452,7 @@ .pluginname { .componentname { font-size: $font-size-sm; - @extend .text-muted; + color: $text-muted; margin-left: 22px; } } @@ -465,7 +460,7 @@ .version { .versionnumber { font-size: $font-size-sm; - @extend .text-muted; + color: $text-muted; } } @@ -482,7 +477,7 @@ .requiredby { font-size: $font-size-sm; - @extend .text-muted; + color: $text-muted; } } } @@ -492,7 +487,7 @@ // Plugins check page displayed during upgrade. #plugins-check-page { .page-description { - @extend .text-muted; + color: $text-muted; } // Check for updates. @@ -531,7 +526,7 @@ // Plugins check table. #plugins-check { .requires-ok { - @extend .text-muted; + color: $text-muted; } .status-missing, @@ -543,7 +538,7 @@ .displayname { .plugindir { - @extend .text-muted; + color: $text-muted; font-size: $font-size-sm; } } @@ -585,7 +580,7 @@ #plugins-check-available-dependencies { .displayname .component { font-size: $font-size-sm; - @extend .text-muted; + color: $text-muted; } .info .actions { @@ -751,7 +746,7 @@ padding: 0; margin: 0 0 1.5rem 0; li { - @extend .text-muted; + color: $text-muted; @extend .small; + li:before { padding-right: 0.5rem; diff --git a/theme/boost/scss/moodle/backup-restore.scss b/theme/boost/scss/moodle/backup-restore.scss index 3c8733ac1af..64dddd56a01 100644 --- a/theme/boost/scss/moodle/backup-restore.scss +++ b/theme/boost/scss/moodle/backup-restore.scss @@ -123,7 +123,7 @@ margin-bottom: $spacer-y; .backup_stage { - @extend .text-muted; + color: $text-muted; &.backup_stage_current { font-weight: bold; diff --git a/theme/boost/scss/moodle/calendar.scss b/theme/boost/scss/moodle/calendar.scss index 5db0a490d09..fa6bddb14d9 100644 --- a/theme/boost/scss/moodle/calendar.scss +++ b/theme/boost/scss/moodle/calendar.scss @@ -275,7 +275,7 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue. td { &.weekend { - @extend .text-muted; + color: $text-muted; } a { diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index a7fa7e05333..084292a10b3 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -85,7 +85,7 @@ a.dimmed_text:visited, .usersuspended a:visited, .dimmed_category, .dimmed_category a { - @extend .text-muted; + color: $text-muted; } .unlist, @@ -766,7 +766,7 @@ tr.flagged-tag a { } .tag_feed .media .muted a { - @extend .text-muted; + color: $text-muted; } .tag_cloud { diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss index d214210a7c9..d068d112def 100644 --- a/theme/boost/scss/moodle/course.scss +++ b/theme/boost/scss/moodle/course.scss @@ -106,7 +106,7 @@ body:not(.editing) .sitetopic ul.section { } .stealth { - @extend .text-muted; + color: $text-muted; } a.stealth, a.stealth:hover { @@ -259,7 +259,7 @@ body:not(.editing) .sitetopic ul.section { } .course-content .section-summary .section-summary-activities .activity-count { - @extend .text-muted; + color: $text-muted; font-size: $font-size-sm; margin: 3px; white-space: nowrap; @@ -323,7 +323,7 @@ body:not(.editing) .sitetopic ul.section { .sectionname > span, .content > div.summary, .activity .activityinstance { - @extend .text-muted; + color: $text-muted; } } @@ -905,11 +905,11 @@ span.editinstructions { } // The category or course is hidden. &[data-visible="0"] { - @extend .text-muted; + color: $text-muted; > div { > a { - @extend .text-muted; + color: $text-muted; } .item-actions { @@ -1057,7 +1057,7 @@ span.editinstructions { text-align: center; &.dimmed { - @extend .text-muted; + color: $text-muted; margin: 0.4rem 1rem 0.45rem; } } diff --git a/theme/boost/scss/moodle/filemanager.scss b/theme/boost/scss/moodle/filemanager.scss index 18f4d49226e..a0012d7da0b 100644 --- a/theme/boost/scss/moodle/filemanager.scss +++ b/theme/boost/scss/moodle/filemanager.scss @@ -621,7 +621,7 @@ a.ygtvspacer:hover { } .fitem.disabled .fp-btn-choose { - @extend .text-muted; + color: $text-muted; } .fitem.disabled .filepicker-filelist .filepicker-filename { diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss index d6ddd543568..70ad395b274 100644 --- a/theme/boost/scss/moodle/forms.scss +++ b/theme/boost/scss/moodle/forms.scss @@ -90,7 +90,7 @@ input#id_externalurl { .form-defaultinfo, .form-label .form-shortname { - @extend .text-muted; + color: $text-muted; } .form-label .form-shortname { @@ -107,7 +107,7 @@ input#id_externalurl { } .formsettingheading .form-horizontal { - @extend .text-muted; + color: $text-muted; } // Moodle doesn't differentiate between what Bootstrap calls @@ -115,7 +115,7 @@ input#id_externalurl { // uneditable looks ugly, styling both as form help is fairly // subtle in it's impact. Going for the latter as the best option. .no-felement.fstatic { - @extend .text-muted; + color: $text-muted; padding-top: 5px; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 0e95ec7af5a..0b3828367ec 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -9325,26 +9325,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .text-body { color: #373a3c !important; } -.text-muted, a.dimmed, -a.dimmed:link, -a.dimmed:visited, -a.dimmed_text, -a.dimmed_text:link, -a.dimmed_text:visited, -.dimmed_text, -.dimmed_text a, -.dimmed_text a:link, -.dimmed_text a:visited, -.usersuspended, -.usersuspended a, -.usersuspended a:link, -.usersuspended a:visited, -.dimmed_category, -.dimmed_category a, .tag_feed .media .muted a, #page-admin-qtypes .disabled, -#page-admin-qbehaviours .disabled, #page-admin-plugins #plugins-control-panel .pluginname .componentname, #page-admin-plugins #plugins-control-panel .version .versionnumber, #page-admin-plugins #plugins-control-panel .notes .requiredby, #plugins-check-page .page-description, #plugins-check-page #plugins-check .requires-ok, #plugins-check-page #plugins-check .displayname .plugindir, #plugins-check-page #plugins-check-available-dependencies .displayname .component, #page-admin-search .adminpagepath li, .block .minicalendar td.weekend, .section .activity .stealth, .course-content .section-summary .section-summary-activities .activity-count, .course-content ul li.section.hidden .sectionname > span, -.course-content ul li.section.hidden .content > div.summary, -.course-content ul li.section.hidden .activity .activityinstance, #course-category-listings .listitem[data-visible="0"], #course-category-listings .listitem[data-visible="0"] > div > a, #course-category-listings .listing-pagination-totals.dimmed, .fitem.disabled .fp-btn-choose, .form-defaultinfo, -.form-label .form-shortname, .formsettingheading .form-horizontal, .no-felement.fstatic, .path-backup .backup_progress .backup_stage { +.text-muted { color: #868e96 !important; } .text-black-50 { @@ -9748,6 +9729,24 @@ input[disabled] { .mdl-align { text-align: center; } +a.dimmed, +a.dimmed:link, +a.dimmed:visited, +a.dimmed_text, +a.dimmed_text:link, +a.dimmed_text:visited, +.dimmed_text, +.dimmed_text a, +.dimmed_text a:link, +.dimmed_text a:visited, +.usersuspended, +.usersuspended a, +.usersuspended a:link, +.usersuspended a:visited, +.dimmed_category, +.dimmed_category a { + color: #868e96; } + .unlist, .unlist li, .inline-list, @@ -10275,6 +10274,9 @@ img.user-image { padding-right: 10px; padding-left: 10px; } +.tag_feed .media .muted a { + color: #868e96; } + .tag_cloud { text-align: center; } @@ -11989,10 +11991,12 @@ body.h5p-embed .h5pmessages { #page-admin-plugins #plugins-control-panel .pluginname .componentname { font-size: 0.8203125rem; + color: #868e96; margin-left: 22px; } #page-admin-plugins #plugins-control-panel .version .versionnumber { - font-size: 0.8203125rem; } + font-size: 0.8203125rem; + color: #868e96; } #page-admin-plugins #plugins-control-panel .uninstall a { color: #d9534f; } @@ -12001,7 +12005,11 @@ body.h5p-embed .h5pmessages { margin-right: 3px; } #page-admin-plugins #plugins-control-panel .notes .requiredby { - font-size: 0.8203125rem; } + font-size: 0.8203125rem; + color: #868e96; } + +#plugins-check-page .page-description { + color: #868e96; } #plugins-check-page .checkforupdates .singlebutton { margin: 5px 0; @@ -12021,11 +12029,15 @@ body.h5p-embed .h5pmessages { #plugins-check-page #plugins-check-info .actions .singlebutton input { margin: 0 3px 0 0; } +#plugins-check-page #plugins-check .requires-ok { + color: #868e96; } + #plugins-check-page #plugins-check .status-missing td, #plugins-check-page #plugins-check .status-downgrade td { background-color: #f7dddc; } #plugins-check-page #plugins-check .displayname .plugindir { + color: #868e96; font-size: 0.8203125rem; } #plugins-check-page #plugins-check .requires ul { @@ -12049,7 +12061,8 @@ body.h5p-embed .h5pmessages { margin: 0 3px 0 0; } #plugins-check-page #plugins-check-available-dependencies .displayname .component { - font-size: 0.8203125rem; } + font-size: 0.8203125rem; + color: #868e96; } #plugins-check-page #plugins-check-available-dependencies .info .actions > div { display: inline-block; @@ -12157,10 +12170,12 @@ body.h5p-embed .h5pmessages { list-style: none; padding: 0; margin: 0 0 1.5rem 0; } - #page-admin-search .adminpagepath li + li:before { - padding-right: 0.5rem; - padding-left: 0.5rem; - content: "/"; } + #page-admin-search .adminpagepath li { + color: #868e96; } + #page-admin-search .adminpagepath li + li:before { + padding-right: 0.5rem; + padding-left: 0.5rem; + content: "/"; } @media (min-width: 576px) { #page-admin-search .container { @@ -12597,6 +12612,8 @@ body.h5p-embed .h5pmessages { padding: 2px; font-size: 0.8em; text-align: center; } + .block .minicalendar td.weekend { + color: #868e96; } .block .minicalendar td a { width: 100%; height: 100%; @@ -12777,6 +12794,8 @@ body:not(.editing) .sitetopic ul.section { .section .activity .contentwithoutlink .dimmed .activityicon, .section .activity .activityinstance .dimmed .activityicon { opacity: .5; } + .section .activity .stealth { + color: #868e96; } .section .activity a.stealth, .section .activity a.stealth:hover { color: #6eb5f3 !important; @@ -12890,6 +12909,7 @@ body:not(.editing) .sitetopic ul.section { margin: 2px 5px 2px 5px; } .course-content .section-summary .section-summary-activities .activity-count { + color: #868e96; font-size: 0.8203125rem; margin: 3px; white-space: nowrap; @@ -12936,6 +12956,11 @@ body:not(.editing) .sitetopic ul.section { .course-content ul li.section.main:last-child { border-bottom: 0; } +.course-content ul li.section.hidden .sectionname > span, +.course-content ul li.section.hidden .content > div.summary, +.course-content ul li.section.hidden .activity .activityinstance { + color: #868e96; } + .course-content ul.topics, .course-content ul.weeks { padding: 0; } @@ -13355,10 +13380,14 @@ span.editinstructions { #course-category-listings .listitem > div .idnumber { color: #a1a1a8; margin-right: 2em; } - #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-show { - display: inline; } - #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-hide { - display: none; } + #course-category-listings .listitem[data-visible="0"] { + color: #868e96; } + #course-category-listings .listitem[data-visible="0"] > div > a { + color: #868e96; } + #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-show { + display: inline; } + #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-hide { + display: none; } #course-category-listings .listitem.highlight { background-color: #fff; } #course-category-listings .listitem.highlight > div, @@ -13469,6 +13498,7 @@ span.editinstructions { #course-category-listings .listing-pagination-totals { text-align: center; } #course-category-listings .listing-pagination-totals.dimmed { + color: #868e96; margin: 0.4rem 1rem 0.45rem; } #course-category-listings .select-a-category .notifymessage, #course-category-listings .select-a-category .alert, @@ -14176,6 +14206,9 @@ a.ygtvspacer:hover { .fitem.disabled .filemanager-container { background-color: #ebebe4; } +.fitem.disabled .fp-btn-choose { + color: #868e96; } + .fitem.disabled .filepicker-filelist .filepicker-filename { display: none; } @@ -15791,6 +15824,10 @@ input#id_externalurl { #portfolio-add-button { display: inline; } +.form-defaultinfo, +.form-label .form-shortname { + color: #868e96; } + .form-label .form-shortname { font-size: 0.703125rem; display: block; } @@ -15801,7 +15838,11 @@ input#id_externalurl { .form-inline label:not(.sr-only):not(.accesshide) + select { margin-left: 0.5rem; } +.formsettingheading .form-horizontal { + color: #868e96; } + .no-felement.fstatic { + color: #868e96; padding-top: 5px; } .no-fitem .fstaticlabel { @@ -16340,79 +16381,9 @@ select { margin-right: 0; float: none; display: inline-block; } - .path-mod-forum .nested-v2-display-mode .text-muted, .path-mod-forum .nested-v2-display-mode a.dimmed, - .path-mod-forum .nested-v2-display-mode .dimmed_text, - .path-mod-forum .nested-v2-display-mode .dimmed_text a, .dimmed_text .path-mod-forum .nested-v2-display-mode a, - .path-mod-forum .nested-v2-display-mode .usersuspended, - .path-mod-forum .nested-v2-display-mode .usersuspended a, .usersuspended .path-mod-forum .nested-v2-display-mode a, - .path-mod-forum .nested-v2-display-mode .dimmed_category, - .path-mod-forum .nested-v2-display-mode .dimmed_category a, .dimmed_category .path-mod-forum .nested-v2-display-mode a, .path-mod-forum .nested-v2-display-mode .tag_feed .media .muted a, .tag_feed .media .muted .path-mod-forum .nested-v2-display-mode a, .path-mod-forum .nested-v2-display-mode #page-admin-qtypes .disabled, #page-admin-qtypes .path-mod-forum .nested-v2-display-mode .disabled, - .path-mod-forum .nested-v2-display-mode #page-admin-qbehaviours .disabled, #page-admin-qbehaviours .path-mod-forum .nested-v2-display-mode .disabled, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .pluginname .componentname, #page-admin-plugins #plugins-control-panel .pluginname .path-mod-forum .nested-v2-display-mode .componentname, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .version .versionnumber, #page-admin-plugins #plugins-control-panel .version .path-mod-forum .nested-v2-display-mode .versionnumber, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .notes .requiredby, #page-admin-plugins #plugins-control-panel .notes .path-mod-forum .nested-v2-display-mode .requiredby, .path-mod-forum .nested-v2-display-mode #plugins-check-page .page-description, #plugins-check-page .path-mod-forum .nested-v2-display-mode .page-description, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check .requires-ok, #plugins-check-page #plugins-check .path-mod-forum .nested-v2-display-mode .requires-ok, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check .displayname .plugindir, #plugins-check-page #plugins-check .displayname .path-mod-forum .nested-v2-display-mode .plugindir, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check-available-dependencies .displayname .component, #plugins-check-page #plugins-check-available-dependencies .displayname .path-mod-forum .nested-v2-display-mode .component, .path-mod-forum .nested-v2-display-mode #page-admin-search .adminpagepath li, #page-admin-search .adminpagepath .path-mod-forum .nested-v2-display-mode li, .path-mod-forum .nested-v2-display-mode .block .minicalendar td.weekend, .block .minicalendar .path-mod-forum .nested-v2-display-mode td.weekend, .path-mod-forum .nested-v2-display-mode .section .activity .stealth, .section .activity .path-mod-forum .nested-v2-display-mode .stealth, .path-mod-forum .nested-v2-display-mode .course-content .section-summary .section-summary-activities .activity-count, .course-content .section-summary .section-summary-activities .path-mod-forum .nested-v2-display-mode .activity-count, .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .sectionname > span, .course-content ul li.section.hidden .path-mod-forum .nested-v2-display-mode .sectionname > span, - .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .content > div.summary, .course-content ul li.section.hidden .path-mod-forum .nested-v2-display-mode .content > div.summary, - .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .activity .activityinstance, .course-content ul li.section.hidden .activity .path-mod-forum .nested-v2-display-mode .activityinstance, .path-mod-forum .nested-v2-display-mode #course-category-listings .listitem[data-visible="0"], #course-category-listings .path-mod-forum .nested-v2-display-mode .listitem[data-visible="0"], .path-mod-forum .nested-v2-display-mode #course-category-listings .listitem[data-visible="0"] > div > a, #course-category-listings .path-mod-forum .nested-v2-display-mode .listitem[data-visible="0"] > div > a, .path-mod-forum .nested-v2-display-mode #course-category-listings .listing-pagination-totals.dimmed, #course-category-listings .path-mod-forum .nested-v2-display-mode .listing-pagination-totals.dimmed, .path-mod-forum .nested-v2-display-mode .fitem.disabled .fp-btn-choose, .fitem.disabled .path-mod-forum .nested-v2-display-mode .fp-btn-choose, .path-mod-forum .nested-v2-display-mode .form-defaultinfo, - .path-mod-forum .nested-v2-display-mode .form-label .form-shortname, .form-label .path-mod-forum .nested-v2-display-mode .form-shortname, .path-mod-forum .nested-v2-display-mode .formsettingheading .form-horizontal, .formsettingheading .path-mod-forum .nested-v2-display-mode .form-horizontal, .path-mod-forum .nested-v2-display-mode .no-felement.fstatic, .path-mod-forum .nested-v2-display-mode .path-backup .backup_progress .backup_stage, .path-backup .backup_progress .path-mod-forum .nested-v2-display-mode .backup_stage, + .path-mod-forum .nested-v2-display-mode .text-muted, .path-mod-forum .nested-v2-display-mode .dimmed_text, .path-mod-forum.nested-v2-display-mode .text-muted, - .path-mod-forum.nested-v2-display-mode a.dimmed, - .path-mod-forum.nested-v2-display-mode .dimmed_text, - .path-mod-forum.nested-v2-display-mode .dimmed_text a, - .dimmed_text .path-mod-forum.nested-v2-display-mode a, - .path-mod-forum.nested-v2-display-mode .usersuspended, - .path-mod-forum.nested-v2-display-mode .usersuspended a, - .usersuspended .path-mod-forum.nested-v2-display-mode a, - .path-mod-forum.nested-v2-display-mode .dimmed_category, - .path-mod-forum.nested-v2-display-mode .dimmed_category a, - .dimmed_category .path-mod-forum.nested-v2-display-mode a, - .path-mod-forum.nested-v2-display-mode .tag_feed .media .muted a, - .tag_feed .media .muted .path-mod-forum.nested-v2-display-mode a, - .path-mod-forum.nested-v2-display-mode #page-admin-qtypes .disabled, - #page-admin-qtypes .path-mod-forum.nested-v2-display-mode .disabled, - .path-mod-forum.nested-v2-display-mode #page-admin-qbehaviours .disabled, - #page-admin-qbehaviours .path-mod-forum.nested-v2-display-mode .disabled, - .path-mod-forum.nested-v2-display-mode #page-admin-plugins #plugins-control-panel .pluginname .componentname, - #page-admin-plugins #plugins-control-panel .pluginname .path-mod-forum.nested-v2-display-mode .componentname, - .path-mod-forum.nested-v2-display-mode #page-admin-plugins #plugins-control-panel .version .versionnumber, - #page-admin-plugins #plugins-control-panel .version .path-mod-forum.nested-v2-display-mode .versionnumber, - .path-mod-forum.nested-v2-display-mode #page-admin-plugins #plugins-control-panel .notes .requiredby, - #page-admin-plugins #plugins-control-panel .notes .path-mod-forum.nested-v2-display-mode .requiredby, - .path-mod-forum.nested-v2-display-mode #plugins-check-page .page-description, - #plugins-check-page .path-mod-forum.nested-v2-display-mode .page-description, - .path-mod-forum.nested-v2-display-mode #plugins-check-page #plugins-check .requires-ok, - #plugins-check-page #plugins-check .path-mod-forum.nested-v2-display-mode .requires-ok, - .path-mod-forum.nested-v2-display-mode #plugins-check-page #plugins-check .displayname .plugindir, - #plugins-check-page #plugins-check .displayname .path-mod-forum.nested-v2-display-mode .plugindir, - .path-mod-forum.nested-v2-display-mode #plugins-check-page #plugins-check-available-dependencies .displayname .component, - #plugins-check-page #plugins-check-available-dependencies .displayname .path-mod-forum.nested-v2-display-mode .component, - .path-mod-forum.nested-v2-display-mode #page-admin-search .adminpagepath li, - #page-admin-search .adminpagepath .path-mod-forum.nested-v2-display-mode li, - .path-mod-forum.nested-v2-display-mode .block .minicalendar td.weekend, - .block .minicalendar .path-mod-forum.nested-v2-display-mode td.weekend, - .path-mod-forum.nested-v2-display-mode .section .activity .stealth, - .section .activity .path-mod-forum.nested-v2-display-mode .stealth, - .path-mod-forum.nested-v2-display-mode .course-content .section-summary .section-summary-activities .activity-count, - .course-content .section-summary .section-summary-activities .path-mod-forum.nested-v2-display-mode .activity-count, - .path-mod-forum.nested-v2-display-mode .course-content ul li.section.hidden .sectionname > span, - .course-content ul li.section.hidden .path-mod-forum.nested-v2-display-mode .sectionname > span, - .path-mod-forum.nested-v2-display-mode .course-content ul li.section.hidden .content > div.summary, - .course-content ul li.section.hidden .path-mod-forum.nested-v2-display-mode .content > div.summary, - .path-mod-forum.nested-v2-display-mode .course-content ul li.section.hidden .activity .activityinstance, - .course-content ul li.section.hidden .activity .path-mod-forum.nested-v2-display-mode .activityinstance, - .path-mod-forum.nested-v2-display-mode #course-category-listings .listitem[data-visible="0"], - #course-category-listings .path-mod-forum.nested-v2-display-mode .listitem[data-visible="0"], - .path-mod-forum.nested-v2-display-mode #course-category-listings .listitem[data-visible="0"] > div > a, - #course-category-listings .path-mod-forum.nested-v2-display-mode .listitem[data-visible="0"] > div > a, - .path-mod-forum.nested-v2-display-mode #course-category-listings .listing-pagination-totals.dimmed, - #course-category-listings .path-mod-forum.nested-v2-display-mode .listing-pagination-totals.dimmed, - .path-mod-forum.nested-v2-display-mode .fitem.disabled .fp-btn-choose, - .fitem.disabled .path-mod-forum.nested-v2-display-mode .fp-btn-choose, - .path-mod-forum.nested-v2-display-mode .form-defaultinfo, - .path-mod-forum.nested-v2-display-mode .form-label .form-shortname, - .form-label .path-mod-forum.nested-v2-display-mode .form-shortname, - .path-mod-forum.nested-v2-display-mode .formsettingheading .form-horizontal, - .formsettingheading .path-mod-forum.nested-v2-display-mode .form-horizontal, - .path-mod-forum.nested-v2-display-mode .no-felement.fstatic, - .path-mod-forum.nested-v2-display-mode .path-backup .backup_progress .backup_stage, - .path-backup .backup_progress .path-mod-forum.nested-v2-display-mode .backup_stage, .path-mod-forum.nested-v2-display-mode .dimmed_text { color: #707070 !important; /* stylelint-disable-line declaration-no-important */ } @@ -17364,9 +17335,11 @@ div#dock { .path-backup .backup_progress { margin-top: 1rem; margin-bottom: 1rem; } - .path-backup .backup_progress .backup_stage.backup_stage_current { - font-weight: bold; - color: inherit; } + .path-backup .backup_progress .backup_stage { + color: #868e96; } + .path-backup .backup_progress .backup_stage.backup_stage_current { + font-weight: bold; + color: inherit; } .path-backup .backup_progress span.backup_stage.backup_stage_complete { color: inherit; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 15d12e41405..c3e13ee9644 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -9572,26 +9572,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .text-body { color: #373a3c !important; } -.text-muted, a.dimmed, -a.dimmed:link, -a.dimmed:visited, -a.dimmed_text, -a.dimmed_text:link, -a.dimmed_text:visited, -.dimmed_text, -.dimmed_text a, -.dimmed_text a:link, -.dimmed_text a:visited, -.usersuspended, -.usersuspended a, -.usersuspended a:link, -.usersuspended a:visited, -.dimmed_category, -.dimmed_category a, .tag_feed .media .muted a, #page-admin-qtypes .disabled, -#page-admin-qbehaviours .disabled, #page-admin-plugins #plugins-control-panel .pluginname .componentname, #page-admin-plugins #plugins-control-panel .version .versionnumber, #page-admin-plugins #plugins-control-panel .notes .requiredby, #plugins-check-page .page-description, #plugins-check-page #plugins-check .requires-ok, #plugins-check-page #plugins-check .displayname .plugindir, #plugins-check-page #plugins-check-available-dependencies .displayname .component, #page-admin-search .adminpagepath li, .block .minicalendar td.weekend, .section .activity .stealth, .course-content .section-summary .section-summary-activities .activity-count, .course-content ul li.section.hidden .sectionname > span, -.course-content ul li.section.hidden .content > div.summary, -.course-content ul li.section.hidden .activity .activityinstance, #course-category-listings .listitem[data-visible="0"], #course-category-listings .listitem[data-visible="0"] > div > a, #course-category-listings .listing-pagination-totals.dimmed, .fitem.disabled .fp-btn-choose, .form-defaultinfo, -.form-label .form-shortname, .formsettingheading .form-horizontal, .no-felement.fstatic, .path-backup .backup_progress .backup_stage { +.text-muted { color: #868e96 !important; } .text-black-50 { @@ -9997,6 +9978,24 @@ input[disabled] { .mdl-align { text-align: center; } +a.dimmed, +a.dimmed:link, +a.dimmed:visited, +a.dimmed_text, +a.dimmed_text:link, +a.dimmed_text:visited, +.dimmed_text, +.dimmed_text a, +.dimmed_text a:link, +.dimmed_text a:visited, +.usersuspended, +.usersuspended a, +.usersuspended a:link, +.usersuspended a:visited, +.dimmed_category, +.dimmed_category a { + color: #868e96; } + .unlist, .unlist li, .inline-list, @@ -10524,6 +10523,9 @@ img.user-image { padding-right: 10px; padding-left: 10px; } +.tag_feed .media .muted a { + color: #868e96; } + .tag_cloud { text-align: center; } @@ -12244,10 +12246,12 @@ body.h5p-embed .h5pmessages { #page-admin-plugins #plugins-control-panel .pluginname .componentname { font-size: 0.8203125rem; + color: #868e96; margin-left: 22px; } #page-admin-plugins #plugins-control-panel .version .versionnumber { - font-size: 0.8203125rem; } + font-size: 0.8203125rem; + color: #868e96; } #page-admin-plugins #plugins-control-panel .uninstall a { color: #d9534f; } @@ -12256,7 +12260,11 @@ body.h5p-embed .h5pmessages { margin-right: 3px; } #page-admin-plugins #plugins-control-panel .notes .requiredby { - font-size: 0.8203125rem; } + font-size: 0.8203125rem; + color: #868e96; } + +#plugins-check-page .page-description { + color: #868e96; } #plugins-check-page .checkforupdates .singlebutton { margin: 5px 0; @@ -12276,11 +12284,15 @@ body.h5p-embed .h5pmessages { #plugins-check-page #plugins-check-info .actions .singlebutton input { margin: 0 3px 0 0; } +#plugins-check-page #plugins-check .requires-ok { + color: #868e96; } + #plugins-check-page #plugins-check .status-missing td, #plugins-check-page #plugins-check .status-downgrade td { background-color: #f7dddc; } #plugins-check-page #plugins-check .displayname .plugindir { + color: #868e96; font-size: 0.8203125rem; } #plugins-check-page #plugins-check .requires ul { @@ -12304,7 +12316,8 @@ body.h5p-embed .h5pmessages { margin: 0 3px 0 0; } #plugins-check-page #plugins-check-available-dependencies .displayname .component { - font-size: 0.8203125rem; } + font-size: 0.8203125rem; + color: #868e96; } #plugins-check-page #plugins-check-available-dependencies .info .actions > div { display: inline-block; @@ -12413,10 +12426,12 @@ body.h5p-embed .h5pmessages { list-style: none; padding: 0; margin: 0 0 1.5rem 0; } - #page-admin-search .adminpagepath li + li:before { - padding-right: 0.5rem; - padding-left: 0.5rem; - content: "/"; } + #page-admin-search .adminpagepath li { + color: #868e96; } + #page-admin-search .adminpagepath li + li:before { + padding-right: 0.5rem; + padding-left: 0.5rem; + content: "/"; } @media (min-width: 576px) { #page-admin-search .container { @@ -12853,6 +12868,8 @@ body.h5p-embed .h5pmessages { padding: 2px; font-size: 0.8em; text-align: center; } + .block .minicalendar td.weekend { + color: #868e96; } .block .minicalendar td a { width: 100%; height: 100%; @@ -13033,6 +13050,8 @@ body:not(.editing) .sitetopic ul.section { .section .activity .contentwithoutlink .dimmed .activityicon, .section .activity .activityinstance .dimmed .activityicon { opacity: .5; } + .section .activity .stealth { + color: #868e96; } .section .activity a.stealth, .section .activity a.stealth:hover { color: #6eb5f3 !important; @@ -13146,6 +13165,7 @@ body:not(.editing) .sitetopic ul.section { margin: 2px 5px 2px 5px; } .course-content .section-summary .section-summary-activities .activity-count { + color: #868e96; font-size: 0.8203125rem; margin: 3px; white-space: nowrap; @@ -13192,6 +13212,11 @@ body:not(.editing) .sitetopic ul.section { .course-content ul li.section.main:last-child { border-bottom: 0; } +.course-content ul li.section.hidden .sectionname > span, +.course-content ul li.section.hidden .content > div.summary, +.course-content ul li.section.hidden .activity .activityinstance { + color: #868e96; } + .course-content ul.topics, .course-content ul.weeks { padding: 0; } @@ -13613,10 +13638,14 @@ span.editinstructions { #course-category-listings .listitem > div .idnumber { color: #a1a1a8; margin-right: 2em; } - #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-show { - display: inline; } - #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-hide { - display: none; } + #course-category-listings .listitem[data-visible="0"] { + color: #868e96; } + #course-category-listings .listitem[data-visible="0"] > div > a { + color: #868e96; } + #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-show { + display: inline; } + #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-hide { + display: none; } #course-category-listings .listitem.highlight { background-color: #fff; } #course-category-listings .listitem.highlight > div, @@ -13727,6 +13756,7 @@ span.editinstructions { #course-category-listings .listing-pagination-totals { text-align: center; } #course-category-listings .listing-pagination-totals.dimmed { + color: #868e96; margin: 0.4rem 1rem 0.45rem; } #course-category-listings .select-a-category .notifymessage, #course-category-listings .select-a-category .alert, @@ -14435,6 +14465,9 @@ a.ygtvspacer:hover { .fitem.disabled .filemanager-container { background-color: #ebebe4; } +.fitem.disabled .fp-btn-choose { + color: #868e96; } + .fitem.disabled .filepicker-filelist .filepicker-filename { display: none; } @@ -16058,6 +16091,10 @@ input#id_externalurl { #portfolio-add-button { display: inline; } +.form-defaultinfo, +.form-label .form-shortname { + color: #868e96; } + .form-label .form-shortname { font-size: 0.703125rem; display: block; } @@ -16068,7 +16105,11 @@ input#id_externalurl { .form-inline label:not(.sr-only):not(.accesshide) + select { margin-left: 0.5rem; } +.formsettingheading .form-horizontal { + color: #868e96; } + .no-felement.fstatic { + color: #868e96; padding-top: 5px; } .no-fitem .fstaticlabel { @@ -16609,79 +16650,9 @@ select { margin-right: 0; float: none; display: inline-block; } - .path-mod-forum .nested-v2-display-mode .text-muted, .path-mod-forum .nested-v2-display-mode a.dimmed, - .path-mod-forum .nested-v2-display-mode .dimmed_text, - .path-mod-forum .nested-v2-display-mode .dimmed_text a, .dimmed_text .path-mod-forum .nested-v2-display-mode a, - .path-mod-forum .nested-v2-display-mode .usersuspended, - .path-mod-forum .nested-v2-display-mode .usersuspended a, .usersuspended .path-mod-forum .nested-v2-display-mode a, - .path-mod-forum .nested-v2-display-mode .dimmed_category, - .path-mod-forum .nested-v2-display-mode .dimmed_category a, .dimmed_category .path-mod-forum .nested-v2-display-mode a, .path-mod-forum .nested-v2-display-mode .tag_feed .media .muted a, .tag_feed .media .muted .path-mod-forum .nested-v2-display-mode a, .path-mod-forum .nested-v2-display-mode #page-admin-qtypes .disabled, #page-admin-qtypes .path-mod-forum .nested-v2-display-mode .disabled, - .path-mod-forum .nested-v2-display-mode #page-admin-qbehaviours .disabled, #page-admin-qbehaviours .path-mod-forum .nested-v2-display-mode .disabled, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .pluginname .componentname, #page-admin-plugins #plugins-control-panel .pluginname .path-mod-forum .nested-v2-display-mode .componentname, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .version .versionnumber, #page-admin-plugins #plugins-control-panel .version .path-mod-forum .nested-v2-display-mode .versionnumber, .path-mod-forum .nested-v2-display-mode #page-admin-plugins #plugins-control-panel .notes .requiredby, #page-admin-plugins #plugins-control-panel .notes .path-mod-forum .nested-v2-display-mode .requiredby, .path-mod-forum .nested-v2-display-mode #plugins-check-page .page-description, #plugins-check-page .path-mod-forum .nested-v2-display-mode .page-description, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check .requires-ok, #plugins-check-page #plugins-check .path-mod-forum .nested-v2-display-mode .requires-ok, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check .displayname .plugindir, #plugins-check-page #plugins-check .displayname .path-mod-forum .nested-v2-display-mode .plugindir, .path-mod-forum .nested-v2-display-mode #plugins-check-page #plugins-check-available-dependencies .displayname .component, #plugins-check-page #plugins-check-available-dependencies .displayname .path-mod-forum .nested-v2-display-mode .component, .path-mod-forum .nested-v2-display-mode #page-admin-search .adminpagepath li, #page-admin-search .adminpagepath .path-mod-forum .nested-v2-display-mode li, .path-mod-forum .nested-v2-display-mode .block .minicalendar td.weekend, .block .minicalendar .path-mod-forum .nested-v2-display-mode td.weekend, .path-mod-forum .nested-v2-display-mode .section .activity .stealth, .section .activity .path-mod-forum .nested-v2-display-mode .stealth, .path-mod-forum .nested-v2-display-mode .course-content .section-summary .section-summary-activities .activity-count, .course-content .section-summary .section-summary-activities .path-mod-forum .nested-v2-display-mode .activity-count, .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .sectionname > span, .course-content ul li.section.hidden .path-mod-forum .nested-v2-display-mode .sectionname > span, - .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .content > div.summary, .course-content ul li.section.hidden .path-mod-forum .nested-v2-display-mode .content > div.summary, - .path-mod-forum .nested-v2-display-mode .course-content ul li.section.hidden .activity .activityinstance, .course-content ul li.section.hidden .activity .path-mod-forum .nested-v2-display-mode .activityinstance, .path-mod-forum .nested-v2-display-mode #course-category-listings .listitem[data-visible="0"], #course-category-listings .path-mod-forum .nested-v2-display-mode .listitem[data-visible="0"], .path-mod-forum .nested-v2-display-mode #course-category-listings .listitem[data-visible="0"] > div > a, #course-category-listings .path-mod-forum .nested-v2-display-mode .listitem[data-visible="0"] > div > a, .path-mod-forum .nested-v2-display-mode #course-category-listings .listing-pagination-totals.dimmed, #course-category-listings .path-mod-forum .nested-v2-display-mode .listing-pagination-totals.dimmed, .path-mod-forum .nested-v2-display-mode .fitem.disabled .fp-btn-choose, .fitem.disabled .path-mod-forum .nested-v2-display-mode .fp-btn-choose, .path-mod-forum .nested-v2-display-mode .form-defaultinfo, - .path-mod-forum .nested-v2-display-mode .form-label .form-shortname, .form-label .path-mod-forum .nested-v2-display-mode .form-shortname, .path-mod-forum .nested-v2-display-mode .formsettingheading .form-horizontal, .formsettingheading .path-mod-forum .nested-v2-display-mode .form-horizontal, .path-mod-forum .nested-v2-display-mode .no-felement.fstatic, .path-mod-forum .nested-v2-display-mode .path-backup .backup_progress .backup_stage, .path-backup .backup_progress .path-mod-forum .nested-v2-display-mode .backup_stage, + .path-mod-forum .nested-v2-display-mode .text-muted, .path-mod-forum .nested-v2-display-mode .dimmed_text, .path-mod-forum.nested-v2-display-mode .text-muted, - .path-mod-forum.nested-v2-display-mode a.dimmed, - .path-mod-forum.nested-v2-display-mode .dimmed_text, - .path-mod-forum.nested-v2-display-mode .dimmed_text a, - .dimmed_text .path-mod-forum.nested-v2-display-mode a, - .path-mod-forum.nested-v2-display-mode .usersuspended, - .path-mod-forum.nested-v2-display-mode .usersuspended a, - .usersuspended .path-mod-forum.nested-v2-display-mode a, - .path-mod-forum.nested-v2-display-mode .dimmed_category, - .path-mod-forum.nested-v2-display-mode .dimmed_category a, - .dimmed_category .path-mod-forum.nested-v2-display-mode a, - .path-mod-forum.nested-v2-display-mode .tag_feed .media .muted a, - .tag_feed .media .muted .path-mod-forum.nested-v2-display-mode a, - .path-mod-forum.nested-v2-display-mode #page-admin-qtypes .disabled, - #page-admin-qtypes .path-mod-forum.nested-v2-display-mode .disabled, - .path-mod-forum.nested-v2-display-mode #page-admin-qbehaviours .disabled, - #page-admin-qbehaviours .path-mod-forum.nested-v2-display-mode .disabled, - .path-mod-forum.nested-v2-display-mode #page-admin-plugins #plugins-control-panel .pluginname .componentname, - #page-admin-plugins #plugins-control-panel .pluginname .path-mod-forum.nested-v2-display-mode .componentname, - .path-mod-forum.nested-v2-display-mode #page-admin-plugins #plugins-control-panel .version .versionnumber, - #page-admin-plugins #plugins-control-panel .version .path-mod-forum.nested-v2-display-mode .versionnumber, - .path-mod-forum.nested-v2-display-mode #page-admin-plugins #plugins-control-panel .notes .requiredby, - #page-admin-plugins #plugins-control-panel .notes .path-mod-forum.nested-v2-display-mode .requiredby, - .path-mod-forum.nested-v2-display-mode #plugins-check-page .page-description, - #plugins-check-page .path-mod-forum.nested-v2-display-mode .page-description, - .path-mod-forum.nested-v2-display-mode #plugins-check-page #plugins-check .requires-ok, - #plugins-check-page #plugins-check .path-mod-forum.nested-v2-display-mode .requires-ok, - .path-mod-forum.nested-v2-display-mode #plugins-check-page #plugins-check .displayname .plugindir, - #plugins-check-page #plugins-check .displayname .path-mod-forum.nested-v2-display-mode .plugindir, - .path-mod-forum.nested-v2-display-mode #plugins-check-page #plugins-check-available-dependencies .displayname .component, - #plugins-check-page #plugins-check-available-dependencies .displayname .path-mod-forum.nested-v2-display-mode .component, - .path-mod-forum.nested-v2-display-mode #page-admin-search .adminpagepath li, - #page-admin-search .adminpagepath .path-mod-forum.nested-v2-display-mode li, - .path-mod-forum.nested-v2-display-mode .block .minicalendar td.weekend, - .block .minicalendar .path-mod-forum.nested-v2-display-mode td.weekend, - .path-mod-forum.nested-v2-display-mode .section .activity .stealth, - .section .activity .path-mod-forum.nested-v2-display-mode .stealth, - .path-mod-forum.nested-v2-display-mode .course-content .section-summary .section-summary-activities .activity-count, - .course-content .section-summary .section-summary-activities .path-mod-forum.nested-v2-display-mode .activity-count, - .path-mod-forum.nested-v2-display-mode .course-content ul li.section.hidden .sectionname > span, - .course-content ul li.section.hidden .path-mod-forum.nested-v2-display-mode .sectionname > span, - .path-mod-forum.nested-v2-display-mode .course-content ul li.section.hidden .content > div.summary, - .course-content ul li.section.hidden .path-mod-forum.nested-v2-display-mode .content > div.summary, - .path-mod-forum.nested-v2-display-mode .course-content ul li.section.hidden .activity .activityinstance, - .course-content ul li.section.hidden .activity .path-mod-forum.nested-v2-display-mode .activityinstance, - .path-mod-forum.nested-v2-display-mode #course-category-listings .listitem[data-visible="0"], - #course-category-listings .path-mod-forum.nested-v2-display-mode .listitem[data-visible="0"], - .path-mod-forum.nested-v2-display-mode #course-category-listings .listitem[data-visible="0"] > div > a, - #course-category-listings .path-mod-forum.nested-v2-display-mode .listitem[data-visible="0"] > div > a, - .path-mod-forum.nested-v2-display-mode #course-category-listings .listing-pagination-totals.dimmed, - #course-category-listings .path-mod-forum.nested-v2-display-mode .listing-pagination-totals.dimmed, - .path-mod-forum.nested-v2-display-mode .fitem.disabled .fp-btn-choose, - .fitem.disabled .path-mod-forum.nested-v2-display-mode .fp-btn-choose, - .path-mod-forum.nested-v2-display-mode .form-defaultinfo, - .path-mod-forum.nested-v2-display-mode .form-label .form-shortname, - .form-label .path-mod-forum.nested-v2-display-mode .form-shortname, - .path-mod-forum.nested-v2-display-mode .formsettingheading .form-horizontal, - .formsettingheading .path-mod-forum.nested-v2-display-mode .form-horizontal, - .path-mod-forum.nested-v2-display-mode .no-felement.fstatic, - .path-mod-forum.nested-v2-display-mode .path-backup .backup_progress .backup_stage, - .path-backup .backup_progress .path-mod-forum.nested-v2-display-mode .backup_stage, .path-mod-forum.nested-v2-display-mode .dimmed_text { color: #707070 !important; /* stylelint-disable-line declaration-no-important */ } @@ -17637,9 +17608,11 @@ div#dock { .path-backup .backup_progress { margin-top: 1rem; margin-bottom: 1rem; } - .path-backup .backup_progress .backup_stage.backup_stage_current { - font-weight: bold; - color: inherit; } + .path-backup .backup_progress .backup_stage { + color: #868e96; } + .path-backup .backup_progress .backup_stage.backup_stage_current { + font-weight: bold; + color: inherit; } .path-backup .backup_progress span.backup_stage.backup_stage_complete { color: inherit; } From 098687e55def98d4b6cb2166c0d50fc9c751ab97 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 30 Oct 2019 14:22:52 +0100 Subject: [PATCH 04/23] MDL-66999 theme_boost: @extend remove .small Remove specific CSS and use bs4 classes in mustache instead --- admin/templates/settings_search_results.mustache | 2 +- theme/boost/scss/moodle/admin.scss | 2 -- theme/boost/style/moodle.css | 13 +++++-------- theme/classic/style/moodle.css | 13 +++++-------- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/admin/templates/settings_search_results.mustache b/admin/templates/settings_search_results.mustache index 66531548b66..2a766599f93 100644 --- a/admin/templates/settings_search_results.mustache +++ b/admin/templates/settings_search_results.mustache @@ -47,7 +47,7 @@

{{{title}}}

    {{#path}} -
  • {{.}}
    • +
  • {{.}}
    • {{/path}}
diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss index 37b85b53a9e..a2bd27b0af6 100644 --- a/theme/boost/scss/moodle/admin.scss +++ b/theme/boost/scss/moodle/admin.scss @@ -746,8 +746,6 @@ padding: 0; margin: 0 0 1.5rem 0; li { - color: $text-muted; - @extend .small; + li:before { padding-right: 0.5rem; padding-left: 0.5rem; diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 0b3828367ec..7b02422f8ca 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -2685,8 +2685,7 @@ hr { border-top: 1px solid rgba(0, 0, 0, 0.1); } small, -.small, -#page-admin-search .adminpagepath li { +.small { font-size: 80%; font-weight: 400; } @@ -12170,12 +12169,10 @@ body.h5p-embed .h5pmessages { list-style: none; padding: 0; margin: 0 0 1.5rem 0; } - #page-admin-search .adminpagepath li { - color: #868e96; } - #page-admin-search .adminpagepath li + li:before { - padding-right: 0.5rem; - padding-left: 0.5rem; - content: "/"; } + #page-admin-search .adminpagepath li + li:before { + padding-right: 0.5rem; + padding-left: 0.5rem; + content: "/"; } @media (min-width: 576px) { #page-admin-search .container { diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index c3e13ee9644..341ea1a2f77 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -2685,8 +2685,7 @@ hr { border-top: 1px solid rgba(0, 0, 0, 0.1); } small, -.small, -#page-admin-search .adminpagepath li { +.small { font-size: 80%; font-weight: 400; } @@ -12426,12 +12425,10 @@ body.h5p-embed .h5pmessages { list-style: none; padding: 0; margin: 0 0 1.5rem 0; } - #page-admin-search .adminpagepath li { - color: #868e96; } - #page-admin-search .adminpagepath li + li:before { - padding-right: 0.5rem; - padding-left: 0.5rem; - content: "/"; } + #page-admin-search .adminpagepath li + li:before { + padding-right: 0.5rem; + padding-left: 0.5rem; + content: "/"; } @media (min-width: 576px) { #page-admin-search .container { From 37949c189b4fa39fdcd52a346a29623a33d8a6b4 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 30 Oct 2019 14:40:36 +0100 Subject: [PATCH 05/23] 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"], From 579ca95f1d5c9a502f7923bf9a0ea9241500572b Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 30 Oct 2019 15:00:35 +0100 Subject: [PATCH 06/23] 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"], From 6ac38de8d0bbe9c8f8465e11dfe40c57b06998b7 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Thu, 31 Oct 2019 15:35:03 +0100 Subject: [PATCH 07/23] MDL-66999 theme_boost: @extend .table-warning Use .table-warning classes directly instead of using custom styles --- .../override_permissions_table_advanced.php | 4 +-- theme/boost/scss/moodle/admin.scss | 4 --- theme/boost/style/moodle.css | 35 ++++--------------- theme/classic/style/moodle.css | 35 ++++--------------- 4 files changed, 16 insertions(+), 62 deletions(-) diff --git a/admin/roles/classes/override_permissions_table_advanced.php b/admin/roles/classes/override_permissions_table_advanced.php index 1a119d82130..34407581883 100644 --- a/admin/roles/classes/override_permissions_table_advanced.php +++ b/admin/roles/classes/override_permissions_table_advanced.php @@ -66,9 +66,9 @@ class core_role_override_permissions_table_advanced extends core_role_capability $rowattributes = parent::get_row_attributes($capability); if ($this->permissions[$capability->name] !== 0) { if (empty($rowattributes['class'])) { - $rowattributes['class'] = "overriddenpermission"; + $rowattributes['class'] = "overriddenpermission table-warning"; } else { - $rowattributes['class'] .= " overriddenpermission"; + $rowattributes['class'] .= " overriddenpermission table-warning"; } } return $rowattributes; diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss index 2b505b38720..ad6f77d89cf 100644 --- a/theme/boost/scss/moodle/admin.scss +++ b/theme/boost/scss/moodle/admin.scss @@ -706,10 +706,6 @@ z-index: 0; } -#overriderolestable .overriddenpermission { - @extend .table-warning; -} - #page-admin-search { .adminpagetitle { margin-bottom: 0; diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 57ed89e987b..29457c81549 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -3512,25 +3512,20 @@ table#listdirectories td { table#permissions .table-info:hover > th { background-color: #bce5f2; } -.table-warning, #overriderolestable .overriddenpermission, +.table-warning, .table-warning > th, -#overriderolestable .overriddenpermission > th, -.table-warning > td, -#overriderolestable .overriddenpermission > td { +.table-warning > td { background-color: #fbe8cd; } -.table-warning th, #overriderolestable .overriddenpermission th, +.table-warning th, .table-warning td, -#overriderolestable .overriddenpermission td, .table-warning thead th, -#overriderolestable .overriddenpermission thead th, -.table-warning tbody + tbody, -#overriderolestable .overriddenpermission tbody + tbody { +.table-warning tbody + tbody { border-color: #f7d4a3; } -.table-hover .table-warning:hover, table.grading-report .table-warning:hover, .forumheaderlist .table-warning:hover, .generaltable .table-warning:hover, table.flexible .table-warning:hover, .category_subcategories .table-warning:hover, table#modules .table-warning:hover, table#permissions .table-warning:hover, .table-hover #overriderolestable .overriddenpermission:hover, #overriderolestable .table-hover .overriddenpermission:hover, table.grading-report #overriderolestable .overriddenpermission:hover, #overriderolestable table.grading-report .overriddenpermission:hover, .forumheaderlist #overriderolestable .overriddenpermission:hover, #overriderolestable .forumheaderlist .overriddenpermission:hover, .generaltable #overriderolestable .overriddenpermission:hover, #overriderolestable .generaltable .overriddenpermission:hover, table.flexible #overriderolestable .overriddenpermission:hover, #overriderolestable table.flexible .overriddenpermission:hover, .category_subcategories #overriderolestable .overriddenpermission:hover, #overriderolestable .category_subcategories .overriddenpermission:hover, table#modules #overriderolestable .overriddenpermission:hover, #overriderolestable table#modules .overriddenpermission:hover, table#permissions #overriderolestable .overriddenpermission:hover, #overriderolestable table#permissions .overriddenpermission:hover { +.table-hover .table-warning:hover, table.grading-report .table-warning:hover, .forumheaderlist .table-warning:hover, .generaltable .table-warning:hover, table.flexible .table-warning:hover, .category_subcategories .table-warning:hover, table#modules .table-warning:hover, table#permissions .table-warning:hover { background-color: #f9ddb5; } - .table-hover .table-warning:hover > td, table.grading-report .table-warning:hover > td, .forumheaderlist .table-warning:hover > td, .generaltable .table-warning:hover > td, table.flexible .table-warning:hover > td, .category_subcategories .table-warning:hover > td, table#modules .table-warning:hover > td, table#permissions .table-warning:hover > td, .table-hover #overriderolestable .overriddenpermission:hover > td, #overriderolestable .table-hover .overriddenpermission:hover > td, table.grading-report #overriderolestable .overriddenpermission:hover > td, #overriderolestable table.grading-report .overriddenpermission:hover > td, .forumheaderlist #overriderolestable .overriddenpermission:hover > td, #overriderolestable .forumheaderlist .overriddenpermission:hover > td, .generaltable #overriderolestable .overriddenpermission:hover > td, #overriderolestable .generaltable .overriddenpermission:hover > td, table.flexible #overriderolestable .overriddenpermission:hover > td, #overriderolestable table.flexible .overriddenpermission:hover > td, .category_subcategories #overriderolestable .overriddenpermission:hover > td, #overriderolestable .category_subcategories .overriddenpermission:hover > td, table#modules #overriderolestable .overriddenpermission:hover > td, #overriderolestable table#modules .overriddenpermission:hover > td, table#permissions #overriderolestable .overriddenpermission:hover > td, #overriderolestable table#permissions .overriddenpermission:hover > td, + .table-hover .table-warning:hover > td, table.grading-report .table-warning:hover > td, .forumheaderlist .table-warning:hover > td, .generaltable .table-warning:hover > td, table.flexible .table-warning:hover > td, .category_subcategories .table-warning:hover > td, table#modules .table-warning:hover > td, table#permissions .table-warning:hover > td, .table-hover .table-warning:hover > th, table.grading-report .table-warning:hover > th, .forumheaderlist .table-warning:hover > th, @@ -3538,23 +3533,7 @@ table#listdirectories td { table.flexible .table-warning:hover > th, .category_subcategories .table-warning:hover > th, table#modules .table-warning:hover > th, - table#permissions .table-warning:hover > th, - .table-hover #overriderolestable .overriddenpermission:hover > th, - #overriderolestable .table-hover .overriddenpermission:hover > th, - table.grading-report #overriderolestable .overriddenpermission:hover > th, - #overriderolestable table.grading-report .overriddenpermission:hover > th, - .forumheaderlist #overriderolestable .overriddenpermission:hover > th, - #overriderolestable .forumheaderlist .overriddenpermission:hover > th, - .generaltable #overriderolestable .overriddenpermission:hover > th, - #overriderolestable .generaltable .overriddenpermission:hover > th, - table.flexible #overriderolestable .overriddenpermission:hover > th, - #overriderolestable table.flexible .overriddenpermission:hover > th, - .category_subcategories #overriderolestable .overriddenpermission:hover > th, - #overriderolestable .category_subcategories .overriddenpermission:hover > th, - table#modules #overriderolestable .overriddenpermission:hover > th, - #overriderolestable table#modules .overriddenpermission:hover > th, - table#permissions #overriderolestable .overriddenpermission:hover > th, - #overriderolestable table#permissions .overriddenpermission:hover > th { + table#permissions .table-warning:hover > th { background-color: #f9ddb5; } .table-danger, diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 15a0e986ef2..f7454f6cde4 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -3514,25 +3514,20 @@ table#listdirectories td { table#permissions .table-info:hover > th { background-color: #bce5f2; } -.table-warning, #overriderolestable .overriddenpermission, +.table-warning, .table-warning > th, -#overriderolestable .overriddenpermission > th, -.table-warning > td, -#overriderolestable .overriddenpermission > td { +.table-warning > td { background-color: #fbe8cd; } -.table-warning th, #overriderolestable .overriddenpermission th, +.table-warning th, .table-warning td, -#overriderolestable .overriddenpermission td, .table-warning thead th, -#overriderolestable .overriddenpermission thead th, -.table-warning tbody + tbody, -#overriderolestable .overriddenpermission tbody + tbody { +.table-warning tbody + tbody { border-color: #f7d4a3; } -.table-hover .table-warning:hover, table.grading-report .table-warning:hover, .forumheaderlist .table-warning:hover, .generaltable .table-warning:hover, table.flexible .table-warning:hover, .category_subcategories .table-warning:hover, table#modules .table-warning:hover, table#permissions .table-warning:hover, .table-hover #overriderolestable .overriddenpermission:hover, #overriderolestable .table-hover .overriddenpermission:hover, table.grading-report #overriderolestable .overriddenpermission:hover, #overriderolestable table.grading-report .overriddenpermission:hover, .forumheaderlist #overriderolestable .overriddenpermission:hover, #overriderolestable .forumheaderlist .overriddenpermission:hover, .generaltable #overriderolestable .overriddenpermission:hover, #overriderolestable .generaltable .overriddenpermission:hover, table.flexible #overriderolestable .overriddenpermission:hover, #overriderolestable table.flexible .overriddenpermission:hover, .category_subcategories #overriderolestable .overriddenpermission:hover, #overriderolestable .category_subcategories .overriddenpermission:hover, table#modules #overriderolestable .overriddenpermission:hover, #overriderolestable table#modules .overriddenpermission:hover, table#permissions #overriderolestable .overriddenpermission:hover, #overriderolestable table#permissions .overriddenpermission:hover { +.table-hover .table-warning:hover, table.grading-report .table-warning:hover, .forumheaderlist .table-warning:hover, .generaltable .table-warning:hover, table.flexible .table-warning:hover, .category_subcategories .table-warning:hover, table#modules .table-warning:hover, table#permissions .table-warning:hover { background-color: #f9ddb5; } - .table-hover .table-warning:hover > td, table.grading-report .table-warning:hover > td, .forumheaderlist .table-warning:hover > td, .generaltable .table-warning:hover > td, table.flexible .table-warning:hover > td, .category_subcategories .table-warning:hover > td, table#modules .table-warning:hover > td, table#permissions .table-warning:hover > td, .table-hover #overriderolestable .overriddenpermission:hover > td, #overriderolestable .table-hover .overriddenpermission:hover > td, table.grading-report #overriderolestable .overriddenpermission:hover > td, #overriderolestable table.grading-report .overriddenpermission:hover > td, .forumheaderlist #overriderolestable .overriddenpermission:hover > td, #overriderolestable .forumheaderlist .overriddenpermission:hover > td, .generaltable #overriderolestable .overriddenpermission:hover > td, #overriderolestable .generaltable .overriddenpermission:hover > td, table.flexible #overriderolestable .overriddenpermission:hover > td, #overriderolestable table.flexible .overriddenpermission:hover > td, .category_subcategories #overriderolestable .overriddenpermission:hover > td, #overriderolestable .category_subcategories .overriddenpermission:hover > td, table#modules #overriderolestable .overriddenpermission:hover > td, #overriderolestable table#modules .overriddenpermission:hover > td, table#permissions #overriderolestable .overriddenpermission:hover > td, #overriderolestable table#permissions .overriddenpermission:hover > td, + .table-hover .table-warning:hover > td, table.grading-report .table-warning:hover > td, .forumheaderlist .table-warning:hover > td, .generaltable .table-warning:hover > td, table.flexible .table-warning:hover > td, .category_subcategories .table-warning:hover > td, table#modules .table-warning:hover > td, table#permissions .table-warning:hover > td, .table-hover .table-warning:hover > th, table.grading-report .table-warning:hover > th, .forumheaderlist .table-warning:hover > th, @@ -3540,23 +3535,7 @@ table#listdirectories td { table.flexible .table-warning:hover > th, .category_subcategories .table-warning:hover > th, table#modules .table-warning:hover > th, - table#permissions .table-warning:hover > th, - .table-hover #overriderolestable .overriddenpermission:hover > th, - #overriderolestable .table-hover .overriddenpermission:hover > th, - table.grading-report #overriderolestable .overriddenpermission:hover > th, - #overriderolestable table.grading-report .overriddenpermission:hover > th, - .forumheaderlist #overriderolestable .overriddenpermission:hover > th, - #overriderolestable .forumheaderlist .overriddenpermission:hover > th, - .generaltable #overriderolestable .overriddenpermission:hover > th, - #overriderolestable .generaltable .overriddenpermission:hover > th, - table.flexible #overriderolestable .overriddenpermission:hover > th, - #overriderolestable table.flexible .overriddenpermission:hover > th, - .category_subcategories #overriderolestable .overriddenpermission:hover > th, - #overriderolestable .category_subcategories .overriddenpermission:hover > th, - table#modules #overriderolestable .overriddenpermission:hover > th, - #overriderolestable table#modules .overriddenpermission:hover > th, - table#permissions #overriderolestable .overriddenpermission:hover > th, - #overriderolestable table#permissions .overriddenpermission:hover > th { + table#permissions .table-warning:hover > th { background-color: #f9ddb5; } .table-danger, From 9396731e941cc165715ac6fbce8fa36d191a540b Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Mon, 4 Nov 2019 16:05:55 +0100 Subject: [PATCH 08/23] MDL-66999 theme_boost: @extend replace .col-xs-* Remove legacy col-xs-* classes. They are changed in upstream Bootstrap 4 stable with just col-*. --- .../templates/component_status.mustache | 10 ++--- calendar/templates/event_details.mustache | 40 +++++++++---------- course/templates/activityinstance.mustache | 4 +- .../templates/bulkactivitycompletion.mustache | 4 +- .../defaultactivitycompletion.mustache | 8 ++-- .../moodle-atto_recordrtc-button-debug.js | 2 +- .../moodle-atto_recordrtc-button-min.js | 2 +- .../moodle-atto_recordrtc-button.js | 2 +- .../recordrtc/yui/src/button/js/button.js | 2 +- ...otification_preferences_component.mustache | 4 +- ...references_component_notification.mustache | 4 +- report/insights/templates/insight.mustache | 6 +-- .../templates/insight_details.mustache | 6 +-- theme/boost/scss/moodle/bs4alphacompat.scss | 7 ---- theme/boost/style/moodle.css | 26 ++++++------ theme/classic/style/moodle.css | 26 ++++++------ 16 files changed, 73 insertions(+), 80 deletions(-) diff --git a/admin/tool/dataprivacy/templates/component_status.mustache b/admin/tool/dataprivacy/templates/component_status.mustache index 9a1c6adbd19..8d2bf1bf26c 100644 --- a/admin/tool/dataprivacy/templates/component_status.mustache +++ b/admin/tool/dataprivacy/templates/component_status.mustache @@ -75,7 +75,7 @@
-
+
{{#link}} {{name}} {{/link}} @@ -84,13 +84,13 @@ {{/link}}
{{type}}
-
{{summary}}
+
{{summary}}
{{#fields}}
-
{{field_name}}
-
{{field_summary}}
+
{{field_name}}
+
{{field_summary}}
{{/fields}}
@@ -100,7 +100,7 @@
-
+
{{nullprovider}}
diff --git a/calendar/templates/event_details.mustache b/calendar/templates/event_details.mustache index 1a1516fef7d..9f92043ec41 100644 --- a/calendar/templates/event_details.mustache +++ b/calendar/templates/event_details.mustache @@ -56,60 +56,60 @@ } }}
-
{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}
-
{{{formattedtime}}}
+
{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}
+
{{{formattedtime}}}
{{#normalisedeventtypetext}}
-
{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}
-
{{normalisedeventtypetext}}
+
{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}
+
{{normalisedeventtypetext}}
{{/normalisedeventtypetext}} {{#description}}
-
{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}
-
{{{.}}}
+
{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}
+
{{{.}}}
{{/description}} {{#location}}
-
{{#pix}} i/location, core, {{#str}} location {{/str}} {{/pix}}
-
{{{.}}}
+
{{#pix}} i/location, core, {{#str}} location {{/str}} {{/pix}}
+
{{{.}}}
{{/location}} {{#isactionevent}}
-
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
-
{{{course.fullname}}}
+
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
+
{{{course.fullname}}}
{{/isactionevent}} {{#iscategoryevent}}
-
{{#pix}} i/categoryevent, core, {{#str}} category {{/str}} {{/pix}}
-
{{{category.nestedname}}}
+
{{#pix}} i/categoryevent, core, {{#str}} category {{/str}} {{/pix}}
+
{{{category.nestedname}}}
{{/iscategoryevent}} {{#iscourseevent}}
-
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
-
{{{course.fullname}}}
+
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
+
{{{course.fullname}}}
{{/iscourseevent}} {{#groupname}}
-
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
-
{{{course.fullname}}}
+
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
+
{{{course.fullname}}}
-
{{#pix}} i/groupevent, core, {{#str}} group {{/str}} {{/pix}}
-
{{{groupname}}}
+
{{#pix}} i/groupevent, core, {{#str}} group {{/str}} {{/pix}}
+
{{{groupname}}}
{{/groupname}} {{#subscription}} {{#displayeventsource}}
-
{{#pix}} i/rss, core, {{#str}} eventsource, core_calendar {{/str}} {{/pix}}
-
+
{{#pix}} i/rss, core, {{#str}} eventsource, core_calendar {{/str}} {{/pix}}
+
{{#subscriptionurl}}

{{#str}}subscriptionsource, core_calendar, {{{subscriptionname}}}{{/str}}

{{/subscriptionurl}} diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache index 906e6dc0421..3b51f670335 100644 --- a/course/templates/activityinstance.mustache +++ b/course/templates/activityinstance.mustache @@ -34,7 +34,7 @@ }} {{#activities}}
-
+
{{#canmanage}} @@ -47,7 +47,7 @@
-
+
{{#completionstatus.icon}} {{{completionstatus.icon}}} diff --git a/course/templates/bulkactivitycompletion.mustache b/course/templates/bulkactivitycompletion.mustache index 39c010b1efa..4a2802617bf 100644 --- a/course/templates/bulkactivitycompletion.mustache +++ b/course/templates/bulkactivitycompletion.mustache @@ -49,11 +49,11 @@
-
+
-
+
{{{helpicon}}}
diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache index 6831a0b9df7..dd2b39f5194 100644 --- a/course/templates/defaultactivitycompletion.mustache +++ b/course/templates/defaultactivitycompletion.mustache @@ -46,11 +46,11 @@
-
+
-
+
{{{helpicon}}}
@@ -61,13 +61,13 @@ {{#canmanage}}
-
+
{{{formattedname}}}
-
+
{{#completionstatus.icon}} {{{completionstatus.icon}}} diff --git a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js index 213b2f2890b..3f62f9d4e64 100644 --- a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js +++ b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js @@ -217,7 +217,7 @@ Y.namespace('M.atto_recordrtc').Button = Y.Base.create('button', Y.M.editor_atto _createContent: function(type) { var isAudio = (type === 'audio'), bsRow = 'row', - bsCol = 'col-xs-', + bsCol = 'col-', bsAlDang = 'alert-danger', bsSsBtn = 'btn btn-lg btn-outline-danger btn-block'; diff --git a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js index c5a0167d723..ba20c6a270a 100644 --- a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js +++ b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_recordrtc-button",function(e,t){var n="atto_recordrtc",r='
{{insecurealert_title}} {{insecurealert}}
{{#if isAudio}}
{{else}}
{{/if}}
';e.namespace("M.atto_recordrtc").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_lang:"en",initializer:function(){if(this.get("host").canShowFilepicker("media")){var e=this.get("allowedtypes"),t=!1;if(e==="both"||e==="audio")this._addButton("audio",this._audio),t=!0;if(e==="both"||e==="video")this._addButton("video",this._video),t=!0;if(!t)return;var n=this.getDialogue({width:1e3,focusAfterHide:null});n.after("visibleChange",function(){var e=!n.get("visible"),t=M.atto_recordrtc.commonmodule;e&&(window.clearInterval(t.countdownTicker),t.mediaRecorder&&t.mediaRecorder.state!=="inactive"&&t.mediaRecorder.stop(),t.stream&&t.stream.getTracks().forEach(function(e){e.readyState!=="ended"&&e.stop()}))}),n.on("click",function(){this.centered()}),window.require(["core/adapter"],function(e){window.adapter=e})}},_addButton:function(e,t){this.addButton({buttonName:e,icon:this.get(e+"rtcicon"),iconComponent:n,callback:t,title:e+"rtc",tags:e+"rtc",tagMatchRequiresAll:!1})},_audio:function(){var e=this.getDialogue();e.set("headerContent",M.util.get_string("audiortc","atto_recordrtc")),e.set("bodyContent",this._createContent("audio")),e.show(),M.atto_recordrtc.audiomodule.init(this)},_video:function(){var e=this.getDialogue();e.set("headerContent",M.util.get_string("videortc","atto_recordrtc")),e.set("bodyContent",this._createContent("video")),e.show(),M.atto_recordrtc.videomodule.init(this)},_createContent:function(t){var i=t==="audio",s="row",o="col-xs-",u="alert-danger",a="btn btn-lg btn-outline-danger btn-block",f=e.Handlebars.compile(r)({PLUGINNAME:n,isAudio:i,bs_row:s,bs_col:o,bs_al_dang:u,bs_ss_btn:a,insecurealert_title:M.util.get_string("insecurealert_title","atto_recordrtc"),insecurealert:M.util.get_string("insecurealert","atto_recordrtc"),startrecording:M.util.get_string("startrecording","atto_recordrtc"),attachrecording:M.util.get_string("attachrecording","atto_recordrtc")});return f},closeDialogue:function(e){e.getDialogue().hide(),e.editor.focus()},setLink:function(e,t){e.getDialogue().hide(),e.editor.focus(),e.get("host").insertContentAtFocusPoint(t),e.markUpdated()}},{ATTRS:{contextid:{value:null},sesskey:{value:null},allowedtypes:{value:null},audiobitrate:{value:null},videobitrate:{value:null},timelimit:{value:null},audiortcicon:{value:null},videortcicon:{value:null},maxrecsize:{value:null}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin","moodle-atto_recordrtc-recording"]}); +YUI.add("moodle-atto_recordrtc-button",function(e,t){var n="atto_recordrtc",r='
{{insecurealert_title}} {{insecurealert}}
{{#if isAudio}}
{{else}}
{{/if}}
';e.namespace("M.atto_recordrtc").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_lang:"en",initializer:function(){if(this.get("host").canShowFilepicker("media")){var e=this.get("allowedtypes"),t=!1;if(e==="both"||e==="audio")this._addButton("audio",this._audio),t=!0;if(e==="both"||e==="video")this._addButton("video",this._video),t=!0;if(!t)return;var n=this.getDialogue({width:1e3,focusAfterHide:null});n.after("visibleChange",function(){var e=!n.get("visible"),t=M.atto_recordrtc.commonmodule;e&&(window.clearInterval(t.countdownTicker),t.mediaRecorder&&t.mediaRecorder.state!=="inactive"&&t.mediaRecorder.stop(),t.stream&&t.stream.getTracks().forEach(function(e){e.readyState!=="ended"&&e.stop()}))}),n.on("click",function(){this.centered()}),window.require(["core/adapter"],function(e){window.adapter=e})}},_addButton:function(e,t){this.addButton({buttonName:e,icon:this.get(e+"rtcicon"),iconComponent:n,callback:t,title:e+"rtc",tags:e+"rtc",tagMatchRequiresAll:!1})},_audio:function(){var e=this.getDialogue();e.set("headerContent",M.util.get_string("audiortc","atto_recordrtc")),e.set("bodyContent",this._createContent("audio")),e.show(),M.atto_recordrtc.audiomodule.init(this)},_video:function(){var e=this.getDialogue();e.set("headerContent",M.util.get_string("videortc","atto_recordrtc")),e.set("bodyContent",this._createContent("video")),e.show(),M.atto_recordrtc.videomodule.init(this)},_createContent:function(t){var i=t==="audio",s="row",o="col-",u="alert-danger",a="btn btn-lg btn-outline-danger btn-block",f=e.Handlebars.compile(r)({PLUGINNAME:n,isAudio:i,bs_row:s,bs_col:o,bs_al_dang:u,bs_ss_btn:a,insecurealert_title:M.util.get_string("insecurealert_title","atto_recordrtc"),insecurealert:M.util.get_string("insecurealert","atto_recordrtc"),startrecording:M.util.get_string("startrecording","atto_recordrtc"),attachrecording:M.util.get_string("attachrecording","atto_recordrtc")});return f},closeDialogue:function(e){e.getDialogue().hide(),e.editor.focus()},setLink:function(e,t){e.getDialogue().hide(),e.editor.focus(),e.get("host").insertContentAtFocusPoint(t),e.markUpdated()}},{ATTRS:{contextid:{value:null},sesskey:{value:null},allowedtypes:{value:null},audiobitrate:{value:null},videobitrate:{value:null},timelimit:{value:null},audiortcicon:{value:null},videortcicon:{value:null},maxrecsize:{value:null}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin","moodle-atto_recordrtc-recording"]}); diff --git a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js index 213b2f2890b..3f62f9d4e64 100644 --- a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js +++ b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js @@ -217,7 +217,7 @@ Y.namespace('M.atto_recordrtc').Button = Y.Base.create('button', Y.M.editor_atto _createContent: function(type) { var isAudio = (type === 'audio'), bsRow = 'row', - bsCol = 'col-xs-', + bsCol = 'col-', bsAlDang = 'alert-danger', bsSsBtn = 'btn btn-lg btn-outline-danger btn-block'; diff --git a/lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js b/lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js index 29ab713b520..3ffa677a2be 100644 --- a/lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js @@ -215,7 +215,7 @@ Y.namespace('M.atto_recordrtc').Button = Y.Base.create('button', Y.M.editor_atto _createContent: function(type) { var isAudio = (type === 'audio'), bsRow = 'row', - bsCol = 'col-xs-', + bsCol = 'col-', bsAlDang = 'alert-danger', bsSsBtn = 'btn btn-lg btn-outline-danger btn-block'; diff --git a/message/templates/notification_preferences_component.mustache b/message/templates/notification_preferences_component.mustache index 3dfb5d19e8b..2d9381e7451 100644 --- a/message/templates/notification_preferences_component.mustache +++ b/message/templates/notification_preferences_component.mustache @@ -73,11 +73,11 @@
-
+
{{#str}} loggedin, message {{/str}} {{#onlinehelphtml}}{{{.}}}{{/onlinehelphtml}}
-
+
{{#str}} loggedoff, message {{/str}} {{#offlinehelphtml}}{{{.}}}{{/offlinehelphtml}}
diff --git a/message/templates/notification_preferences_component_notification.mustache b/message/templates/notification_preferences_component_notification.mustache index 77bcf27790b..7770700ed68 100644 --- a/message/templates/notification_preferences_component_notification.mustache +++ b/message/templates/notification_preferences_component_notification.mustache @@ -67,7 +67,7 @@
-
+
{{#loggedin}} {{< core/hover_tooltip }} {{$anchor}} @@ -92,7 +92,7 @@ {{/ core/hover_tooltip }} {{/loggedin}}
-
+
{{#loggedoff}} {{< core/hover_tooltip }} {{$anchor}} diff --git a/report/insights/templates/insight.mustache b/report/insights/templates/insight.mustache index 6a96553a240..d0cb969f5c7 100644 --- a/report/insights/templates/insight.mustache +++ b/report/insights/templates/insight.mustache @@ -46,16 +46,16 @@ } }} - + {{{toggleslave}}} - + {{#sampleimage}} {{{sampleimage}}} {{/sampleimage}} {{{sampledescription}}} - + {{#actions}} {{> core/action_menu}} {{/actions}} diff --git a/report/insights/templates/insight_details.mustache b/report/insights/templates/insight_details.mustache index fa75339a04d..ecd91d5d350 100644 --- a/report/insights/templates/insight_details.mustache +++ b/report/insights/templates/insight_details.mustache @@ -108,9 +108,9 @@ {{/showpredictionheading}} - {{{hiddencheckboxtoggleall}}} - {{#str}}description{{/str}} - {{#str}}actions{{/str}} + {{{hiddencheckboxtoggleall}}} + {{#str}}description{{/str}} + {{#str}}actions{{/str}} diff --git a/theme/boost/scss/moodle/bs4alphacompat.scss b/theme/boost/scss/moodle/bs4alphacompat.scss index 90e8c8529e0..1bd88c4c0f9 100644 --- a/theme/boost/scss/moodle/bs4alphacompat.scss +++ b/theme/boost/scss/moodle/bs4alphacompat.scss @@ -215,13 +215,6 @@ $bs4aspacers: map-merge(( } } -// Adding compatibility for col-xs-* classes. -@for $i from 1 through $grid-columns { - .col-xs-#{$i} { - @extend .col-#{$i}; - } -} - input[disabled] { cursor: not-allowed; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 29457c81549..826add71293 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -2814,7 +2814,7 @@ pre { padding-right: 0; padding-left: 0; } -.col-1, .col-xs-1, .col-2, .col-xs-2, .col-3, .col-xs-3, .col-4, .col-xs-4, .col-5, .col-xs-5, .col-6, .col-xs-6, .col-7, .col-xs-7, .col-8, .col-xs-8, .col-9, .col-xs-9, .col-10, .col-xs-10, .col-11, .col-xs-11, .col-12, .col-xs-12, .col, +.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, @@ -2835,51 +2835,51 @@ pre { width: auto; max-width: 100%; } -.col-1, .col-xs-1 { +.col-1 { flex: 0 0 8.3333333333%; max-width: 8.3333333333%; } -.col-2, .col-xs-2 { +.col-2 { flex: 0 0 16.6666666667%; max-width: 16.6666666667%; } -.col-3, .col-xs-3 { +.col-3 { flex: 0 0 25%; max-width: 25%; } -.col-4, .col-xs-4 { +.col-4 { flex: 0 0 33.3333333333%; max-width: 33.3333333333%; } -.col-5, .col-xs-5 { +.col-5 { flex: 0 0 41.6666666667%; max-width: 41.6666666667%; } -.col-6, .col-xs-6 { +.col-6 { flex: 0 0 50%; max-width: 50%; } -.col-7, .col-xs-7 { +.col-7 { flex: 0 0 58.3333333333%; max-width: 58.3333333333%; } -.col-8, .col-xs-8 { +.col-8 { flex: 0 0 66.6666666667%; max-width: 66.6666666667%; } -.col-9, .col-xs-9 { +.col-9 { flex: 0 0 75%; max-width: 75%; } -.col-10, .col-xs-10 { +.col-10 { flex: 0 0 83.3333333333%; max-width: 83.3333333333%; } -.col-11, .col-xs-11 { +.col-11 { flex: 0 0 91.6666666667%; max-width: 91.6666666667%; } -.col-12, .col-xs-12 { +.col-12 { flex: 0 0 100%; max-width: 100%; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index f7454f6cde4..b4a3abcfa45 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -2816,7 +2816,7 @@ pre { padding-right: 0; padding-left: 0; } -.col-1, .col-xs-1, .col-2, .col-xs-2, .col-3, .col-xs-3, .col-4, .col-xs-4, .col-5, .col-xs-5, .col-6, .col-xs-6, .col-7, .col-xs-7, .col-8, .col-xs-8, .col-9, .col-xs-9, .col-10, .col-xs-10, .col-11, .col-xs-11, .col-12, .col-xs-12, .col, +.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, @@ -2837,51 +2837,51 @@ pre { width: auto; max-width: 100%; } -.col-1, .col-xs-1 { +.col-1 { flex: 0 0 8.3333333333%; max-width: 8.3333333333%; } -.col-2, .col-xs-2 { +.col-2 { flex: 0 0 16.6666666667%; max-width: 16.6666666667%; } -.col-3, .col-xs-3 { +.col-3 { flex: 0 0 25%; max-width: 25%; } -.col-4, .col-xs-4 { +.col-4 { flex: 0 0 33.3333333333%; max-width: 33.3333333333%; } -.col-5, .col-xs-5 { +.col-5 { flex: 0 0 41.6666666667%; max-width: 41.6666666667%; } -.col-6, .col-xs-6 { +.col-6 { flex: 0 0 50%; max-width: 50%; } -.col-7, .col-xs-7 { +.col-7 { flex: 0 0 58.3333333333%; max-width: 58.3333333333%; } -.col-8, .col-xs-8 { +.col-8 { flex: 0 0 66.6666666667%; max-width: 66.6666666667%; } -.col-9, .col-xs-9 { +.col-9 { flex: 0 0 75%; max-width: 75%; } -.col-10, .col-xs-10 { +.col-10 { flex: 0 0 83.3333333333%; max-width: 83.3333333333%; } -.col-11, .col-xs-11 { +.col-11 { flex: 0 0 91.6666666667%; max-width: 91.6666666667%; } -.col-12, .col-xs-12 { +.col-12 { flex: 0 0 100%; max-width: 100%; } From 1714b6e7f0dd36a779bab6afbdfcbd4283ffc488 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 6 Nov 2019 12:23:58 +0100 Subject: [PATCH 09/23] MDL-66999 theme_boost: @extend remove .btn-block and .btn-link Replace the extended .btn classes with custom css Remove unused arrow_button styles --- theme/boost/scss/moodle/buttons.scss | 12 +---- theme/boost/scss/moodle/core.scss | 1 + theme/boost/style/moodle.css | 78 ++++++++++------------------ theme/classic/style/moodle.css | 78 ++++++++++------------------ 4 files changed, 56 insertions(+), 113 deletions(-) diff --git a/theme/boost/scss/moodle/buttons.scss b/theme/boost/scss/moodle/buttons.scss index 8b1317e8912..b4db9f2504d 100644 --- a/theme/boost/scss/moodle/buttons.scss +++ b/theme/boost/scss/moodle/buttons.scss @@ -13,14 +13,6 @@ p.arrow_button { margin-top: 5em; text-align: center; - - #remove { - margin: 3em auto 5em; - } - - input { - @extend .btn-block; - } } #addcontrols { @@ -37,7 +29,7 @@ p.arrow_button { #addcontrols, #removecontrols { input { - @extend .btn-block; + width: 100%; margin: auto; } } @@ -47,8 +39,6 @@ p.arrow_button { } .btn.btn-icon { - @extend .btn-link; - height: ($icon-width + 20px); width: ($icon-width + 20px); font-size: $icon-width; diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index 084292a10b3..90f229c1b89 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -389,6 +389,7 @@ a.skip:active { width: auto; min-width: 80%; margin: 0 auto; + display: block; } .groupmanagementtable #removeselect_wrapper, diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 826add71293..3e2b54184c0 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -4463,17 +4463,17 @@ fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, .show > .btn-outline-dark.dropdown-toggle:focus { box-shadow: 0 0 0 0.2rem rgba(55, 58, 60, 0.5); } -.btn-link, .btn.btn-icon, #page-grade-grading-manage .actions .btn-icon.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion { +.btn-link { font-weight: 400; color: #1177d1; text-decoration: none; } - .btn-link:hover, .btn.btn-icon:hover, #page-grade-grading-manage .actions .btn-icon.action:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover { + .btn-link:hover { color: #0b4f8a; text-decoration: underline; } - .btn-link:focus, .btn.btn-icon:focus, #page-grade-grading-manage .actions .btn-icon.action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus, .btn-link.focus, .focus.btn.btn-icon, #page-grade-grading-manage .actions .focus.btn-icon.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.focus.btn-icon, #rubric-rubric.gradingform_rubric .focus.btn-icon.addcriterion { + .btn-link:focus, .btn-link.focus { text-decoration: underline; box-shadow: none; } - .btn-link:disabled, .btn.btn-icon:disabled, #page-grade-grading-manage .actions .btn-icon.action:disabled, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:disabled, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:disabled, .btn-link.disabled, .disabled.btn.btn-icon, .fp-viewbar.disabled a.btn-icon, #page-grade-grading-manage .actions .disabled.btn-icon.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.disabled.btn-icon, #rubric-rubric.gradingform_rubric .disabled.btn-icon.addcriterion { + .btn-link:disabled, .btn-link.disabled { color: #868e96; pointer-events: none; } @@ -4489,25 +4489,15 @@ fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, line-height: 1.5; border-radius: 0; } -.btn-block, p.arrow_button input, #addcontrols input, -#removecontrols input { +.btn-block { display: block; width: 100%; } - .btn-block + .btn-block, p.arrow_button input + .btn-block, #addcontrols input + .btn-block, #removecontrols input + .btn-block, p.arrow_button .btn-block + input, p.arrow_button input + input, #addcontrols .btn-block + input, #addcontrols p.arrow_button input + input, #addcontrols input + input, - #removecontrols .btn-block + input, #removecontrols p.arrow_button input + input, - #removecontrols input + input { + .btn-block + .btn-block { margin-top: 0.5rem; } -input[type="submit"].btn-block, p.arrow_button input[type="submit"], #addcontrols input[type="submit"], -#removecontrols input[type="submit"], +input[type="submit"].btn-block, input[type="reset"].btn-block, -p.arrow_button input[type="reset"], -#addcontrols input[type="reset"], -#removecontrols input[type="reset"], -input[type="button"].btn-block, -p.arrow_button input[type="button"], -#addcontrols input[type="button"], -#removecontrols input[type="button"] { +input[type="button"].btn-block { width: 100%; } .fade { @@ -9961,7 +9951,8 @@ a.skip:active { .groupmanagementtable #buttonscell p.arrow_button input { width: auto; min-width: 80%; - margin: 0 auto; } + margin: 0 auto; + display: block; } .groupmanagementtable #removeselect_wrapper, .groupmanagementtable #addselect_wrapper { @@ -11505,12 +11496,12 @@ body.h5p-embed .h5pmessages { .emoji-auto-complete { height: 40px; } - .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button, .emoji-auto-complete .btn.btn-icon.emoji-button, .emoji-auto-complete #page-grade-grading-manage .actions .btn-icon.emoji-button.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-icon.emoji-button.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.emoji-button, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-icon.emoji-button, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-icon.emoji-button.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-icon.emoji-button.addcriterion { + .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button, .emoji-auto-complete #page-grade-grading-manage .actions .btn-link.btn-icon.emoji-button.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-link.btn-icon.emoji-button.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.emoji-button, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-link.btn-icon.emoji-button, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-link.btn-icon.emoji-button.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-link.btn-icon.emoji-button.addcriterion { height: 40px; width: 40px; line-height: 40px; font-size: 24px; } - .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete .btn.btn-icon.emoji-button.active, .emoji-auto-complete #page-grade-grading-manage .actions .btn-icon.emoji-button.active.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-icon.emoji-button.active.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.emoji-button.active, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-icon.emoji-button.active, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-icon.emoji-button.active.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-icon.emoji-button.active.addcriterion { + .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete #page-grade-grading-manage .actions .btn-link.btn-icon.emoji-button.active.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-link.btn-icon.emoji-button.active.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.emoji-button.active, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-link.btn-icon.emoji-button.active.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-link.btn-icon.emoji-button.active.addcriterion { background-color: #e9ecef; } .toast-wrapper { @@ -12242,25 +12233,18 @@ body.h5p-embed .h5pmessages { .block .block-cards a.coursename, .block .block-cards span.categoryname, -.block .block-cards .btn-link, -.block .block-cards .btn.btn-icon, -.block .block-cards #page-grade-grading-manage .actions .btn-icon.action, -#page-grade-grading-manage .actions .block .block-cards .btn-icon.action, -.block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-icon, -.block .block-cards #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, -#rubric-rubric.gradingform_rubric .block .block-cards .btn-icon.addcriterion { +.block .block-cards .btn-link { color: inherit; } .block .block-cards .multiline { white-space: normal; } -.block .block-cards .btn.btn-link.btn-icon, .block .block-cards .btn.btn-icon, .block .block-cards #page-grade-grading-manage .actions .btn-icon.action, #page-grade-grading-manage .actions .block .block-cards .btn-icon.action, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-icon, .block .block-cards #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .block .block-cards .btn-icon.addcriterion { +.block .block-cards .btn.btn-link.btn-icon, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion { height: 36px; width: 36px; padding: 0; border-radius: 50%; } - .block .block-cards .btn.btn-link.btn-icon:hover, .block .block-cards .btn.btn-icon:hover, .block .block-cards #page-grade-grading-manage .actions .btn-icon.action:hover, #page-grade-grading-manage .actions .block .block-cards .btn-icon.action:hover, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-icon:hover, .block .block-cards #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .block .block-cards .btn-icon.addcriterion:hover, .block .block-cards .btn.btn-link.btn-icon:focus, .block .block-cards .btn.btn-icon:focus, .block .block-cards #page-grade-grading-manage .actions .btn-icon.action:focus, #page-grade-grading-manage .actions .block .block-cards .btn-icon.action:focus, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-icon:focus, .block .block-cards #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .block .block-cards .btn-icon.addcriterion:focus { + .block .block-cards .btn.btn-link.btn-icon:hover, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action:hover, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action:hover, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon:hover, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion:hover, .block .block-cards .btn.btn-link.btn-icon:focus, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action:focus, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action:focus, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon:focus, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion:focus { background-color: #e9ecef; } .dashboard-card-deck.one-row { @@ -14761,16 +14745,9 @@ a.ygtvspacer:hover { .message-app .clickable:hover { filter: drop-shadow(2px 2px 2px rgba(0, 0, 0, 0.3)); } .message-app a, - .message-app .btn-link, - .message-app .btn.btn-icon, - .message-app #page-grade-grading-manage .actions .btn-icon.action, - #page-grade-grading-manage .actions .message-app .btn-icon.action, - .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon, - .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, - #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion { + .message-app .btn-link { color: inherit; } - .message-app .btn-link:hover, .message-app .btn.btn-icon:hover, .message-app #page-grade-grading-manage .actions .btn-icon.action:hover, #page-grade-grading-manage .actions .message-app .btn-icon.action:hover, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon:hover, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion:hover, .message-app .btn-link:focus, .message-app .btn.btn-icon:focus, .message-app #page-grade-grading-manage .actions .btn-icon.action:focus, #page-grade-grading-manage .actions .message-app .btn-icon.action:focus, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon:focus, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion:focus { + .message-app .btn-link:hover, .message-app .btn-link:focus { background-color: rgba(0, 0, 0, 0.035); text-decoration: none; } .message-app .icon { @@ -14783,40 +14760,40 @@ a.ygtvspacer:hover { display: inline-block; } .message-app .overview-section-toggle.collapsed .expanded-icon-container { display: none; } - .message-app .btn.btn-link.btn-icon, .message-app .btn.btn-icon, .message-app #page-grade-grading-manage .actions .btn-icon.action, #page-grade-grading-manage .actions .message-app .btn-icon.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion { + .message-app .btn.btn-link.btn-icon, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion { height: 16px; width: 16px; padding: 0; border-radius: 50%; flex-shrink: 0; } - .message-app .btn.btn-link.btn-icon:hover, .message-app .btn.btn-icon:hover, .message-app #page-grade-grading-manage .actions .btn-icon.action:hover, #page-grade-grading-manage .actions .message-app .btn-icon.action:hover, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon:hover, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion:hover, .message-app .btn.btn-link.btn-icon:focus, .message-app .btn.btn-icon:focus, .message-app #page-grade-grading-manage .actions .btn-icon.action:focus, #page-grade-grading-manage .actions .message-app .btn-icon.action:focus, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon:focus, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion:focus { + .message-app .btn.btn-link.btn-icon:hover, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action:hover, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action:hover, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon:hover, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion:hover, .message-app .btn.btn-link.btn-icon:focus, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action:focus, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action:focus, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon:focus, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion:focus { background-color: #e9ecef; } - .message-app .btn.btn-link.btn-icon.icon-size-0, .message-app .btn.btn-icon.icon-size-0, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-0.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-0.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-0, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-0, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-0.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-0.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-0, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-0.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-0.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-0, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-0, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-0.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-0.addcriterion { height: 20px !important; /* stylelint-disable-line declaration-no-important */ width: 20px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-1, .message-app .btn.btn-icon.icon-size-1, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-1.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-1.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-1, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-1, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-1.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-1.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-1, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-1.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-1.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-1, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-1, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-1.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-1.addcriterion { height: 24px !important; /* stylelint-disable-line declaration-no-important */ width: 24px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-2, .message-app .btn.btn-icon.icon-size-2, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-2.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-2.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-2, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-2, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-2.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-2.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-2, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-2.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-2.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-2, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-2, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-2.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-2.addcriterion { height: 28px !important; /* stylelint-disable-line declaration-no-important */ width: 28px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-3, .message-app .btn.btn-icon.icon-size-3, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-3.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-3.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-3, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-3, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-3.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-3.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-3, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-3.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-3.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-3, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-3, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-3.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-3.addcriterion { height: 36px !important; /* stylelint-disable-line declaration-no-important */ width: 36px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-4, .message-app .btn.btn-icon.icon-size-4, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-4.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-4.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-4, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-4, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-4.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-4.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-4, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-4.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-4.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-4, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-4, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-4.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-4.addcriterion { height: 44px !important; /* stylelint-disable-line declaration-no-important */ width: 44px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-5, .message-app .btn.btn-icon.icon-size-5, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-5.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-5.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-5, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-5, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-5.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-5.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-5, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-5.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-5.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-5, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-5, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-5.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-5.addcriterion { height: 68px !important; /* stylelint-disable-line declaration-no-important */ width: 68px !important; @@ -16886,7 +16863,7 @@ div#dock { display: inline-block; min-height: 12rem; } -#page-mod-quiz-mod #id_reviewoptionshdr .btn-link, #page-mod-quiz-mod #id_reviewoptionshdr .btn.btn-icon, #page-mod-quiz-mod #id_reviewoptionshdr #page-grade-grading-manage .actions .btn-icon.action, #page-grade-grading-manage .actions #page-mod-quiz-mod #id_reviewoptionshdr .btn-icon.action, #page-mod-quiz-mod #id_reviewoptionshdr #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-mod-quiz-mod #id_reviewoptionshdr input.btn-icon, #page-mod-quiz-mod #id_reviewoptionshdr #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, #rubric-rubric.gradingform_rubric #page-mod-quiz-mod #id_reviewoptionshdr .btn-icon.addcriterion { +#page-mod-quiz-mod #id_reviewoptionshdr .btn-link { line-height: 1.5; vertical-align: bottom; } @@ -17339,8 +17316,6 @@ div#dock { p.arrow_button { margin-top: 5em; text-align: center; } - p.arrow_button #remove { - margin: 3em auto 5em; } #addcontrols { margin-top: 11.25rem; @@ -17351,6 +17326,7 @@ p.arrow_button { #addcontrols input, #removecontrols input { + width: 100%; margin: auto; } .btn-lineup { diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index b4a3abcfa45..7f983ba17ee 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -4469,17 +4469,17 @@ fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, .show > .btn-outline-dark.dropdown-toggle:focus { box-shadow: 0 0 0 0.2rem rgba(55, 58, 60, 0.5); } -.btn-link, .btn.btn-icon, #page-grade-grading-manage .actions .btn-icon.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion { +.btn-link { font-weight: 400; color: #1177d1; text-decoration: none; } - .btn-link:hover, .btn.btn-icon:hover, #page-grade-grading-manage .actions .btn-icon.action:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover { + .btn-link:hover { color: #0b4f8a; text-decoration: underline; } - .btn-link:focus, .btn.btn-icon:focus, #page-grade-grading-manage .actions .btn-icon.action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus, .btn-link.focus, .focus.btn.btn-icon, #page-grade-grading-manage .actions .focus.btn-icon.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.focus.btn-icon, #rubric-rubric.gradingform_rubric .focus.btn-icon.addcriterion { + .btn-link:focus, .btn-link.focus { text-decoration: underline; box-shadow: none; } - .btn-link:disabled, .btn.btn-icon:disabled, #page-grade-grading-manage .actions .btn-icon.action:disabled, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:disabled, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:disabled, .btn-link.disabled, .disabled.btn.btn-icon, .fp-viewbar.disabled a.btn-icon, #page-grade-grading-manage .actions .disabled.btn-icon.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.disabled.btn-icon, #rubric-rubric.gradingform_rubric .disabled.btn-icon.addcriterion { + .btn-link:disabled, .btn-link.disabled { color: #868e96; pointer-events: none; } @@ -4495,25 +4495,15 @@ fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, line-height: 1.5; border-radius: 0.2rem; } -.btn-block, p.arrow_button input, #addcontrols input, -#removecontrols input { +.btn-block { display: block; width: 100%; } - .btn-block + .btn-block, p.arrow_button input + .btn-block, #addcontrols input + .btn-block, #removecontrols input + .btn-block, p.arrow_button .btn-block + input, p.arrow_button input + input, #addcontrols .btn-block + input, #addcontrols p.arrow_button input + input, #addcontrols input + input, - #removecontrols .btn-block + input, #removecontrols p.arrow_button input + input, - #removecontrols input + input { + .btn-block + .btn-block { margin-top: 0.5rem; } -input[type="submit"].btn-block, p.arrow_button input[type="submit"], #addcontrols input[type="submit"], -#removecontrols input[type="submit"], +input[type="submit"].btn-block, input[type="reset"].btn-block, -p.arrow_button input[type="reset"], -#addcontrols input[type="reset"], -#removecontrols input[type="reset"], -input[type="button"].btn-block, -p.arrow_button input[type="button"], -#addcontrols input[type="button"], -#removecontrols input[type="button"] { +input[type="button"].btn-block { width: 100%; } .fade { @@ -10210,7 +10200,8 @@ a.skip:active { .groupmanagementtable #buttonscell p.arrow_button input { width: auto; min-width: 80%; - margin: 0 auto; } + margin: 0 auto; + display: block; } .groupmanagementtable #removeselect_wrapper, .groupmanagementtable #addselect_wrapper { @@ -11760,12 +11751,12 @@ body.h5p-embed .h5pmessages { .emoji-auto-complete { height: 40px; } - .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button, .emoji-auto-complete .btn.btn-icon.emoji-button, .emoji-auto-complete #page-grade-grading-manage .actions .btn-icon.emoji-button.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-icon.emoji-button.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.emoji-button, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-icon.emoji-button, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-icon.emoji-button.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-icon.emoji-button.addcriterion { + .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button, .emoji-auto-complete #page-grade-grading-manage .actions .btn-link.btn-icon.emoji-button.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-link.btn-icon.emoji-button.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.emoji-button, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-link.btn-icon.emoji-button, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-link.btn-icon.emoji-button.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-link.btn-icon.emoji-button.addcriterion { height: 40px; width: 40px; line-height: 40px; font-size: 24px; } - .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete .btn.btn-icon.emoji-button.active, .emoji-auto-complete #page-grade-grading-manage .actions .btn-icon.emoji-button.active.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-icon.emoji-button.active.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.emoji-button.active, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-icon.emoji-button.active, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-icon.emoji-button.active.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-icon.emoji-button.active.addcriterion { + .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete #page-grade-grading-manage .actions .btn-link.btn-icon.emoji-button.active.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-link.btn-icon.emoji-button.active.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.emoji-button.active, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-link.btn-icon.emoji-button.active.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-link.btn-icon.emoji-button.active.addcriterion { background-color: #e9ecef; } .toast-wrapper { @@ -12498,25 +12489,18 @@ body.h5p-embed .h5pmessages { .block .block-cards a.coursename, .block .block-cards span.categoryname, -.block .block-cards .btn-link, -.block .block-cards .btn.btn-icon, -.block .block-cards #page-grade-grading-manage .actions .btn-icon.action, -#page-grade-grading-manage .actions .block .block-cards .btn-icon.action, -.block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-icon, -.block .block-cards #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, -#rubric-rubric.gradingform_rubric .block .block-cards .btn-icon.addcriterion { +.block .block-cards .btn-link { color: inherit; } .block .block-cards .multiline { white-space: normal; } -.block .block-cards .btn.btn-link.btn-icon, .block .block-cards .btn.btn-icon, .block .block-cards #page-grade-grading-manage .actions .btn-icon.action, #page-grade-grading-manage .actions .block .block-cards .btn-icon.action, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-icon, .block .block-cards #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .block .block-cards .btn-icon.addcriterion { +.block .block-cards .btn.btn-link.btn-icon, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion { height: 36px; width: 36px; padding: 0; border-radius: 50%; } - .block .block-cards .btn.btn-link.btn-icon:hover, .block .block-cards .btn.btn-icon:hover, .block .block-cards #page-grade-grading-manage .actions .btn-icon.action:hover, #page-grade-grading-manage .actions .block .block-cards .btn-icon.action:hover, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-icon:hover, .block .block-cards #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .block .block-cards .btn-icon.addcriterion:hover, .block .block-cards .btn.btn-link.btn-icon:focus, .block .block-cards .btn.btn-icon:focus, .block .block-cards #page-grade-grading-manage .actions .btn-icon.action:focus, #page-grade-grading-manage .actions .block .block-cards .btn-icon.action:focus, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-icon:focus, .block .block-cards #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .block .block-cards .btn-icon.addcriterion:focus { + .block .block-cards .btn.btn-link.btn-icon:hover, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action:hover, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action:hover, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon:hover, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion:hover, .block .block-cards .btn.btn-link.btn-icon:focus, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action:focus, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action:focus, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon:focus, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion:focus { background-color: #e9ecef; } .dashboard-card-deck.one-row { @@ -15020,16 +15004,9 @@ a.ygtvspacer:hover { .message-app .clickable:hover { filter: drop-shadow(2px 2px 2px rgba(0, 0, 0, 0.3)); } .message-app a, - .message-app .btn-link, - .message-app .btn.btn-icon, - .message-app #page-grade-grading-manage .actions .btn-icon.action, - #page-grade-grading-manage .actions .message-app .btn-icon.action, - .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon, - .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, - #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion { + .message-app .btn-link { color: inherit; } - .message-app .btn-link:hover, .message-app .btn.btn-icon:hover, .message-app #page-grade-grading-manage .actions .btn-icon.action:hover, #page-grade-grading-manage .actions .message-app .btn-icon.action:hover, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon:hover, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion:hover, .message-app .btn-link:focus, .message-app .btn.btn-icon:focus, .message-app #page-grade-grading-manage .actions .btn-icon.action:focus, #page-grade-grading-manage .actions .message-app .btn-icon.action:focus, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon:focus, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion:focus { + .message-app .btn-link:hover, .message-app .btn-link:focus { background-color: rgba(0, 0, 0, 0.035); text-decoration: none; } .message-app .icon { @@ -15042,40 +15019,40 @@ a.ygtvspacer:hover { display: inline-block; } .message-app .overview-section-toggle.collapsed .expanded-icon-container { display: none; } - .message-app .btn.btn-link.btn-icon, .message-app .btn.btn-icon, .message-app #page-grade-grading-manage .actions .btn-icon.action, #page-grade-grading-manage .actions .message-app .btn-icon.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion { + .message-app .btn.btn-link.btn-icon, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion { height: 16px; width: 16px; padding: 0; border-radius: 50%; flex-shrink: 0; } - .message-app .btn.btn-link.btn-icon:hover, .message-app .btn.btn-icon:hover, .message-app #page-grade-grading-manage .actions .btn-icon.action:hover, #page-grade-grading-manage .actions .message-app .btn-icon.action:hover, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon:hover, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion:hover, .message-app .btn.btn-link.btn-icon:focus, .message-app .btn.btn-icon:focus, .message-app #page-grade-grading-manage .actions .btn-icon.action:focus, #page-grade-grading-manage .actions .message-app .btn-icon.action:focus, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon:focus, .message-app #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .message-app .btn-icon.addcriterion:focus { + .message-app .btn.btn-link.btn-icon:hover, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action:hover, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action:hover, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon:hover, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion:hover, .message-app .btn.btn-link.btn-icon:focus, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action:focus, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action:focus, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon:focus, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion:focus { background-color: #e9ecef; } - .message-app .btn.btn-link.btn-icon.icon-size-0, .message-app .btn.btn-icon.icon-size-0, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-0.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-0.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-0, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-0, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-0.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-0.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-0, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-0.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-0.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-0, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-0, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-0.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-0.addcriterion { height: 20px !important; /* stylelint-disable-line declaration-no-important */ width: 20px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-1, .message-app .btn.btn-icon.icon-size-1, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-1.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-1.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-1, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-1, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-1.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-1.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-1, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-1.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-1.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-1, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-1, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-1.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-1.addcriterion { height: 24px !important; /* stylelint-disable-line declaration-no-important */ width: 24px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-2, .message-app .btn.btn-icon.icon-size-2, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-2.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-2.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-2, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-2, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-2.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-2.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-2, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-2.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-2.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-2, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-2, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-2.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-2.addcriterion { height: 28px !important; /* stylelint-disable-line declaration-no-important */ width: 28px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-3, .message-app .btn.btn-icon.icon-size-3, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-3.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-3.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-3, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-3, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-3.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-3.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-3, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-3.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-3.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-3, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-3, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-3.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-3.addcriterion { height: 36px !important; /* stylelint-disable-line declaration-no-important */ width: 36px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-4, .message-app .btn.btn-icon.icon-size-4, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-4.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-4.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-4, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-4, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-4.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-4.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-4, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-4.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-4.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-4, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-4, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-4.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-4.addcriterion { height: 44px !important; /* stylelint-disable-line declaration-no-important */ width: 44px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-5, .message-app .btn.btn-icon.icon-size-5, .message-app #page-grade-grading-manage .actions .btn-icon.icon-size-5.action, #page-grade-grading-manage .actions .message-app .btn-icon.icon-size-5.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-5, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-icon.icon-size-5, .message-app #rubric-rubric.gradingform_rubric .btn-icon.icon-size-5.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-icon.icon-size-5.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-5, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-5.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-5.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-5, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-5, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-5.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-5.addcriterion { height: 68px !important; /* stylelint-disable-line declaration-no-important */ width: 68px !important; @@ -17155,7 +17132,7 @@ div#dock { display: inline-block; min-height: 12rem; } -#page-mod-quiz-mod #id_reviewoptionshdr .btn-link, #page-mod-quiz-mod #id_reviewoptionshdr .btn.btn-icon, #page-mod-quiz-mod #id_reviewoptionshdr #page-grade-grading-manage .actions .btn-icon.action, #page-grade-grading-manage .actions #page-mod-quiz-mod #id_reviewoptionshdr .btn-icon.action, #page-mod-quiz-mod #id_reviewoptionshdr #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-mod-quiz-mod #id_reviewoptionshdr input.btn-icon, #page-mod-quiz-mod #id_reviewoptionshdr #rubric-rubric.gradingform_rubric .btn-icon.addcriterion, #rubric-rubric.gradingform_rubric #page-mod-quiz-mod #id_reviewoptionshdr .btn-icon.addcriterion { +#page-mod-quiz-mod #id_reviewoptionshdr .btn-link { line-height: 1.5; vertical-align: bottom; } @@ -17612,8 +17589,6 @@ div#dock { p.arrow_button { margin-top: 5em; text-align: center; } - p.arrow_button #remove { - margin: 3em auto 5em; } #addcontrols { margin-top: 11.25rem; @@ -17624,6 +17599,7 @@ p.arrow_button { #addcontrols input, #removecontrols input { + width: 100%; margin: auto; } .btn-lineup { From 30b71a91fa14a830f3f0fb98b3a2a0a5992db692 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 6 Nov 2019 14:27:30 +0100 Subject: [PATCH 10/23] MDL-66999 theme_boost: @extend remove .h2 from calendar The calendar monthname is already in a

, no additional .h2 styles are needed --- theme/boost/scss/moodle/calendar.scss | 6 ------ theme/boost/style/moodle.css | 4 ++-- theme/classic/style/moodle.css | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/theme/boost/scss/moodle/calendar.scss b/theme/boost/scss/moodle/calendar.scss index fa6bddb14d9..869b210be05 100644 --- a/theme/boost/scss/moodle/calendar.scss +++ b/theme/boost/scss/moodle/calendar.scss @@ -213,12 +213,6 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue. border-color: $calendarEventUserColor; } - .calendar-controls { - .current { - @extend .h2; - } - } - .calendartable { td, li { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 3e2b54184c0..758066f98bf 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -2631,7 +2631,7 @@ template { display: none !important; } h1, h2, h3, h4, h5, h6, -.h1, .h2, .path-calendar .maincalendar .calendar-controls .current, .h3, .h4, .h5, .h6 { +.h1, .h2, .h3, .h4, .h5, .h6 { margin-bottom: 0.5rem; font-weight: 300; line-height: 1.2; } @@ -2639,7 +2639,7 @@ h1, h2, h3, h4, h5, h6, h1, .h1 { font-size: 2.34375rem; } -h2, .h2, .path-calendar .maincalendar .calendar-controls .current { +h2, .h2 { font-size: 1.875rem; } h3, .h3 { diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 7f983ba17ee..2f424841563 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -2631,7 +2631,7 @@ template { display: none !important; } h1, h2, h3, h4, h5, h6, -.h1, .h2, .path-calendar .maincalendar .calendar-controls .current, .h3, .h4, .h5, .h6 { +.h1, .h2, .h3, .h4, .h5, .h6 { margin-bottom: 0.5rem; font-weight: 300; line-height: 1.2; } @@ -2639,7 +2639,7 @@ h1, h2, h3, h4, h5, h6, h1, .h1 { font-size: 2.34375rem; } -h2, .h2, .path-calendar .maincalendar .calendar-controls .current { +h2, .h2 { font-size: 1.875rem; } h3, .h3 { From 4f77082d29aea16eb9d6e8a29e9af40a6afa2047 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 6 Nov 2019 14:38:47 +0100 Subject: [PATCH 11/23] MDL-66999 theme_boost: @extend replace chat .p0 with css --- theme/boost/scss/moodle/chat.scss | 2 +- theme/boost/style/moodle.css | 5 ++++- theme/classic/style/moodle.css | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/theme/boost/scss/moodle/chat.scss b/theme/boost/scss/moodle/chat.scss index 988b6e82a0e..f6bdef7f17a 100644 --- a/theme/boost/scss/moodle/chat.scss +++ b/theme/boost/scss/moodle/chat.scss @@ -24,7 +24,7 @@ } // Override the default padding added by function $OUTPUT->box(); #chat-input-area.py-3 { - @extend .p-0; + padding: 0 !important; /* stylelint-disable-line declaration-no-important */ } #chat-input-area table.generaltable, #chat-input-area table.generaltable td.cell { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 758066f98bf..71fb7cbf858 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -7897,7 +7897,7 @@ button.bg-dark:focus { .mx-5 { margin-left: 3rem !important; } -.p-0, .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-input-area.py-3 { +.p-0 { padding: 0 !important; } .pt-0, @@ -17078,6 +17078,9 @@ div#dock { background-color: transparent; } .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax .yui-layout-unit.yui-layout-unit-center div.yui-layout-bd { background-color: #f8f9fa; } + .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-input-area.py-3 { + padding: 0 !important; + /* stylelint-disable-line declaration-no-important */ } .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-input-area table.generaltable, .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-input-area table.generaltable td.cell { border: 0; diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 2f424841563..4d45b50306f 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -8144,7 +8144,7 @@ button.bg-dark:focus { .mx-5 { margin-left: 3rem !important; } -.p-0, .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-input-area.py-3 { +.p-0 { padding: 0 !important; } .pt-0, @@ -17348,6 +17348,9 @@ div#dock { background-color: transparent; } .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax .yui-layout-unit.yui-layout-unit-center div.yui-layout-bd { background-color: #f8f9fa; } + .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-input-area.py-3 { + padding: 0 !important; + /* stylelint-disable-line declaration-no-important */ } .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-input-area table.generaltable, .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-input-area table.generaltable td.cell { border: 0; From 438173977831f72ad9ab389ee8b73ea280b05567 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Tue, 26 Nov 2019 13:40:45 +0100 Subject: [PATCH 12/23] MDL-66999 theme_boost: @extend get colours from map --- theme/boost/scss/moodle/core.scss | 18 ++++----- theme/boost/style/moodle.css | 61 ++++++++++++++++++++----------- theme/classic/style/moodle.css | 61 ++++++++++++++++++++----------- 3 files changed, 87 insertions(+), 53 deletions(-) diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index 90f229c1b89..1d1aeee164f 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -118,16 +118,16 @@ a.dimmed_text:visited, .red, .notifyproblem { - @extend .text-warning; + color: map-get($theme-colors, 'warning'); } .green, .notifysuccess { - @extend .text-success; + color: map-get($theme-colors, 'success'); } .highlight { - @extend .text-info; + color: map-get($theme-colors, 'info'); } .fitem.advanced .text-info { @@ -593,7 +593,7 @@ table.mod_index { * Completion progress report */ .completion-expired { - @extend .text-warning; + color: map-get($theme-colors, 'warning'); } .completion-expected { @@ -690,7 +690,7 @@ span.flagged-tag, tr.flagged-tag, span.flagged-tag a, tr.flagged-tag a { - @extend .text-warning; + color: map-get($theme-colors, 'warning'); } .tag-management-table td, @@ -1230,7 +1230,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { } .moodle-dialogue-exception .param-stacktrace .stacktrace-line { - @extend .text-warning; + color: map-get($theme-colors, 'warning'); font-size: $font-size-sm; } @@ -1685,15 +1685,15 @@ ul.badges { } .connected { - @extend .text-success; + color: map-get($theme-colors, 'success'); } .notconnected { - @extend .text-danger; + color: map-get($theme-colors, 'danger'); } .connecting { - @extend .text-warning; + color: map-get($theme-colors, 'warning'); } #page-badges-award .recipienttable tr td { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 71fb7cbf858..210de59a888 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -9241,41 +9241,28 @@ a.text-primary:hover, a.text-primary:focus { a.text-secondary:hover, a.text-secondary:focus { color: #a2aeb9 !important; } -.text-success, .green, -.notifysuccess, .connected { +.text-success { color: #5cb85c !important; } -a.text-success:hover, a.green:hover, -a.notifysuccess:hover, a.connected:hover, a.text-success:focus, a.green:focus, -a.notifysuccess:focus, a.connected:focus { +a.text-success:hover, a.text-success:focus { color: #3d8b3d !important; } -.text-info, .highlight { +.text-info { color: #5bc0de !important; } -a.text-info:hover, a.highlight:hover, a.text-info:focus, a.highlight:focus { +a.text-info:hover, a.text-info:focus { color: #28a1c5 !important; } -.text-warning, .red, -.notifyproblem, .completion-expired, span.flagged-tag, -tr.flagged-tag, -span.flagged-tag a, -tr.flagged-tag a, .moodle-dialogue-exception .param-stacktrace .stacktrace-line, .connecting { +.text-warning { color: #f0ad4e !important; } -a.text-warning:hover, a.red:hover, -a.notifyproblem:hover, a.completion-expired:hover, -span.flagged-tag a:hover, -tr.flagged-tag a:hover, .moodle-dialogue-exception .param-stacktrace a.stacktrace-line:hover, a.connecting:hover, a.text-warning:focus, a.red:focus, -a.notifyproblem:focus, a.completion-expired:focus, -span.flagged-tag a:focus, -tr.flagged-tag a:focus, .moodle-dialogue-exception .param-stacktrace a.stacktrace-line:focus, a.connecting:focus { +a.text-warning:hover, a.text-warning:focus { color: #df8a13 !important; } -.text-danger, .notconnected, .que .validationerror, .text-error { +.text-danger, .que .validationerror, .text-error { color: #d9534f !important; } -a.text-danger:hover, a.notconnected:hover, .que a.validationerror:hover, a.text-error:hover, a.text-danger:focus, a.notconnected:focus, .que a.validationerror:focus, a.text-error:focus { +a.text-danger:hover, .que a.validationerror:hover, a.text-error:hover, a.text-danger:focus, .que a.validationerror:focus, a.text-error:focus { color: #b52b27 !important; } .text-light { @@ -9736,7 +9723,18 @@ a.dimmed_text:visited, .notifytiny td { font-size: 100%; } -.fitem.advanced .text-info, .fitem.advanced .highlight { +.red, +.notifyproblem { + color: #f0ad4e; } + +.green, +.notifysuccess { + color: #5cb85c; } + +.highlight { + color: #5bc0de; } + +.fitem.advanced .text-info { font-weight: bold; } .reportlink { @@ -10107,6 +10105,9 @@ table.mod_index { /** * Completion progress report */ +.completion-expired { + color: #f0ad4e; } + .completion-expected { font-size: 0.703125rem; } @@ -10184,6 +10185,12 @@ img.user-image { padding-left: 5px; content: "«"; } +span.flagged-tag, +tr.flagged-tag, +span.flagged-tag a, +tr.flagged-tag a { + color: #f0ad4e; } + .tag-management-table td, .tag-management-table th { vertical-align: middle; @@ -10632,6 +10639,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { font-size: 0.8203125rem; } .moodle-dialogue-exception .param-stacktrace .stacktrace-line { + color: #f0ad4e; font-size: 0.8203125rem; } .moodle-dialogue-exception .param-stacktrace .stacktrace-call { @@ -10989,6 +10997,15 @@ ul.badges { .badge-profile { vertical-align: top; } +.connected { + color: #5cb85c; } + +.notconnected { + color: #d9534f; } + +.connecting { + color: #f0ad4e; } + #page-badges-award .recipienttable tr td { vertical-align: top; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 4d45b50306f..21460497cb4 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -9488,41 +9488,28 @@ a.text-primary:hover, a.text-primary:focus { a.text-secondary:hover, a.text-secondary:focus { color: #bdc6cf !important; } -.text-success, .green, -.notifysuccess, .connected { +.text-success { color: #5cb85c !important; } -a.text-success:hover, a.green:hover, -a.notifysuccess:hover, a.connected:hover, a.text-success:focus, a.green:focus, -a.notifysuccess:focus, a.connected:focus { +a.text-success:hover, a.text-success:focus { color: #3d8b3d !important; } -.text-info, .highlight { +.text-info { color: #5bc0de !important; } -a.text-info:hover, a.highlight:hover, a.text-info:focus, a.highlight:focus { +a.text-info:hover, a.text-info:focus { color: #28a1c5 !important; } -.text-warning, .red, -.notifyproblem, .completion-expired, span.flagged-tag, -tr.flagged-tag, -span.flagged-tag a, -tr.flagged-tag a, .moodle-dialogue-exception .param-stacktrace .stacktrace-line, .connecting { +.text-warning { color: #f0ad4e !important; } -a.text-warning:hover, a.red:hover, -a.notifyproblem:hover, a.completion-expired:hover, -span.flagged-tag a:hover, -tr.flagged-tag a:hover, .moodle-dialogue-exception .param-stacktrace a.stacktrace-line:hover, a.connecting:hover, a.text-warning:focus, a.red:focus, -a.notifyproblem:focus, a.completion-expired:focus, -span.flagged-tag a:focus, -tr.flagged-tag a:focus, .moodle-dialogue-exception .param-stacktrace a.stacktrace-line:focus, a.connecting:focus { +a.text-warning:hover, a.text-warning:focus { color: #df8a13 !important; } -.text-danger, .notconnected, .que .validationerror, .text-error { +.text-danger, .que .validationerror, .text-error { color: #d9534f !important; } -a.text-danger:hover, a.notconnected:hover, .que a.validationerror:hover, a.text-error:hover, a.text-danger:focus, a.notconnected:focus, .que a.validationerror:focus, a.text-error:focus { +a.text-danger:hover, .que a.validationerror:hover, a.text-error:hover, a.text-danger:focus, .que a.validationerror:focus, a.text-error:focus { color: #b52b27 !important; } .text-light { @@ -9985,7 +9972,18 @@ a.dimmed_text:visited, .notifytiny td { font-size: 100%; } -.fitem.advanced .text-info, .fitem.advanced .highlight { +.red, +.notifyproblem { + color: #f0ad4e; } + +.green, +.notifysuccess { + color: #5cb85c; } + +.highlight { + color: #5bc0de; } + +.fitem.advanced .text-info { font-weight: bold; } .reportlink { @@ -10356,6 +10354,9 @@ table.mod_index { /** * Completion progress report */ +.completion-expired { + color: #f0ad4e; } + .completion-expected { font-size: 0.703125rem; } @@ -10433,6 +10434,12 @@ img.user-image { padding-left: 5px; content: "«"; } +span.flagged-tag, +tr.flagged-tag, +span.flagged-tag a, +tr.flagged-tag a { + color: #f0ad4e; } + .tag-management-table td, .tag-management-table th { vertical-align: middle; @@ -10881,6 +10888,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { font-size: 0.8203125rem; } .moodle-dialogue-exception .param-stacktrace .stacktrace-line { + color: #f0ad4e; font-size: 0.8203125rem; } .moodle-dialogue-exception .param-stacktrace .stacktrace-call { @@ -11244,6 +11252,15 @@ ul.badges { .badge-profile { vertical-align: top; } +.connected { + color: #5cb85c; } + +.notconnected { + color: #d9534f; } + +.connecting { + color: #f0ad4e; } + #page-badges-award .recipienttable tr td { vertical-align: top; } From 5cb07eed0f64afa4b46cd1fe5aa44c8d30483996 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Tue, 26 Nov 2019 13:43:09 +0100 Subject: [PATCH 13/23] MDL-66999 theme_boost: @extend remove page-enrol-users styles The styles and the included @extend rules are no longer needed The enrol users page was removed in MDL-59370 --- theme/boost/scss/moodle/core.scss | 16 -------- theme/boost/style/moodle.css | 44 ++++++++++------------ theme/classic/style/moodle.css | 62 +++++++++++++------------------ 3 files changed, 45 insertions(+), 77 deletions(-) diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index 1d1aeee164f..a5052f1ac6d 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -989,22 +989,6 @@ tr.flagged-tag a { margin-left: 3px; } -#page-enrol-users { - .enrol_user_buttons { - text-align: right; - - } - - #filterform { - @extend .card; - @extend .card-block; - } -} - -#page-enrol-users .enrol-users-page-action input { - margin-left: 0; -} - .corelightbox { background-color: #ccc; position: absolute; diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 210de59a888..9c7f6bbbd5b 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -5641,7 +5641,7 @@ input[type="button"].btn-block { .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { color: #fff; } -.card, #page-enrol-users #filterform, .que .history, .userprofile .profile_tree section, .groupinfobox, .well { +.card, .que .history, .userprofile .profile_tree section, .groupinfobox, .well { position: relative; display: flex; flex-direction: column; @@ -5650,7 +5650,7 @@ input[type="button"].btn-block { background-color: #fff; background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); } - .card > hr, #page-enrol-users #filterform > hr, .que .history > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { + .card > hr, .que .history > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { margin-right: 0; margin-left: 0; } @@ -5717,14 +5717,14 @@ input[type="button"].btn-block { .card-deck { display: flex; flex-direction: column; } - .card-deck .card, .card-deck #page-enrol-users #filterform, #page-enrol-users .card-deck #filterform, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-deck { flex-flow: row wrap; margin-right: -0.25rem; margin-left: -0.25rem; } - .card-deck .card, .card-deck #page-enrol-users #filterform, #page-enrol-users .card-deck #filterform, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { display: flex; flex: 1 0 0%; flex-direction: column; @@ -5735,19 +5735,19 @@ input[type="button"].btn-block { .card-group { display: flex; flex-direction: column; } - .card-group > .card, #page-enrol-users .card-group > #filterform, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-group { flex-flow: row wrap; } - .card-group > .card, #page-enrol-users .card-group > #filterform, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { flex: 1 0 0%; margin-bottom: 0; } - .card-group > .card + .card, #page-enrol-users .card-group > #filterform + .card, .que .card-group > .history + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, #page-enrol-users .card-group > .card + #filterform, #page-enrol-users .card-group > #filterform + #filterform, .que #page-enrol-users .card-group > .history + #filterform, #page-enrol-users .que .card-group > .history + #filterform, .userprofile .profile_tree #page-enrol-users .card-group > section + #filterform, #page-enrol-users .userprofile .profile_tree .card-group > section + #filterform, #page-enrol-users .card-group > .groupinfobox + #filterform, #page-enrol-users .card-group > .well + #filterform, .que .card-group > .card + .history, #page-enrol-users .que .card-group > #filterform + .history, .que #page-enrol-users .card-group > #filterform + .history, .que .card-group > .history + .history, .userprofile .profile_tree .que .card-group > section + .history, .que .userprofile .profile_tree .card-group > section + .history, .que .card-group > .groupinfobox + .history, .que .card-group > .well + .history, .userprofile .profile_tree .card-group > .card + section, #page-enrol-users .userprofile .profile_tree .card-group > #filterform + section, .userprofile .profile_tree #page-enrol-users .card-group > #filterform + section, .que .userprofile .profile_tree .card-group > .history + section, .userprofile .profile_tree .que .card-group > .history + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, #page-enrol-users .card-group > #filterform + .groupinfobox, .que .card-group > .history + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, #page-enrol-users .card-group > #filterform + .well, .que .card-group > .history + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { + .card-group > .card + .card, .que .card-group > .history + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, .que .card-group > .card + .history, .que .card-group > .history + .history, .userprofile .profile_tree .que .card-group > section + .history, .que .userprofile .profile_tree .card-group > section + .history, .que .card-group > .groupinfobox + .history, .que .card-group > .well + .history, .userprofile .profile_tree .card-group > .card + section, .que .userprofile .profile_tree .card-group > .history + section, .userprofile .profile_tree .que .card-group > .history + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, .que .card-group > .history + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, .que .card-group > .history + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { margin-left: 0; border-left: 0; } } -.card-columns .card, .card-columns #page-enrol-users #filterform, #page-enrol-users .card-columns #filterform, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { +.card-columns .card, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { margin-bottom: 0.75rem; } @media (min-width: 576px) { @@ -5756,17 +5756,17 @@ input[type="button"].btn-block { column-gap: 1.25rem; orphans: 1; widows: 1; } - .card-columns .card, .card-columns #page-enrol-users #filterform, #page-enrol-users .card-columns #filterform, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { + .card-columns .card, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { display: inline-block; width: 100%; } } -.accordion > .card, #page-enrol-users .accordion > #filterform, .que .accordion > .history, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { +.accordion > .card, .que .accordion > .history, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { overflow: hidden; } - .accordion > .card:not(:first-of-type):not(:last-of-type), #page-enrol-users .accordion > #filterform:not(:first-of-type):not(:last-of-type), .que .accordion > .history:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { + .accordion > .card:not(:first-of-type):not(:last-of-type), .que .accordion > .history:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { border-bottom: 0; } - .accordion > .card:first-of-type, #page-enrol-users .accordion > #filterform:first-of-type, .que .accordion > .history:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { + .accordion > .card:first-of-type, .que .accordion > .history:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { border-bottom: 0; } - .accordion > .card .card-header, #page-enrol-users .accordion > #filterform .card-header, .que .accordion > .history .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { + .accordion > .card .card-header, .que .accordion > .history .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { margin-bottom: -1px; } .breadcrumb { @@ -10421,12 +10421,6 @@ tr.flagged-tag a { float: right; margin-left: 3px; } -#page-enrol-users .enrol_user_buttons { - text-align: right; } - -#page-enrol-users .enrol-users-page-action input { - margin-left: 0; } - .corelightbox { background-color: #ccc; position: absolute; @@ -12245,7 +12239,7 @@ body.h5p-embed .h5pmessages { .block .block-cards .icon { margin-right: 0; } -.block .block-cards .card .coursemenubtn, .block .block-cards #page-enrol-users #filterform .coursemenubtn, #page-enrol-users .block .block-cards #filterform .coursemenubtn, .block .block-cards .que .history .coursemenubtn, .que .block .block-cards .history .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { +.block .block-cards .card .coursemenubtn, .block .block-cards .que .history .coursemenubtn, .que .block .block-cards .history .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { margin-top: -0.5rem; } .block .block-cards a.coursename, @@ -12972,7 +12966,7 @@ body:not(.editing) .sitetopic ul.section { /* Remove the spacer icon. */ display: none; } -.path-course-view.editing #region-main > .card-block, .path-course-view.editing #page-enrol-users #region-main > #filterform, #page-enrol-users .path-course-view.editing #region-main > #filterform { +.path-course-view.editing #region-main > .card-block { padding-bottom: 13rem; } .jumpmenu .form-inline { @@ -17441,7 +17435,7 @@ p.arrow_button { width: auto; display: inline-flex; flex-direction: column; } - .path-grade-report-grader #region-main > .card, .path-grade-report-grader #page-enrol-users #region-main > #filterform, #page-enrol-users .path-grade-report-grader #region-main > #filterform, .path-grade-report-grader .que #region-main > .history, .que .path-grade-report-grader #region-main > .history, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { + .path-grade-report-grader #region-main > .card, .path-grade-report-grader .que #region-main > .history, .que .path-grade-report-grader #region-main > .history, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { width: auto; overflow-x: initial; } .path-grade-report-grader #region-main div[role="main"] { @@ -17858,12 +17852,12 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu, * - Make the content region flex grow so it pushes things like the * next activity selector to the bottom of the page. */ -body.reset-style #page-header .card, body.reset-style #page-header #page-enrol-users #filterform, #page-enrol-users body.reset-style #page-header #filterform, body.reset-style #page-header .que .history, .que body.reset-style #page-header .history, body.reset-style #page-header .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header section, body.reset-style #page-header .groupinfobox, body.reset-style #page-header .well { +body.reset-style #page-header .card, body.reset-style #page-header .que .history, .que body.reset-style #page-header .history, body.reset-style #page-header .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header section, body.reset-style #page-header .groupinfobox, body.reset-style #page-header .well { border: none; } - body.reset-style #page-header .card .page-header-headings h1, body.reset-style #page-header #page-enrol-users #filterform .page-header-headings h1, #page-enrol-users body.reset-style #page-header #filterform .page-header-headings h1, body.reset-style #page-header .que .history .page-header-headings h1, .que body.reset-style #page-header .history .page-header-headings h1, body.reset-style #page-header .userprofile .profile_tree section .page-header-headings h1, .userprofile .profile_tree body.reset-style #page-header section .page-header-headings h1, body.reset-style #page-header .groupinfobox .page-header-headings h1, body.reset-style #page-header .well .page-header-headings h1 { + body.reset-style #page-header .card .page-header-headings h1, body.reset-style #page-header .que .history .page-header-headings h1, .que body.reset-style #page-header .history .page-header-headings h1, body.reset-style #page-header .userprofile .profile_tree section .page-header-headings h1, .userprofile .profile_tree body.reset-style #page-header section .page-header-headings h1, body.reset-style #page-header .groupinfobox .page-header-headings h1, body.reset-style #page-header .well .page-header-headings h1 { margin-bottom: 0; } @media (max-width: 767.98px) { - body.reset-style #page-header .card .card-body, body.reset-style #page-header #page-enrol-users #filterform .card-body, #page-enrol-users body.reset-style #page-header #filterform .card-body, body.reset-style #page-header .que .history .card-body, .que body.reset-style #page-header .history .card-body, body.reset-style #page-header .userprofile .profile_tree section .card-body, .userprofile .profile_tree body.reset-style #page-header section .card-body, body.reset-style #page-header .groupinfobox .card-body, body.reset-style #page-header .well .card-body, body.reset-style #page-header .card .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .card section, body.reset-style #page-header #page-enrol-users #filterform .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header #page-enrol-users #filterform section, #page-enrol-users body.reset-style #page-header #filterform .userprofile .profile_tree section, .userprofile .profile_tree #page-enrol-users body.reset-style #page-header #filterform section, body.reset-style #page-header .que .history .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .que .history section, .que body.reset-style #page-header .history .userprofile .profile_tree section, .userprofile .profile_tree .que body.reset-style #page-header .history section, body.reset-style #page-header .userprofile .profile_tree section section, .userprofile .profile_tree body.reset-style #page-header section section, body.reset-style #page-header .groupinfobox .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .groupinfobox section, body.reset-style #page-header .well .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .well section { + body.reset-style #page-header .card .card-body, body.reset-style #page-header .que .history .card-body, .que body.reset-style #page-header .history .card-body, body.reset-style #page-header .userprofile .profile_tree section .card-body, .userprofile .profile_tree body.reset-style #page-header section .card-body, body.reset-style #page-header .groupinfobox .card-body, body.reset-style #page-header .well .card-body, body.reset-style #page-header .card .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .card section, body.reset-style #page-header .que .history .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .que .history section, .que body.reset-style #page-header .history .userprofile .profile_tree section, .userprofile .profile_tree .que body.reset-style #page-header .history section, body.reset-style #page-header .userprofile .profile_tree section section, .userprofile .profile_tree body.reset-style #page-header section section, body.reset-style #page-header .groupinfobox .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .groupinfobox section, body.reset-style #page-header .well .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .well section { padding-left: 0; padding-right: 0; } } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 21460497cb4..31b1b7d13e0 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -5746,7 +5746,7 @@ input[type="button"].btn-block { .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { color: #fff; } -.card, #page-enrol-users #filterform, .que .history, .userprofile .profile_tree section, .groupinfobox, .well { +.card, .que .history, .userprofile .profile_tree section, .groupinfobox, .well { position: relative; display: flex; flex-direction: column; @@ -5756,13 +5756,13 @@ input[type="button"].btn-block { background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 0.25rem; } - .card > hr, #page-enrol-users #filterform > hr, .que .history > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { + .card > hr, .que .history > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { margin-right: 0; margin-left: 0; } - .card > .list-group:first-child .list-group-item:first-child, #page-enrol-users #filterform > .list-group:first-child .list-group-item:first-child, .que .history > .list-group:first-child .list-group-item:first-child, .userprofile .profile_tree section > .list-group:first-child .list-group-item:first-child, .groupinfobox > .list-group:first-child .list-group-item:first-child, .well > .list-group:first-child .list-group-item:first-child { + .card > .list-group:first-child .list-group-item:first-child, .que .history > .list-group:first-child .list-group-item:first-child, .userprofile .profile_tree section > .list-group:first-child .list-group-item:first-child, .groupinfobox > .list-group:first-child .list-group-item:first-child, .well > .list-group:first-child .list-group-item:first-child { border-top-left-radius: 0.25rem; border-top-right-radius: 0.25rem; } - .card > .list-group:last-child .list-group-item:last-child, #page-enrol-users #filterform > .list-group:last-child .list-group-item:last-child, .que .history > .list-group:last-child .list-group-item:last-child, .userprofile .profile_tree section > .list-group:last-child .list-group-item:last-child, .groupinfobox > .list-group:last-child .list-group-item:last-child, .well > .list-group:last-child .list-group-item:last-child { + .card > .list-group:last-child .list-group-item:last-child, .que .history > .list-group:last-child .list-group-item:last-child, .userprofile .profile_tree section > .list-group:last-child .list-group-item:last-child, .groupinfobox > .list-group:last-child .list-group-item:last-child, .well > .list-group:last-child .list-group-item:last-child { border-bottom-right-radius: 0.25rem; border-bottom-left-radius: 0.25rem; } @@ -5838,14 +5838,14 @@ input[type="button"].btn-block { .card-deck { display: flex; flex-direction: column; } - .card-deck .card, .card-deck #page-enrol-users #filterform, #page-enrol-users .card-deck #filterform, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-deck { flex-flow: row wrap; margin-right: -0.25rem; margin-left: -0.25rem; } - .card-deck .card, .card-deck #page-enrol-users #filterform, #page-enrol-users .card-deck #filterform, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { display: flex; flex: 1 0 0%; flex-direction: column; @@ -5856,57 +5856,53 @@ input[type="button"].btn-block { .card-group { display: flex; flex-direction: column; } - .card-group > .card, #page-enrol-users .card-group > #filterform, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-group { flex-flow: row wrap; } - .card-group > .card, #page-enrol-users .card-group > #filterform, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { flex: 1 0 0%; margin-bottom: 0; } - .card-group > .card + .card, #page-enrol-users .card-group > #filterform + .card, .que .card-group > .history + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, #page-enrol-users .card-group > .card + #filterform, #page-enrol-users .card-group > #filterform + #filterform, .que #page-enrol-users .card-group > .history + #filterform, #page-enrol-users .que .card-group > .history + #filterform, .userprofile .profile_tree #page-enrol-users .card-group > section + #filterform, #page-enrol-users .userprofile .profile_tree .card-group > section + #filterform, #page-enrol-users .card-group > .groupinfobox + #filterform, #page-enrol-users .card-group > .well + #filterform, .que .card-group > .card + .history, #page-enrol-users .que .card-group > #filterform + .history, .que #page-enrol-users .card-group > #filterform + .history, .que .card-group > .history + .history, .userprofile .profile_tree .que .card-group > section + .history, .que .userprofile .profile_tree .card-group > section + .history, .que .card-group > .groupinfobox + .history, .que .card-group > .well + .history, .userprofile .profile_tree .card-group > .card + section, #page-enrol-users .userprofile .profile_tree .card-group > #filterform + section, .userprofile .profile_tree #page-enrol-users .card-group > #filterform + section, .que .userprofile .profile_tree .card-group > .history + section, .userprofile .profile_tree .que .card-group > .history + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, #page-enrol-users .card-group > #filterform + .groupinfobox, .que .card-group > .history + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, #page-enrol-users .card-group > #filterform + .well, .que .card-group > .history + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { + .card-group > .card + .card, .que .card-group > .history + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, .que .card-group > .card + .history, .que .card-group > .history + .history, .userprofile .profile_tree .que .card-group > section + .history, .que .userprofile .profile_tree .card-group > section + .history, .que .card-group > .groupinfobox + .history, .que .card-group > .well + .history, .userprofile .profile_tree .card-group > .card + section, .que .userprofile .profile_tree .card-group > .history + section, .userprofile .profile_tree .que .card-group > .history + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, .que .card-group > .history + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, .que .card-group > .history + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { margin-left: 0; border-left: 0; } - .card-group > .card:not(:last-child), #page-enrol-users .card-group > #filterform:not(:last-child), .que .card-group > .history:not(:last-child), .userprofile .profile_tree .card-group > section:not(:last-child), .card-group > .groupinfobox:not(:last-child), .card-group > .well:not(:last-child) { + .card-group > .card:not(:last-child), .que .card-group > .history:not(:last-child), .userprofile .profile_tree .card-group > section:not(:last-child), .card-group > .groupinfobox:not(:last-child), .card-group > .well:not(:last-child) { border-top-right-radius: 0; border-bottom-right-radius: 0; } - .card-group > .card:not(:last-child) .card-img-top, #page-enrol-users .card-group > #filterform:not(:last-child) .card-img-top, .que .card-group > .history:not(:last-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-top, .card-group > .groupinfobox:not(:last-child) .card-img-top, .card-group > .well:not(:last-child) .card-img-top, + .card-group > .card:not(:last-child) .card-img-top, .que .card-group > .history:not(:last-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-top, .card-group > .groupinfobox:not(:last-child) .card-img-top, .card-group > .well:not(:last-child) .card-img-top, .card-group > .card:not(:last-child) .card-header, - #page-enrol-users .card-group > #filterform:not(:last-child) .card-header, .que .card-group > .history:not(:last-child) .card-header, .userprofile .profile_tree .card-group > section:not(:last-child) .card-header, .card-group > .groupinfobox:not(:last-child) .card-header, .card-group > .well:not(:last-child) .card-header { border-top-right-radius: 0; } - .card-group > .card:not(:last-child) .card-img-bottom, #page-enrol-users .card-group > #filterform:not(:last-child) .card-img-bottom, .que .card-group > .history:not(:last-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-bottom, .card-group > .groupinfobox:not(:last-child) .card-img-bottom, .card-group > .well:not(:last-child) .card-img-bottom, + .card-group > .card:not(:last-child) .card-img-bottom, .que .card-group > .history:not(:last-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-bottom, .card-group > .groupinfobox:not(:last-child) .card-img-bottom, .card-group > .well:not(:last-child) .card-img-bottom, .card-group > .card:not(:last-child) .card-footer, - #page-enrol-users .card-group > #filterform:not(:last-child) .card-footer, .que .card-group > .history:not(:last-child) .card-footer, .userprofile .profile_tree .card-group > section:not(:last-child) .card-footer, .card-group > .groupinfobox:not(:last-child) .card-footer, .card-group > .well:not(:last-child) .card-footer { border-bottom-right-radius: 0; } - .card-group > .card:not(:first-child), #page-enrol-users .card-group > #filterform:not(:first-child), .que .card-group > .history:not(:first-child), .userprofile .profile_tree .card-group > section:not(:first-child), .card-group > .groupinfobox:not(:first-child), .card-group > .well:not(:first-child) { + .card-group > .card:not(:first-child), .que .card-group > .history:not(:first-child), .userprofile .profile_tree .card-group > section:not(:first-child), .card-group > .groupinfobox:not(:first-child), .card-group > .well:not(:first-child) { border-top-left-radius: 0; border-bottom-left-radius: 0; } - .card-group > .card:not(:first-child) .card-img-top, #page-enrol-users .card-group > #filterform:not(:first-child) .card-img-top, .que .card-group > .history:not(:first-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-top, .card-group > .groupinfobox:not(:first-child) .card-img-top, .card-group > .well:not(:first-child) .card-img-top, + .card-group > .card:not(:first-child) .card-img-top, .que .card-group > .history:not(:first-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-top, .card-group > .groupinfobox:not(:first-child) .card-img-top, .card-group > .well:not(:first-child) .card-img-top, .card-group > .card:not(:first-child) .card-header, - #page-enrol-users .card-group > #filterform:not(:first-child) .card-header, .que .card-group > .history:not(:first-child) .card-header, .userprofile .profile_tree .card-group > section:not(:first-child) .card-header, .card-group > .groupinfobox:not(:first-child) .card-header, .card-group > .well:not(:first-child) .card-header { border-top-left-radius: 0; } - .card-group > .card:not(:first-child) .card-img-bottom, #page-enrol-users .card-group > #filterform:not(:first-child) .card-img-bottom, .que .card-group > .history:not(:first-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-bottom, .card-group > .groupinfobox:not(:first-child) .card-img-bottom, .card-group > .well:not(:first-child) .card-img-bottom, + .card-group > .card:not(:first-child) .card-img-bottom, .que .card-group > .history:not(:first-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-bottom, .card-group > .groupinfobox:not(:first-child) .card-img-bottom, .card-group > .well:not(:first-child) .card-img-bottom, .card-group > .card:not(:first-child) .card-footer, - #page-enrol-users .card-group > #filterform:not(:first-child) .card-footer, .que .card-group > .history:not(:first-child) .card-footer, .userprofile .profile_tree .card-group > section:not(:first-child) .card-footer, .card-group > .groupinfobox:not(:first-child) .card-footer, .card-group > .well:not(:first-child) .card-footer { border-bottom-left-radius: 0; } } -.card-columns .card, .card-columns #page-enrol-users #filterform, #page-enrol-users .card-columns #filterform, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { +.card-columns .card, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { margin-bottom: 0.75rem; } @media (min-width: 576px) { @@ -5915,25 +5911,25 @@ input[type="button"].btn-block { column-gap: 1.25rem; orphans: 1; widows: 1; } - .card-columns .card, .card-columns #page-enrol-users #filterform, #page-enrol-users .card-columns #filterform, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { + .card-columns .card, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { display: inline-block; width: 100%; } } -.accordion > .card, #page-enrol-users .accordion > #filterform, .que .accordion > .history, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { +.accordion > .card, .que .accordion > .history, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { overflow: hidden; } - .accordion > .card:not(:first-of-type) .card-header:first-child, #page-enrol-users .accordion > #filterform:not(:first-of-type) .card-header:first-child, .que .accordion > .history:not(:first-of-type) .card-header:first-child, .userprofile .profile_tree .accordion > section:not(:first-of-type) .card-header:first-child, .accordion > .groupinfobox:not(:first-of-type) .card-header:first-child, .accordion > .well:not(:first-of-type) .card-header:first-child { + .accordion > .card:not(:first-of-type) .card-header:first-child, .que .accordion > .history:not(:first-of-type) .card-header:first-child, .userprofile .profile_tree .accordion > section:not(:first-of-type) .card-header:first-child, .accordion > .groupinfobox:not(:first-of-type) .card-header:first-child, .accordion > .well:not(:first-of-type) .card-header:first-child { border-radius: 0; } - .accordion > .card:not(:first-of-type):not(:last-of-type), #page-enrol-users .accordion > #filterform:not(:first-of-type):not(:last-of-type), .que .accordion > .history:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { + .accordion > .card:not(:first-of-type):not(:last-of-type), .que .accordion > .history:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { border-bottom: 0; border-radius: 0; } - .accordion > .card:first-of-type, #page-enrol-users .accordion > #filterform:first-of-type, .que .accordion > .history:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { + .accordion > .card:first-of-type, .que .accordion > .history:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { border-bottom: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } - .accordion > .card:last-of-type, #page-enrol-users .accordion > #filterform:last-of-type, .que .accordion > .history:last-of-type, .userprofile .profile_tree .accordion > section:last-of-type, .accordion > .groupinfobox:last-of-type, .accordion > .well:last-of-type { + .accordion > .card:last-of-type, .que .accordion > .history:last-of-type, .userprofile .profile_tree .accordion > section:last-of-type, .accordion > .groupinfobox:last-of-type, .accordion > .well:last-of-type { border-top-left-radius: 0; border-top-right-radius: 0; } - .accordion > .card .card-header, #page-enrol-users .accordion > #filterform .card-header, .que .accordion > .history .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { + .accordion > .card .card-header, .que .accordion > .history .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { margin-bottom: -1px; } .breadcrumb { @@ -10670,12 +10666,6 @@ tr.flagged-tag a { float: right; margin-left: 3px; } -#page-enrol-users .enrol_user_buttons { - text-align: right; } - -#page-enrol-users .enrol-users-page-action input { - margin-left: 0; } - .corelightbox { background-color: #ccc; position: absolute; @@ -12501,7 +12491,7 @@ body.h5p-embed .h5pmessages { .block .block-cards .icon { margin-right: 0; } -.block .block-cards .card .coursemenubtn, .block .block-cards #page-enrol-users #filterform .coursemenubtn, #page-enrol-users .block .block-cards #filterform .coursemenubtn, .block .block-cards .que .history .coursemenubtn, .que .block .block-cards .history .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { +.block .block-cards .card .coursemenubtn, .block .block-cards .que .history .coursemenubtn, .que .block .block-cards .history .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { margin-top: -0.5rem; } .block .block-cards a.coursename, @@ -13228,7 +13218,7 @@ body:not(.editing) .sitetopic ul.section { /* Remove the spacer icon. */ display: none; } -.path-course-view.editing #region-main > .card-block, .path-course-view.editing #page-enrol-users #region-main > #filterform, #page-enrol-users .path-course-view.editing #region-main > #filterform { +.path-course-view.editing #region-main > .card-block { padding-bottom: 13rem; } .jumpmenu .form-inline { @@ -17714,7 +17704,7 @@ p.arrow_button { width: auto; display: inline-flex; flex-direction: column; } - .path-grade-report-grader #region-main > .card, .path-grade-report-grader #page-enrol-users #region-main > #filterform, #page-enrol-users .path-grade-report-grader #region-main > #filterform, .path-grade-report-grader .que #region-main > .history, .que .path-grade-report-grader #region-main > .history, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { + .path-grade-report-grader #region-main > .card, .path-grade-report-grader .que #region-main > .history, .que .path-grade-report-grader #region-main > .history, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { width: auto; overflow-x: initial; } .path-grade-report-grader #region-main div[role="main"] { From 807e52442cae7cbc01929cd6871ed34b2d31b0e4 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Tue, 26 Nov 2019 15:02:41 +0100 Subject: [PATCH 14/23] MDL-66999 theme_boost: @extend remove .modal- styles for YUI modals Use custom styles which will also fix the close button design in MDL-67295 --- theme/boost/scss/moodle/core.scss | 32 ++++++++++------- theme/boost/style/moodle.css | 60 +++++++++++++++++++------------ theme/classic/style/moodle.css | 60 +++++++++++++++++++------------ 3 files changed, 96 insertions(+), 56 deletions(-) diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index a5052f1ac6d..4920e65d0e2 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -1140,12 +1140,10 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { display: block; } -.moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content { - @extend .modal-content; -} - .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd { - @extend .modal-header; + display: flex; + padding: 1rem 1rem; + border-bottom: 1px solid #dee2e6; } .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd.yui3-widget-hd { @@ -1158,7 +1156,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { } .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd h1 { - @extend .modal-title; font-size: 1.5rem; } @@ -1167,12 +1164,24 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { left: 0; right: auto; */ - padding: $spacer; + padding: 0; + position: relative; + margin-left: auto; } .moodle-dialogue-base .closebutton { - @extend .close; + padding: $modal-header-padding; + margin: (-$modal-header-padding-y) (-$modal-header-padding-x) (-$modal-header-padding-y) auto; + position: relative; + background-color: transparent; + border: 0; + background-image: none; box-shadow: none; + opacity: 0.7; + &:hover, + &:active { + opacity: 1; + } &::after { content: "×"; } @@ -1180,6 +1189,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-bd { padding: 0.5rem; + body { + background-color: $body-bg; + } } .moodle-dialogue-base .moodle-dialogue-fullscreen .moodle-dialogue-content { @@ -1224,10 +1236,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { border-bottom: 1px solid #eee; } -.moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft { - @extend .modal-footer; -} - .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft:empty { display: none; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 9c7f6bbbd5b..27b909f0819 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -5979,7 +5979,7 @@ input[type="button"].btn-block { .alert-dismissible { padding-right: 3.90625rem; } - .alert-dismissible .close, .alert-dismissible .moodle-dialogue-base .closebutton, .moodle-dialogue-base .alert-dismissible .closebutton { + .alert-dismissible .close { position: absolute; top: 0; right: 0; @@ -6287,7 +6287,7 @@ input[type="button"].btn-block { background-color: #1d1e1f; border-color: #1d1e1f; } -.close, .moodle-dialogue-base .closebutton { +.close { float: right; font-size: 1.40625rem; font-weight: 700; @@ -6295,19 +6295,19 @@ input[type="button"].btn-block { color: #000; text-shadow: 0 1px 0 #fff; opacity: .5; } - .close:hover, .moodle-dialogue-base .closebutton:hover { + .close:hover { color: #000; text-decoration: none; } - .close:not(:disabled):not(.disabled):hover, .moodle-dialogue-base .closebutton:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus, .moodle-dialogue-base .closebutton:not(:disabled):not(.disabled):focus { + .close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus { opacity: .75; } -button.close, .moodle-dialogue-base button.closebutton { +button.close { padding: 0; background-color: transparent; border: 0; appearance: none; } -a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { +a.close.disabled { pointer-events: none; } .toast { @@ -6376,13 +6376,11 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { .modal-dialog-scrollable { display: flex; max-height: calc(100% - 1rem); } - .modal-dialog-scrollable .modal-content, .modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content, .moodle-dialogue-base .modal-dialog-scrollable .moodle-dialogue-wrap.moodle-dialogue-content { + .modal-dialog-scrollable .modal-content { max-height: calc(100vh - 1rem); overflow: hidden; } - .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd, .moodle-dialogue-base .moodle-dialogue-wrap .modal-dialog-scrollable .moodle-dialogue-hd, .modal-dialog-scrollable .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3, .path-mod-assign [data-region="grade-panel"] .modal-dialog-scrollable .popout > .col-md-3, - .modal-dialog-scrollable .modal-footer, - .modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft, - .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .modal-dialog-scrollable .moodle-dialogue-ft { + .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3, .path-mod-assign [data-region="grade-panel"] .modal-dialog-scrollable .popout > .col-md-3, + .modal-dialog-scrollable .modal-footer { flex-shrink: 0; } .modal-dialog-scrollable .modal-body { overflow-y: auto; } @@ -6399,12 +6397,12 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { flex-direction: column; justify-content: center; height: 100%; } - .modal-dialog-centered.modal-dialog-scrollable .modal-content, .modal-dialog-centered.modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content, .moodle-dialogue-base .modal-dialog-centered.modal-dialog-scrollable .moodle-dialogue-wrap.moodle-dialogue-content { + .modal-dialog-centered.modal-dialog-scrollable .modal-content { max-height: none; } .modal-dialog-centered.modal-dialog-scrollable::before { content: none; } -.modal-content, .moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content { +.modal-content { position: relative; display: flex; flex-direction: column; @@ -6428,17 +6426,17 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { .modal-backdrop.show { opacity: 0.5; } -.modal-header, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { +.modal-header, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { display: flex; align-items: flex-start; justify-content: space-between; padding: 1rem 1rem; border-bottom: 1px solid #dee2e6; } - .modal-header .close, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd .close, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .close, .modal-header .moodle-dialogue-base .closebutton, .moodle-dialogue-base .modal-header .closebutton, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd .closebutton, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .moodle-dialogue-base .closebutton, .moodle-dialogue-base .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .closebutton { + .modal-header .close, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .close { padding: 1rem 1rem; margin: -1rem -1rem -1rem auto; } -.modal-title, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd h1 { +.modal-title { margin-bottom: 0; line-height: 1.5; } @@ -6447,15 +6445,15 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { flex: 1 1 auto; padding: 1rem; } -.modal-footer, .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft { +.modal-footer { display: flex; align-items: center; justify-content: flex-end; padding: 1rem; border-top: 1px solid #dee2e6; } - .modal-footer > :not(:first-child), .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft > :not(:first-child) { + .modal-footer > :not(:first-child) { margin-left: .25rem; } - .modal-footer > :not(:last-child), .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft > :not(:last-child) { + .modal-footer > :not(:last-child) { margin-right: .25rem; } .modal-scrollbar-measure { @@ -6471,7 +6469,7 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { margin: 1.75rem auto; } .modal-dialog-scrollable { max-height: calc(100% - 3.5rem); } - .modal-dialog-scrollable .modal-content, .modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content, .moodle-dialogue-base .modal-dialog-scrollable .moodle-dialogue-wrap.moodle-dialogue-content { + .modal-dialog-scrollable .modal-content { max-height: calc(100vh - 3.5rem); } .modal-dialog-centered { min-height: calc(100% - 3.5rem); } @@ -10581,6 +10579,11 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { .modal.show { display: block; } +.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd { + display: flex; + padding: 1rem 1rem; + border-bottom: 1px solid #dee2e6; } + .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd.yui3-widget-hd { min-height: 3rem; color: initial; @@ -10596,15 +10599,28 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { left: 0; right: auto; */ - padding: 1rem; } + padding: 0; + position: relative; + margin-left: auto; } .moodle-dialogue-base .closebutton { - box-shadow: none; } + padding: 1rem 1rem; + margin: -1rem -1rem -1rem auto; + position: relative; + background-color: transparent; + border: 0; + background-image: none; + box-shadow: none; + opacity: 0.7; } + .moodle-dialogue-base .closebutton:hover, .moodle-dialogue-base .closebutton:active { + opacity: 1; } .moodle-dialogue-base .closebutton::after { content: "×"; } .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-bd { padding: 0.5rem; } + .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-bd body { + background-color: #fff; } .moodle-dialogue-base .moodle-dialogue-fullscreen .moodle-dialogue-content { overflow: auto; diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 31b1b7d13e0..6391b23956f 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -6171,7 +6171,7 @@ input[type="button"].btn-block { .alert-dismissible { padding-right: 3.90625rem; } - .alert-dismissible .close, .alert-dismissible .moodle-dialogue-base .closebutton, .moodle-dialogue-base .alert-dismissible .closebutton { + .alert-dismissible .close { position: absolute; top: 0; right: 0; @@ -6521,7 +6521,7 @@ input[type="button"].btn-block { background-color: #1d1e1f; border-color: #1d1e1f; } -.close, .moodle-dialogue-base .closebutton { +.close { float: right; font-size: 1.40625rem; font-weight: 700; @@ -6529,19 +6529,19 @@ input[type="button"].btn-block { color: #000; text-shadow: 0 1px 0 #fff; opacity: .5; } - .close:hover, .moodle-dialogue-base .closebutton:hover { + .close:hover { color: #000; text-decoration: none; } - .close:not(:disabled):not(.disabled):hover, .moodle-dialogue-base .closebutton:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus, .moodle-dialogue-base .closebutton:not(:disabled):not(.disabled):focus { + .close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus { opacity: .75; } -button.close, .moodle-dialogue-base button.closebutton { +button.close { padding: 0; background-color: transparent; border: 0; appearance: none; } -a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { +a.close.disabled { pointer-events: none; } .toast { @@ -6611,13 +6611,11 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { .modal-dialog-scrollable { display: flex; max-height: calc(100% - 1rem); } - .modal-dialog-scrollable .modal-content, .modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content, .moodle-dialogue-base .modal-dialog-scrollable .moodle-dialogue-wrap.moodle-dialogue-content { + .modal-dialog-scrollable .modal-content { max-height: calc(100vh - 1rem); overflow: hidden; } - .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd, .moodle-dialogue-base .moodle-dialogue-wrap .modal-dialog-scrollable .moodle-dialogue-hd, .modal-dialog-scrollable .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3, .path-mod-assign [data-region="grade-panel"] .modal-dialog-scrollable .popout > .col-md-3, - .modal-dialog-scrollable .modal-footer, - .modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft, - .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .modal-dialog-scrollable .moodle-dialogue-ft { + .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3, .path-mod-assign [data-region="grade-panel"] .modal-dialog-scrollable .popout > .col-md-3, + .modal-dialog-scrollable .modal-footer { flex-shrink: 0; } .modal-dialog-scrollable .modal-body { overflow-y: auto; } @@ -6634,12 +6632,12 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { flex-direction: column; justify-content: center; height: 100%; } - .modal-dialog-centered.modal-dialog-scrollable .modal-content, .modal-dialog-centered.modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content, .moodle-dialogue-base .modal-dialog-centered.modal-dialog-scrollable .moodle-dialogue-wrap.moodle-dialogue-content { + .modal-dialog-centered.modal-dialog-scrollable .modal-content { max-height: none; } .modal-dialog-centered.modal-dialog-scrollable::before { content: none; } -.modal-content, .moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content { +.modal-content { position: relative; display: flex; flex-direction: column; @@ -6664,7 +6662,7 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { .modal-backdrop.show { opacity: 0.5; } -.modal-header, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { +.modal-header, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { display: flex; align-items: flex-start; justify-content: space-between; @@ -6672,11 +6670,11 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { border-bottom: 1px solid #dee2e6; border-top-left-radius: 0.3rem; border-top-right-radius: 0.3rem; } - .modal-header .close, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd .close, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .close, .modal-header .moodle-dialogue-base .closebutton, .moodle-dialogue-base .modal-header .closebutton, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd .closebutton, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .moodle-dialogue-base .closebutton, .moodle-dialogue-base .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .closebutton { + .modal-header .close, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .close { padding: 1rem 1rem; margin: -1rem -1rem -1rem auto; } -.modal-title, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd h1 { +.modal-title { margin-bottom: 0; line-height: 1.5; } @@ -6685,7 +6683,7 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { flex: 1 1 auto; padding: 1rem; } -.modal-footer, .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft { +.modal-footer { display: flex; align-items: center; justify-content: flex-end; @@ -6693,9 +6691,9 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { border-top: 1px solid #dee2e6; border-bottom-right-radius: 0.3rem; border-bottom-left-radius: 0.3rem; } - .modal-footer > :not(:first-child), .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft > :not(:first-child) { + .modal-footer > :not(:first-child) { margin-left: .25rem; } - .modal-footer > :not(:last-child), .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft > :not(:last-child) { + .modal-footer > :not(:last-child) { margin-right: .25rem; } .modal-scrollbar-measure { @@ -6711,7 +6709,7 @@ a.close.disabled, .moodle-dialogue-base a.disabled.closebutton { margin: 1.75rem auto; } .modal-dialog-scrollable { max-height: calc(100% - 3.5rem); } - .modal-dialog-scrollable .modal-content, .modal-dialog-scrollable .moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content, .moodle-dialogue-base .modal-dialog-scrollable .moodle-dialogue-wrap.moodle-dialogue-content { + .modal-dialog-scrollable .modal-content { max-height: calc(100vh - 3.5rem); } .modal-dialog-centered { min-height: calc(100% - 3.5rem); } @@ -10826,6 +10824,11 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { .modal.show { display: block; } +.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd { + display: flex; + padding: 1rem 1rem; + border-bottom: 1px solid #dee2e6; } + .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd.yui3-widget-hd { min-height: 3rem; color: initial; @@ -10841,15 +10844,28 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { left: 0; right: auto; */ - padding: 1rem; } + padding: 0; + position: relative; + margin-left: auto; } .moodle-dialogue-base .closebutton { - box-shadow: none; } + padding: 1rem 1rem; + margin: -1rem -1rem -1rem auto; + position: relative; + background-color: transparent; + border: 0; + background-image: none; + box-shadow: none; + opacity: 0.7; } + .moodle-dialogue-base .closebutton:hover, .moodle-dialogue-base .closebutton:active { + opacity: 1; } .moodle-dialogue-base .closebutton::after { content: "×"; } .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-bd { padding: 0.5rem; } + .moodle-dialogue-base .moodle-dialogue .moodle-dialogue-bd body { + background-color: #fff; } .moodle-dialogue-base .moodle-dialogue-fullscreen .moodle-dialogue-content { overflow: auto; From 6c4dbbf061284d5e1a0ba6e28fcff2e2419a8028 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Tue, 26 Nov 2019 15:04:40 +0100 Subject: [PATCH 15/23] MDL-66999 theme_boost: @extend use .table classes in badges renderer The table.collection class is not needed if the bootstrap classes for tables are used in the badges renderer --- badges/renderer.php | 4 +-- theme/boost/scss/moodle/core.scss | 7 ---- theme/boost/style/moodle.css | 54 ++++++++++++++----------------- theme/classic/style/moodle.css | 54 ++++++++++++++----------------- 4 files changed, 50 insertions(+), 69 deletions(-) diff --git a/badges/renderer.php b/badges/renderer.php index 74ce368abef..534c02fb10f 100644 --- a/badges/renderer.php +++ b/badges/renderer.php @@ -685,7 +685,7 @@ class core_badges_renderer extends plugin_renderer_base { $paging = new paging_bar($badges->totalcount, $badges->page, $badges->perpage, $this->page->url, 'page'); $htmlpagingbar = $this->render($paging); $table = new html_table(); - $table->attributes['class'] = 'collection'; + $table->attributes['class'] = 'table table-bordered table-striped'; $sortbyname = $this->helper_sortable_heading(get_string('name'), 'name', $badges->sort, $badges->dir); @@ -743,7 +743,7 @@ class core_badges_renderer extends plugin_renderer_base { $htmlpagingbar = $this->render($paging); $table = new html_table(); - $table->attributes['class'] = 'collection'; + $table->attributes['class'] = 'table table-bordered table-striped'; $sortbyname = $this->helper_sortable_heading(get_string('name'), 'name', $badges->sort, $badges->dir); diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index 4920e65d0e2..995a0f99396 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -1548,13 +1548,6 @@ body.jsenabled .formlisting { display: block; } -/* Badges styles */ -table.collection { - @extend .table; - @extend .table-bordered; - @extend .table-striped; -} - a.criteria-action { padding: 0 3px; float: right; diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 27b909f0819..ef09bdffee5 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -3361,23 +3361,22 @@ pre { .offset-xl-11 { margin-left: 91.6666666667%; } } -.table, table.collection, table.flexible, +.table, table.flexible, .generaltable { width: 100%; margin-bottom: 1rem; color: #373a3c; } - .table th, table.collection th, table.flexible th, .generaltable th, + .table th, table.flexible th, .generaltable th, .table td, - table.collection td, table.flexible td, .generaltable td { padding: 0.75rem; vertical-align: top; border-top: 1px solid #dee2e6; } - .table thead th, table.collection thead th, table.flexible thead th, .generaltable thead th { + .table thead th, table.flexible thead th, .generaltable thead th { vertical-align: bottom; border-bottom: 2px solid #dee2e6; } - .table tbody + tbody, table.collection tbody + tbody, table.flexible tbody + tbody, .generaltable tbody + tbody { + .table tbody + tbody, table.flexible tbody + tbody, .generaltable tbody + tbody { border-top: 2px solid #dee2e6; } .table-sm th, #page-report-loglive-index .generaltable th, #page-admin-report-log-index .generaltable th, #page-report-log-user .generaltable th, #page-admin-user table th, .environmenttable th, .category_subcategories th, .rcs-results th, table#listdirectories th, @@ -3392,15 +3391,13 @@ pre { table#listdirectories td { padding: 0.3rem; } -.table-bordered, table.collection { +.table-bordered { border: 1px solid #dee2e6; } - .table-bordered th, table.collection th, - .table-bordered td, - table.collection td { + .table-bordered th, + .table-bordered td { border: 1px solid #dee2e6; } - .table-bordered thead th, table.collection thead th, - .table-bordered thead td, - table.collection thead td { + .table-bordered thead th, + .table-bordered thead td { border-bottom-width: 2px; } .table-borderless th, @@ -3409,7 +3406,7 @@ table#listdirectories td { .table-borderless tbody + tbody { border: 0; } -.table-striped tbody tr:nth-of-type(odd), table.collection tbody tr:nth-of-type(odd), table#explaincaps tbody tr:nth-of-type(odd), table#defineroletable tbody tr:nth-of-type(odd), table.grading-report tbody tr:nth-of-type(odd), table#listdirectories tbody tr:nth-of-type(odd), table.rolecaps tbody tr:nth-of-type(odd), table.userenrolment tbody tr:nth-of-type(odd), form#movecourses table tbody tr:nth-of-type(odd), #page-admin-course-index .editcourse tbody tr:nth-of-type(odd), .forumheaderlist tbody tr:nth-of-type(odd), table.flexible tbody tr:nth-of-type(odd), .generaltable tbody tr:nth-of-type(odd) { +.table-striped tbody tr:nth-of-type(odd), table#explaincaps tbody tr:nth-of-type(odd), table#defineroletable tbody tr:nth-of-type(odd), table.grading-report tbody tr:nth-of-type(odd), table#listdirectories tbody tr:nth-of-type(odd), table.rolecaps tbody tr:nth-of-type(odd), table.userenrolment tbody tr:nth-of-type(odd), form#movecourses table tbody tr:nth-of-type(odd), #page-admin-course-index .editcourse tbody tr:nth-of-type(odd), .forumheaderlist tbody tr:nth-of-type(odd), table.flexible tbody tr:nth-of-type(odd), .generaltable tbody tr:nth-of-type(odd) { background-color: rgba(0, 0, 0, 0.05); } .table-hover tbody tr:hover, table.grading-report tbody tr:hover, .forumheaderlist tbody tr:hover, .generaltable tbody tr:hover, table.flexible tbody tr:hover, .category_subcategories tbody tr:hover, table#modules tbody tr:hover, table#permissions tbody tr:hover { @@ -3626,12 +3623,12 @@ table#listdirectories td { table#permissions .table-active:hover > th { background-color: rgba(0, 0, 0, 0.075); } -.table .thead-dark th, table.collection .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { +.table .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { color: #fff; background-color: #373a3c; border-color: #494d50; } -.table .thead-light th, table.collection .thead-light th, table.flexible .thead-light th, .generaltable .thead-light th { +.table .thead-light th, table.flexible .thead-light th, .generaltable .thead-light th { color: #495057; background-color: #e9ecef; border-color: #dee2e6; } @@ -3643,9 +3640,9 @@ table#listdirectories td { .table-dark td, .table-dark thead th { border-color: #494d50; } - .table-dark.table-bordered, table.table-dark.collection { + .table-dark.table-bordered { border: 0; } - .table-dark.table-striped tbody tr:nth-of-type(odd), table.table-dark.collection tbody tr:nth-of-type(odd), table.table-dark#explaincaps tbody tr:nth-of-type(odd), table.table-dark#defineroletable tbody tr:nth-of-type(odd), table.table-dark.grading-report tbody tr:nth-of-type(odd), table.table-dark#listdirectories tbody tr:nth-of-type(odd), table.table-dark.rolecaps tbody tr:nth-of-type(odd), table.table-dark.userenrolment tbody tr:nth-of-type(odd), form#movecourses table.table-dark tbody tr:nth-of-type(odd), #page-admin-course-index .table-dark.editcourse tbody tr:nth-of-type(odd), .table-dark.forumheaderlist tbody tr:nth-of-type(odd), table.table-dark.flexible tbody tr:nth-of-type(odd), .table-dark.generaltable tbody tr:nth-of-type(odd) { + .table-dark.table-striped tbody tr:nth-of-type(odd), table.table-dark#explaincaps tbody tr:nth-of-type(odd), table.table-dark#defineroletable tbody tr:nth-of-type(odd), table.table-dark.grading-report tbody tr:nth-of-type(odd), table.table-dark#listdirectories tbody tr:nth-of-type(odd), table.table-dark.rolecaps tbody tr:nth-of-type(odd), table.table-dark.userenrolment tbody tr:nth-of-type(odd), form#movecourses table.table-dark tbody tr:nth-of-type(odd), #page-admin-course-index .table-dark.editcourse tbody tr:nth-of-type(odd), .table-dark.forumheaderlist tbody tr:nth-of-type(odd), table.table-dark.flexible tbody tr:nth-of-type(odd), .table-dark.generaltable tbody tr:nth-of-type(odd) { background-color: rgba(255, 255, 255, 0.05); } .table-dark.table-hover tbody tr:hover, table.table-dark.grading-report tbody tr:hover, .table-dark.forumheaderlist tbody tr:hover, .table-dark.generaltable tbody tr:hover, table.table-dark.flexible tbody tr:hover, .table-dark.category_subcategories tbody tr:hover, table.table-dark#modules tbody tr:hover, table.table-dark#permissions tbody tr:hover { color: #fff; @@ -3657,7 +3654,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive-sm > .table-bordered, .table-responsive-sm > table.collection { + .table-responsive-sm > .table-bordered { border: 0; } } @media (max-width: 767.98px) { @@ -3666,7 +3663,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive-md > .table-bordered, .table-responsive-md > table.collection { + .table-responsive-md > .table-bordered { border: 0; } } @media (max-width: 991.98px) { @@ -3675,7 +3672,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive-lg > .table-bordered, .table-responsive-lg > table.collection { + .table-responsive-lg > .table-bordered { border: 0; } } @media (max-width: 1199.98px) { @@ -3684,7 +3681,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive-xl > .table-bordered, .table-responsive-xl > table.collection { + .table-responsive-xl > .table-bordered { border: 0; } } .table-responsive { @@ -3692,7 +3689,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive > .table-bordered, .table-responsive > table.collection { + .table-responsive > .table-bordered { border: 0; } .form-control { @@ -9349,18 +9346,16 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat display: none; } .badge { border: 1px solid #000; } - .table, table.collection, table.flexible, + .table, table.flexible, .generaltable { border-collapse: collapse !important; } .table td, - table.collection td, table.flexible td, - .generaltable td, .table th, table.collection th, table.flexible th, .generaltable th { + .generaltable td, .table th, table.flexible th, .generaltable th { background-color: #fff !important; } - .table-bordered th, table.collection th, - .table-bordered td, - table.collection td { + .table-bordered th, + .table-bordered td { border: 1px solid #dee2e6 !important; } .table-dark { color: inherit; } @@ -9369,7 +9364,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .table-dark thead th, .table-dark tbody + tbody { border-color: #dee2e6; } - .table .thead-dark th, table.collection .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { + .table .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { color: inherit; border-color: #dee2e6; } } @@ -10906,7 +10901,6 @@ body.jsenabled .formlistingradio { body.jsenabled .formlisting { display: block; } -/* Badges styles */ a.criteria-action { padding: 0 3px; float: right; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 6391b23956f..b7c49b9d6cb 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -3363,23 +3363,22 @@ pre { .offset-xl-11 { margin-left: 91.6666666667%; } } -.table, table.collection, table.flexible, +.table, table.flexible, .generaltable { width: 100%; margin-bottom: 1rem; color: #373a3c; } - .table th, table.collection th, table.flexible th, .generaltable th, + .table th, table.flexible th, .generaltable th, .table td, - table.collection td, table.flexible td, .generaltable td { padding: 0.75rem; vertical-align: top; border-top: 1px solid #dee2e6; } - .table thead th, table.collection thead th, table.flexible thead th, .generaltable thead th { + .table thead th, table.flexible thead th, .generaltable thead th { vertical-align: bottom; border-bottom: 2px solid #dee2e6; } - .table tbody + tbody, table.collection tbody + tbody, table.flexible tbody + tbody, .generaltable tbody + tbody { + .table tbody + tbody, table.flexible tbody + tbody, .generaltable tbody + tbody { border-top: 2px solid #dee2e6; } .table-sm th, #page-report-loglive-index .generaltable th, #page-admin-report-log-index .generaltable th, #page-report-log-user .generaltable th, #page-admin-user table th, .environmenttable th, .category_subcategories th, .rcs-results th, table#listdirectories th, @@ -3394,15 +3393,13 @@ pre { table#listdirectories td { padding: 0.3rem; } -.table-bordered, table.collection { +.table-bordered { border: 1px solid #dee2e6; } - .table-bordered th, table.collection th, - .table-bordered td, - table.collection td { + .table-bordered th, + .table-bordered td { border: 1px solid #dee2e6; } - .table-bordered thead th, table.collection thead th, - .table-bordered thead td, - table.collection thead td { + .table-bordered thead th, + .table-bordered thead td { border-bottom-width: 2px; } .table-borderless th, @@ -3411,7 +3408,7 @@ table#listdirectories td { .table-borderless tbody + tbody { border: 0; } -.table-striped tbody tr:nth-of-type(odd), table.collection tbody tr:nth-of-type(odd), table#explaincaps tbody tr:nth-of-type(odd), table#defineroletable tbody tr:nth-of-type(odd), table.grading-report tbody tr:nth-of-type(odd), table#listdirectories tbody tr:nth-of-type(odd), table.rolecaps tbody tr:nth-of-type(odd), table.userenrolment tbody tr:nth-of-type(odd), form#movecourses table tbody tr:nth-of-type(odd), #page-admin-course-index .editcourse tbody tr:nth-of-type(odd), .forumheaderlist tbody tr:nth-of-type(odd), table.flexible tbody tr:nth-of-type(odd), .generaltable tbody tr:nth-of-type(odd) { +.table-striped tbody tr:nth-of-type(odd), table#explaincaps tbody tr:nth-of-type(odd), table#defineroletable tbody tr:nth-of-type(odd), table.grading-report tbody tr:nth-of-type(odd), table#listdirectories tbody tr:nth-of-type(odd), table.rolecaps tbody tr:nth-of-type(odd), table.userenrolment tbody tr:nth-of-type(odd), form#movecourses table tbody tr:nth-of-type(odd), #page-admin-course-index .editcourse tbody tr:nth-of-type(odd), .forumheaderlist tbody tr:nth-of-type(odd), table.flexible tbody tr:nth-of-type(odd), .generaltable tbody tr:nth-of-type(odd) { background-color: rgba(0, 0, 0, 0.05); } .table-hover tbody tr:hover, table.grading-report tbody tr:hover, .forumheaderlist tbody tr:hover, .generaltable tbody tr:hover, table.flexible tbody tr:hover, .category_subcategories tbody tr:hover, table#modules tbody tr:hover, table#permissions tbody tr:hover { @@ -3628,12 +3625,12 @@ table#listdirectories td { table#permissions .table-active:hover > th { background-color: rgba(0, 0, 0, 0.075); } -.table .thead-dark th, table.collection .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { +.table .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { color: #fff; background-color: #373a3c; border-color: #494d50; } -.table .thead-light th, table.collection .thead-light th, table.flexible .thead-light th, .generaltable .thead-light th { +.table .thead-light th, table.flexible .thead-light th, .generaltable .thead-light th { color: #495057; background-color: #e9ecef; border-color: #dee2e6; } @@ -3645,9 +3642,9 @@ table#listdirectories td { .table-dark td, .table-dark thead th { border-color: #494d50; } - .table-dark.table-bordered, table.table-dark.collection { + .table-dark.table-bordered { border: 0; } - .table-dark.table-striped tbody tr:nth-of-type(odd), table.table-dark.collection tbody tr:nth-of-type(odd), table.table-dark#explaincaps tbody tr:nth-of-type(odd), table.table-dark#defineroletable tbody tr:nth-of-type(odd), table.table-dark.grading-report tbody tr:nth-of-type(odd), table.table-dark#listdirectories tbody tr:nth-of-type(odd), table.table-dark.rolecaps tbody tr:nth-of-type(odd), table.table-dark.userenrolment tbody tr:nth-of-type(odd), form#movecourses table.table-dark tbody tr:nth-of-type(odd), #page-admin-course-index .table-dark.editcourse tbody tr:nth-of-type(odd), .table-dark.forumheaderlist tbody tr:nth-of-type(odd), table.table-dark.flexible tbody tr:nth-of-type(odd), .table-dark.generaltable tbody tr:nth-of-type(odd) { + .table-dark.table-striped tbody tr:nth-of-type(odd), table.table-dark#explaincaps tbody tr:nth-of-type(odd), table.table-dark#defineroletable tbody tr:nth-of-type(odd), table.table-dark.grading-report tbody tr:nth-of-type(odd), table.table-dark#listdirectories tbody tr:nth-of-type(odd), table.table-dark.rolecaps tbody tr:nth-of-type(odd), table.table-dark.userenrolment tbody tr:nth-of-type(odd), form#movecourses table.table-dark tbody tr:nth-of-type(odd), #page-admin-course-index .table-dark.editcourse tbody tr:nth-of-type(odd), .table-dark.forumheaderlist tbody tr:nth-of-type(odd), table.table-dark.flexible tbody tr:nth-of-type(odd), .table-dark.generaltable tbody tr:nth-of-type(odd) { background-color: rgba(255, 255, 255, 0.05); } .table-dark.table-hover tbody tr:hover, table.table-dark.grading-report tbody tr:hover, .table-dark.forumheaderlist tbody tr:hover, .table-dark.generaltable tbody tr:hover, table.table-dark.flexible tbody tr:hover, .table-dark.category_subcategories tbody tr:hover, table.table-dark#modules tbody tr:hover, table.table-dark#permissions tbody tr:hover { color: #fff; @@ -3659,7 +3656,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive-sm > .table-bordered, .table-responsive-sm > table.collection { + .table-responsive-sm > .table-bordered { border: 0; } } @media (max-width: 767.98px) { @@ -3668,7 +3665,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive-md > .table-bordered, .table-responsive-md > table.collection { + .table-responsive-md > .table-bordered { border: 0; } } @media (max-width: 991.98px) { @@ -3677,7 +3674,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive-lg > .table-bordered, .table-responsive-lg > table.collection { + .table-responsive-lg > .table-bordered { border: 0; } } @media (max-width: 1199.98px) { @@ -3686,7 +3683,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive-xl > .table-bordered, .table-responsive-xl > table.collection { + .table-responsive-xl > .table-bordered { border: 0; } } .table-responsive { @@ -3694,7 +3691,7 @@ table#listdirectories td { width: 100%; overflow-x: auto; -webkit-overflow-scrolling: touch; } - .table-responsive > .table-bordered, .table-responsive > table.collection { + .table-responsive > .table-bordered { border: 0; } .form-control { @@ -9592,18 +9589,16 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat display: none; } .badge { border: 1px solid #000; } - .table, table.collection, table.flexible, + .table, table.flexible, .generaltable { border-collapse: collapse !important; } .table td, - table.collection td, table.flexible td, - .generaltable td, .table th, table.collection th, table.flexible th, .generaltable th { + .generaltable td, .table th, table.flexible th, .generaltable th { background-color: #fff !important; } - .table-bordered th, table.collection th, - .table-bordered td, - table.collection td { + .table-bordered th, + .table-bordered td { border: 1px solid #dee2e6 !important; } .table-dark { color: inherit; } @@ -9612,7 +9607,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .table-dark thead th, .table-dark tbody + tbody { border-color: #dee2e6; } - .table .thead-dark th, table.collection .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { + .table .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { color: inherit; border-color: #dee2e6; } } @@ -11157,7 +11152,6 @@ body.jsenabled .formlistingradio { body.jsenabled .formlisting { display: block; } -/* Badges styles */ a.criteria-action { padding: 0 3px; float: right; } From 828a6597286e3ca95197653a8e512faaa6065deb Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Tue, 26 Nov 2019 15:25:07 +0100 Subject: [PATCH 16/23] MDL-66999 theme_boost: @extend use custom styles for filepicker buttons The extended button classes can be replaced with custom styles --- theme/boost/scss/moodle/filemanager.scss | 9 ++++++--- theme/boost/style/moodle.css | 19 ++++++++++++++----- theme/classic/style/moodle.css | 19 ++++++++++++++----- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/theme/boost/scss/moodle/filemanager.scss b/theme/boost/scss/moodle/filemanager.scss index a0012d7da0b..664fa79bc38 100644 --- a/theme/boost/scss/moodle/filemanager.scss +++ b/theme/boost/scss/moodle/filemanager.scss @@ -115,12 +115,15 @@ } .fp-viewbar:not(.disabled) a.checked { - @extend .btn-secondary.active; + background-color: darken(map-get($theme-colors, 'secondary'), 10%); + color: color-yiq(darken(map-get($theme-colors, 'secondary'), 10%)); + border-color: darken(map-get($theme-colors, 'secondary'), 12.5%); } .fp-viewbar.disabled a { - @extend .btn.disabled; - @extend .btn-secondary.disabled; + pointer-events: none; + opacity: $btn-disabled-opacity; + @include box-shadow(none); } .file-picker .fp-clear-left { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index ef09bdffee5..61ed83a303d 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -4095,10 +4095,10 @@ div.backup-section + form { .btn:focus, #page-grade-grading-manage .actions .action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:focus, #rubric-rubric.gradingform_rubric .addcriterion:focus, .btn.focus, #page-grade-grading-manage .actions .focus.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.focus, #rubric-rubric.gradingform_rubric .focus.addcriterion { outline: 0; box-shadow: 0 0 0 0.2rem rgba(17, 119, 209, 0.25); } - .btn.disabled, .fp-viewbar.disabled a, #page-grade-grading-manage .actions .disabled.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.disabled, #rubric-rubric.gradingform_rubric .disabled.addcriterion, .btn:disabled, #page-grade-grading-manage .actions .action:disabled, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:disabled, #rubric-rubric.gradingform_rubric .addcriterion:disabled { + .btn.disabled, #page-grade-grading-manage .actions .disabled.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.disabled, #rubric-rubric.gradingform_rubric .disabled.addcriterion, .btn:disabled, #page-grade-grading-manage .actions .action:disabled, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:disabled, #rubric-rubric.gradingform_rubric .addcriterion:disabled { opacity: 0.65; } -a.btn.disabled, .fp-viewbar.disabled a, #page-grade-grading-manage .actions a.disabled.action, #rubric-rubric.gradingform_rubric a.disabled.addcriterion, +a.btn.disabled, #page-grade-grading-manage .actions a.disabled.action, #rubric-rubric.gradingform_rubric a.disabled.addcriterion, fieldset:disabled a.btn, fieldset:disabled #page-grade-grading-manage .actions a.action, #page-grade-grading-manage .actions fieldset:disabled a.action, @@ -4139,17 +4139,17 @@ fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, border-color: #b1bbc4; } .btn-secondary:focus, .btn-default:focus, .btn-secondary.focus, .focus.btn-default { box-shadow: 0 0 0 0.2rem rgba(180, 186, 191, 0.5); } - .btn-secondary.disabled, .fp-viewbar.disabled a, .disabled.btn-default, .btn-secondary:disabled, .btn-default:disabled { + .btn-secondary.disabled, .disabled.btn-default, .btn-secondary:disabled, .btn-default:disabled { color: #212529; background-color: #ced4da; border-color: #ced4da; } - .btn-secondary:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, .fp-viewbar:not(.disabled) a.checked:not(:disabled):not(.disabled), .btn-default:not(:disabled):not(.disabled).active, + .btn-secondary:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, .btn-default:not(:disabled):not(.disabled).active, .show > .btn-secondary.dropdown-toggle, .show > .dropdown-toggle.btn-default { color: #212529; background-color: #b1bbc4; border-color: #aab4bf; } - .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, .fp-viewbar:not(.disabled) a.checked:not(:disabled):not(.disabled):focus, .btn-default:not(:disabled):not(.disabled).active:focus, + .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, .btn-default:not(:disabled):not(.disabled).active:focus, .show > .btn-secondary.dropdown-toggle:focus, .show > .dropdown-toggle.btn-default:focus { box-shadow: 0 0 0 0.2rem rgba(180, 186, 191, 0.5); } @@ -13768,6 +13768,15 @@ body.drawer-ease { vertical-align: -15%; margin-right: 5px; } +.fp-viewbar:not(.disabled) a.checked { + background-color: #b1bbc4; + color: #212529; + border-color: #aab4bf; } + +.fp-viewbar.disabled a { + pointer-events: none; + opacity: 0.65; } + .file-picker .fp-clear-left { clear: left; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index b7c49b9d6cb..722b69d8b4d 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -4101,10 +4101,10 @@ div.backup-section + form { .btn:focus, #page-grade-grading-manage .actions .action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:focus, #rubric-rubric.gradingform_rubric .addcriterion:focus, .btn.focus, #page-grade-grading-manage .actions .focus.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.focus, #rubric-rubric.gradingform_rubric .focus.addcriterion { outline: 0; box-shadow: 0 0 0 0.2rem rgba(17, 119, 209, 0.25); } - .btn.disabled, .fp-viewbar.disabled a, #page-grade-grading-manage .actions .disabled.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.disabled, #rubric-rubric.gradingform_rubric .disabled.addcriterion, .btn:disabled, #page-grade-grading-manage .actions .action:disabled, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:disabled, #rubric-rubric.gradingform_rubric .addcriterion:disabled { + .btn.disabled, #page-grade-grading-manage .actions .disabled.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.disabled, #rubric-rubric.gradingform_rubric .disabled.addcriterion, .btn:disabled, #page-grade-grading-manage .actions .action:disabled, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:disabled, #rubric-rubric.gradingform_rubric .addcriterion:disabled { opacity: 0.65; } -a.btn.disabled, .fp-viewbar.disabled a, #page-grade-grading-manage .actions a.disabled.action, #rubric-rubric.gradingform_rubric a.disabled.addcriterion, +a.btn.disabled, #page-grade-grading-manage .actions a.disabled.action, #rubric-rubric.gradingform_rubric a.disabled.addcriterion, fieldset:disabled a.btn, fieldset:disabled #page-grade-grading-manage .actions a.action, #page-grade-grading-manage .actions fieldset:disabled a.action, @@ -4145,17 +4145,17 @@ fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, border-color: #cbd3da; } .btn-secondary:focus, .btn-default:focus, .btn-secondary.focus, .focus.btn-default { box-shadow: 0 0 0 0.2rem rgba(203, 206, 209, 0.5); } - .btn-secondary.disabled, .fp-viewbar.disabled a, .disabled.btn-default, .btn-secondary:disabled, .btn-default:disabled { + .btn-secondary.disabled, .disabled.btn-default, .btn-secondary:disabled, .btn-default:disabled { color: #212529; background-color: #e9ecef; border-color: #e9ecef; } - .btn-secondary:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, .fp-viewbar:not(.disabled) a.checked:not(:disabled):not(.disabled), .btn-default:not(:disabled):not(.disabled).active, + .btn-secondary:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, .btn-default:not(:disabled):not(.disabled).active, .show > .btn-secondary.dropdown-toggle, .show > .dropdown-toggle.btn-default { color: #212529; background-color: #cbd3da; border-color: #c4ccd4; } - .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, .fp-viewbar:not(.disabled) a.checked:not(:disabled):not(.disabled):focus, .btn-default:not(:disabled):not(.disabled).active:focus, + .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, .btn-default:not(:disabled):not(.disabled).active:focus, .show > .btn-secondary.dropdown-toggle:focus, .show > .dropdown-toggle.btn-default:focus { box-shadow: 0 0 0 0.2rem rgba(203, 206, 209, 0.5); } @@ -14023,6 +14023,15 @@ body.drawer-ease { vertical-align: -15%; margin-right: 5px; } +.fp-viewbar:not(.disabled) a.checked { + background-color: #cbd3da; + color: #212529; + border-color: #c4ccd4; } + +.fp-viewbar.disabled a { + pointer-events: none; + opacity: 0.65; } + .file-picker .fp-clear-left { clear: left; } From 80465b878572a70f14906b22e4685cf50c402b6a Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Tue, 26 Nov 2019 15:31:26 +0100 Subject: [PATCH 17/23] MDL-66999 theme_boost: @extend replace extends in forms The css for .form-buttons, .path-admin... has been removed completely The extend was used to add a grey container which is no longer works --- theme/boost/scss/moodle/forms.scss | 15 +--- theme/boost/style/moodle.css | 120 +++++++---------------------- theme/classic/style/moodle.css | 120 +++++++---------------------- 3 files changed, 61 insertions(+), 194 deletions(-) diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss index 70ad395b274..06a883da727 100644 --- a/theme/boost/scss/moodle/forms.scss +++ b/theme/boost/scss/moodle/forms.scss @@ -123,15 +123,6 @@ input#id_externalurl { font-weight: bold; } -// Pale grey container for submit buttons. -.form-buttons, -.path-admin .buttons, -.fp-content-center form + div, -div.backup-section + form { - @extend .form-group; - padding-left: 0; -} - .form-item .form-setting .defaultsnext > input { display: inline-block; } @@ -471,20 +462,20 @@ textarea[data-auto-rows] { .input-group { &.form-inset { .form-inset-item { - @extend .position-absolute; + position: absolute; padding-top: calc(#{$input-padding-y} + #{$input-border-width}); z-index: 3; } &.form-inset-left { .form-control { - @extend .pl-4; + padding-left: $spacer * 1.5; } } &.form-inset-right { .form-control { - @extend .pr-4; + padding-right: $spacer * 1.5; } .form-inset-item { right: 0; diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 61ed83a303d..c02c5b2ba3d 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -3786,10 +3786,7 @@ select.form-control[size], select.form-control[multiple] { textarea.form-control { height: auto; } -.form-group, .form-buttons, -.path-admin .buttons, -.fp-content-center form + div, -div.backup-section + form { +.form-group { margin-bottom: 1rem; } .form-text { @@ -4036,10 +4033,7 @@ div.backup-section + form { align-items: center; justify-content: center; margin-bottom: 0; } - .form-inline .form-group, .form-inline .form-buttons, - .form-inline .path-admin .buttons, .path-admin .form-inline .buttons, - .form-inline .fp-content-center form + div, .fp-content-center .form-inline form + div, - .form-inline div.backup-section + form { + .form-inline .form-group { display: flex; flex: 0 0 auto; flex-flow: row wrap; @@ -7654,7 +7648,7 @@ button.bg-dark:focus { .position-relative { position: relative !important; } -.position-absolute, .input-group.form-inset .form-inset-item { +.position-absolute { position: absolute !important; } .position-fixed { @@ -7975,7 +7969,7 @@ button.bg-dark:focus { .py-4 { padding-top: 1.5rem !important; } -.pr-4, .input-group.form-inset.form-inset-right .form-control, +.pr-4, .px-4 { padding-right: 1.5rem !important; } @@ -7983,7 +7977,7 @@ button.bg-dark:focus { .py-4 { padding-bottom: 1.5rem !important; } -.pl-4, .input-group.form-inset.form-inset-left .form-control, +.pl-4, .px-4 { padding-left: 1.5rem !important; } @@ -15079,37 +15073,13 @@ body.path-question-type { font: inherit; position: static; padding-right: .3em; } - body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, - body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome, - body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome, - body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.outcome, - body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.outcome, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.outcome, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.outcome, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, - body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.comment, - body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.comment, - body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.comment, - body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.outcome, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.outcome, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.outcome, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.outcome, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.comment, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.comment, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.comment, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .tag_list > b, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .tag_list > b, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .tag_list > b, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .tag_list > b, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .tag_list > b, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .tag_list > b, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .tag_list > b, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .tag_list > b, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .tag_list > b, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .tag_list > b { + body.path-question-type .form-group .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, + body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, + body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b { position: static; width: auto; height: auto; @@ -15741,10 +15711,7 @@ body.path-question-type .mform fieldset.hidden { .mform .form-inline .custom-select { max-width: 100%; } -.mform .form-inline .form-group, .mform .form-inline .form-buttons, -.mform .form-inline .path-admin .buttons, .path-admin .mform .form-inline .buttons, -.mform .form-inline .fp-content-center form + div, .fp-content-center .mform .form-inline form + div, -.mform .form-inline div.backup-section + form { +.mform .form-inline .form-group { margin: 0.1rem 0.25rem 0.1rem 0; } .mform .form-inline br + label { @@ -15762,10 +15729,7 @@ body.path-question-type .mform fieldset.hidden { margin-bottom: 0.5rem; border-bottom: 1px solid #dee2e6; } -.mform > .form-group, .mform > .form-buttons, -.path-admin .mform > .buttons, -.fp-content-center .mform > form + div, -.mform > div.backup-section + form { +.mform > .form-group { margin-left: 1.5rem; } .editor_atto_content.form-control { @@ -15820,12 +15784,6 @@ input#id_externalurl { .no-fitem .fstaticlabel { font-weight: bold; } -.form-buttons, -.path-admin .buttons, -.fp-content-center form + div, -div.backup-section + form { - padding-left: 0; } - .form-item .form-setting .defaultsnext > input { display: inline-block; } @@ -16043,10 +16001,7 @@ textarea[data-auto-rows] { .form-inline .col-md-3 label { margin-left: 1rem; } } -[data-fieldtype="modgrade"] .form-group, [data-fieldtype="modgrade"] .form-buttons, -[data-fieldtype="modgrade"] .path-admin .buttons, .path-admin [data-fieldtype="modgrade"] .buttons, -[data-fieldtype="modgrade"] .fp-content-center form + div, .fp-content-center [data-fieldtype="modgrade"] form + div, -[data-fieldtype="modgrade"] div.backup-section + form { +[data-fieldtype="modgrade"] .form-group { padding-bottom: 0.375rem; } [data-fieldtype="modgrade"] { @@ -16115,9 +16070,16 @@ textarea[data-auto-rows] { background-image: url([[pix:t/collapsed]]); } } .input-group.form-inset .form-inset-item { + position: absolute; padding-top: calc(0.375rem + 1px); z-index: 3; } +.input-group.form-inset.form-inset-left .form-control { + padding-left: 1.5rem; } + +.input-group.form-inset.form-inset-right .form-control { + padding-right: 1.5rem; } + .input-group.form-inset.form-inset-right .form-inset-item { right: 0; } @@ -16884,10 +16846,7 @@ div#dock { width: auto; max-width: none; } -#page-mod-quiz-mod #id_reviewoptionshdr .form-group, #page-mod-quiz-mod #id_reviewoptionshdr .form-buttons, -#page-mod-quiz-mod #id_reviewoptionshdr .path-admin .buttons, .path-admin #page-mod-quiz-mod #id_reviewoptionshdr .buttons, -#page-mod-quiz-mod #id_reviewoptionshdr .fp-content-center form + div, .fp-content-center #page-mod-quiz-mod #id_reviewoptionshdr form + div, -#page-mod-quiz-mod #id_reviewoptionshdr div.backup-section + form { +#page-mod-quiz-mod #id_reviewoptionshdr .form-group { float: left; width: 20rem; display: inline-block; @@ -17204,35 +17163,14 @@ div#dock { .path-backup .mform .root_setting:nth-of-type(even), .path-backup .mform .grouped_settings:nth-of-type(even) { background-color: #fff; } - .path-backup .mform .root_setting .form-group, .path-backup .mform .root_setting .form-buttons, - .path-backup .mform .root_setting .path-admin .buttons, .path-admin .path-backup .mform .root_setting .buttons, - .path-backup .mform .root_setting .fp-content-center form + div, .fp-content-center .path-backup .mform .root_setting form + div, - .path-backup .mform .root_setting div.backup-section + form, - .path-backup .mform .grouped_settings .form-group, - .path-backup .mform .grouped_settings .form-buttons, - .path-backup .mform .grouped_settings .path-admin .buttons, - .path-admin .path-backup .mform .grouped_settings .buttons, - .path-backup .mform .grouped_settings .fp-content-center form + div, - .fp-content-center .path-backup .mform .grouped_settings form + div, - .path-backup .mform .grouped_settings div.backup-section + form { + .path-backup .mform .root_setting .form-group, + .path-backup .mform .grouped_settings .form-group { /* These checkboxes with no label on the left. */ } - .path-backup .mform .root_setting .form-group .col-md-3.checkbox, .path-backup .mform .root_setting .form-buttons .col-md-3.checkbox, .path-backup .mform .root_setting .path-admin .buttons .col-md-3.checkbox, .path-admin .path-backup .mform .root_setting .buttons .col-md-3.checkbox, .path-backup .mform .root_setting .fp-content-center form + div .col-md-3.checkbox, .fp-content-center .path-backup .mform .root_setting form + div .col-md-3.checkbox, .path-backup .mform .root_setting div.backup-section + form .col-md-3.checkbox, - .path-backup .mform .grouped_settings .form-group .col-md-3.checkbox, - .path-backup .mform .grouped_settings .form-buttons .col-md-3.checkbox, - .path-backup .mform .grouped_settings .path-admin .buttons .col-md-3.checkbox, - .path-admin .path-backup .mform .grouped_settings .buttons .col-md-3.checkbox, - .path-backup .mform .grouped_settings .fp-content-center form + div .col-md-3.checkbox, - .fp-content-center .path-backup .mform .grouped_settings form + div .col-md-3.checkbox, - .path-backup .mform .grouped_settings div.backup-section + form .col-md-3.checkbox { + .path-backup .mform .root_setting .form-group .col-md-3.checkbox, + .path-backup .mform .grouped_settings .form-group .col-md-3.checkbox { width: 0%; } - .path-backup .mform .root_setting .form-group .col-md-9.checkbox, .path-backup .mform .root_setting .form-buttons .col-md-9.checkbox, .path-backup .mform .root_setting .path-admin .buttons .col-md-9.checkbox, .path-admin .path-backup .mform .root_setting .buttons .col-md-9.checkbox, .path-backup .mform .root_setting .fp-content-center form + div .col-md-9.checkbox, .fp-content-center .path-backup .mform .root_setting form + div .col-md-9.checkbox, .path-backup .mform .root_setting div.backup-section + form .col-md-9.checkbox, - .path-backup .mform .grouped_settings .form-group .col-md-9.checkbox, - .path-backup .mform .grouped_settings .form-buttons .col-md-9.checkbox, - .path-backup .mform .grouped_settings .path-admin .buttons .col-md-9.checkbox, - .path-admin .path-backup .mform .grouped_settings .buttons .col-md-9.checkbox, - .path-backup .mform .grouped_settings .fp-content-center form + div .col-md-9.checkbox, - .fp-content-center .path-backup .mform .grouped_settings form + div .col-md-9.checkbox, - .path-backup .mform .grouped_settings div.backup-section + form .col-md-9.checkbox { + .path-backup .mform .root_setting .form-group .col-md-9.checkbox, + .path-backup .mform .grouped_settings .form-group .col-md-9.checkbox { width: 100%; left: 0; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 722b69d8b4d..166659bb040 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -3790,10 +3790,7 @@ select.form-control[size], select.form-control[multiple] { textarea.form-control { height: auto; } -.form-group, .form-buttons, -.path-admin .buttons, -.fp-content-center form + div, -div.backup-section + form { +.form-group { margin-bottom: 1rem; } .form-text { @@ -4042,10 +4039,7 @@ div.backup-section + form { align-items: center; justify-content: center; margin-bottom: 0; } - .form-inline .form-group, .form-inline .form-buttons, - .form-inline .path-admin .buttons, .path-admin .form-inline .buttons, - .form-inline .fp-content-center form + div, .fp-content-center .form-inline form + div, - .form-inline div.backup-section + form { + .form-inline .form-group { display: flex; flex: 0 0 auto; flex-flow: row wrap; @@ -7897,7 +7891,7 @@ button.bg-dark:focus { .position-relative { position: relative !important; } -.position-absolute, .input-group.form-inset .form-inset-item { +.position-absolute { position: absolute !important; } .position-fixed { @@ -8218,7 +8212,7 @@ button.bg-dark:focus { .py-4 { padding-top: 1.5rem !important; } -.pr-4, .input-group.form-inset.form-inset-right .form-control, +.pr-4, .px-4 { padding-right: 1.5rem !important; } @@ -8226,7 +8220,7 @@ button.bg-dark:focus { .py-4 { padding-bottom: 1.5rem !important; } -.pl-4, .input-group.form-inset.form-inset-left .form-control, +.pl-4, .px-4 { padding-left: 1.5rem !important; } @@ -15337,37 +15331,13 @@ body.path-question-type { font: inherit; position: static; padding-right: .3em; } - body.path-question-type .form-group .sr-only, body.path-question-type .form-buttons .sr-only, body.path-question-type .path-admin .buttons .sr-only, .path-admin body.path-question-type .buttons .sr-only, body.path-question-type .fp-content-center form + div .sr-only, .fp-content-center body.path-question-type form + div .sr-only, body.path-question-type div.backup-section + form .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, - body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome, - body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome, - body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.outcome, - body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.outcome, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.outcome, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.outcome, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, - body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.comment, - body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.comment, - body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.comment, - body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .alert.discussionlocked, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .alert.discussionlocked, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .alert.discussionlocked, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .alert.discussionlocked, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .alert.discussionlocked, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.formulation, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.formulation, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.formulation, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.formulation, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.formulation, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.formulation, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.outcome, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.outcome, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.outcome, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.outcome, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.outcome, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.outcome, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.outcome, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.outcome, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.outcome, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-buttons .discussionlocked.comment, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que .path-admin body.path-question-type .buttons .discussionlocked.comment, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que .fp-content-center body.path-question-type form + div .discussionlocked.comment, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.comment, body.path-question-type .path-admin .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.comment, .path-admin body.path-question-type .buttons .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.comment, body.path-question-type .fp-content-center form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.comment, .fp-content-center body.path-question-type form + div .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.comment, body.path-question-type div.backup-section + form .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .discussionlocked.label, body.path-question-type .path-admin .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .discussionlocked.label, .path-admin body.path-question-type .buttons .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .discussionlocked.label, body.path-question-type .fp-content-center form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .discussionlocked.label, .fp-content-center body.path-question-type form + div .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .discussionlocked.label, body.path-question-type div.backup-section + form .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, body.path-question-type .form-buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-buttons .tag_list > b, body.path-question-type .path-admin .buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode .path-admin body.path-question-type .buttons .tag_list > b, body.path-question-type .fp-content-center form + div .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .fp-content-center form + div .tag_list > b, .fp-content-center body.path-question-type form + div .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode .fp-content-center body.path-question-type form + div .tag_list > b, body.path-question-type div.backup-section + form .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type div.backup-section + form .tag_list > b, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b, - body.path-question-type .form-buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-buttons .tag_list > b, - body.path-question-type .path-admin .buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .path-admin .buttons .tag_list > b, .path-admin body.path-question-type .buttons .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .path-admin body.path-question-type .buttons .tag_list > b, - body.path-question-type .fp-content-center form + div .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .fp-content-center form + div .tag_list > b, .fp-content-center body.path-question-type form + div .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .fp-content-center body.path-question-type form + div .tag_list > b, - body.path-question-type div.backup-section + form .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type div.backup-section + form .tag_list > b { + body.path-question-type .form-group .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, + body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, + body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b { position: static; width: auto; height: auto; @@ -16004,10 +15974,7 @@ body.path-question-type .mform fieldset.hidden { .mform .form-inline .custom-select { max-width: 100%; } -.mform .form-inline .form-group, .mform .form-inline .form-buttons, -.mform .form-inline .path-admin .buttons, .path-admin .mform .form-inline .buttons, -.mform .form-inline .fp-content-center form + div, .fp-content-center .mform .form-inline form + div, -.mform .form-inline div.backup-section + form { +.mform .form-inline .form-group { margin: 0.1rem 0.25rem 0.1rem 0; } .mform .form-inline br + label { @@ -16025,10 +15992,7 @@ body.path-question-type .mform fieldset.hidden { margin-bottom: 0.5rem; border-bottom: 1px solid #dee2e6; } -.mform > .form-group, .mform > .form-buttons, -.path-admin .mform > .buttons, -.fp-content-center .mform > form + div, -.mform > div.backup-section + form { +.mform > .form-group { margin-left: 1.5rem; } .editor_atto_content.form-control { @@ -16083,12 +16047,6 @@ input#id_externalurl { .no-fitem .fstaticlabel { font-weight: bold; } -.form-buttons, -.path-admin .buttons, -.fp-content-center form + div, -div.backup-section + form { - padding-left: 0; } - .form-item .form-setting .defaultsnext > input { display: inline-block; } @@ -16307,10 +16265,7 @@ textarea[data-auto-rows] { .form-inline .col-md-3 label { margin-left: 1rem; } } -[data-fieldtype="modgrade"] .form-group, [data-fieldtype="modgrade"] .form-buttons, -[data-fieldtype="modgrade"] .path-admin .buttons, .path-admin [data-fieldtype="modgrade"] .buttons, -[data-fieldtype="modgrade"] .fp-content-center form + div, .fp-content-center [data-fieldtype="modgrade"] form + div, -[data-fieldtype="modgrade"] div.backup-section + form { +[data-fieldtype="modgrade"] .form-group { padding-bottom: 0.375rem; } [data-fieldtype="modgrade"] { @@ -16380,9 +16335,16 @@ textarea[data-auto-rows] { background-image: url([[pix:t/collapsed]]); } } .input-group.form-inset .form-inset-item { + position: absolute; padding-top: calc(0.375rem + 1px); z-index: 3; } +.input-group.form-inset.form-inset-left .form-control { + padding-left: 1.5rem; } + +.input-group.form-inset.form-inset-right .form-control { + padding-right: 1.5rem; } + .input-group.form-inset.form-inset-right .form-inset-item { right: 0; } @@ -17149,10 +17111,7 @@ div#dock { width: auto; max-width: none; } -#page-mod-quiz-mod #id_reviewoptionshdr .form-group, #page-mod-quiz-mod #id_reviewoptionshdr .form-buttons, -#page-mod-quiz-mod #id_reviewoptionshdr .path-admin .buttons, .path-admin #page-mod-quiz-mod #id_reviewoptionshdr .buttons, -#page-mod-quiz-mod #id_reviewoptionshdr .fp-content-center form + div, .fp-content-center #page-mod-quiz-mod #id_reviewoptionshdr form + div, -#page-mod-quiz-mod #id_reviewoptionshdr div.backup-section + form { +#page-mod-quiz-mod #id_reviewoptionshdr .form-group { float: left; width: 20rem; display: inline-block; @@ -17472,35 +17431,14 @@ div#dock { .path-backup .mform .root_setting:nth-of-type(even), .path-backup .mform .grouped_settings:nth-of-type(even) { background-color: #fff; } - .path-backup .mform .root_setting .form-group, .path-backup .mform .root_setting .form-buttons, - .path-backup .mform .root_setting .path-admin .buttons, .path-admin .path-backup .mform .root_setting .buttons, - .path-backup .mform .root_setting .fp-content-center form + div, .fp-content-center .path-backup .mform .root_setting form + div, - .path-backup .mform .root_setting div.backup-section + form, - .path-backup .mform .grouped_settings .form-group, - .path-backup .mform .grouped_settings .form-buttons, - .path-backup .mform .grouped_settings .path-admin .buttons, - .path-admin .path-backup .mform .grouped_settings .buttons, - .path-backup .mform .grouped_settings .fp-content-center form + div, - .fp-content-center .path-backup .mform .grouped_settings form + div, - .path-backup .mform .grouped_settings div.backup-section + form { + .path-backup .mform .root_setting .form-group, + .path-backup .mform .grouped_settings .form-group { /* These checkboxes with no label on the left. */ } - .path-backup .mform .root_setting .form-group .col-md-3.checkbox, .path-backup .mform .root_setting .form-buttons .col-md-3.checkbox, .path-backup .mform .root_setting .path-admin .buttons .col-md-3.checkbox, .path-admin .path-backup .mform .root_setting .buttons .col-md-3.checkbox, .path-backup .mform .root_setting .fp-content-center form + div .col-md-3.checkbox, .fp-content-center .path-backup .mform .root_setting form + div .col-md-3.checkbox, .path-backup .mform .root_setting div.backup-section + form .col-md-3.checkbox, - .path-backup .mform .grouped_settings .form-group .col-md-3.checkbox, - .path-backup .mform .grouped_settings .form-buttons .col-md-3.checkbox, - .path-backup .mform .grouped_settings .path-admin .buttons .col-md-3.checkbox, - .path-admin .path-backup .mform .grouped_settings .buttons .col-md-3.checkbox, - .path-backup .mform .grouped_settings .fp-content-center form + div .col-md-3.checkbox, - .fp-content-center .path-backup .mform .grouped_settings form + div .col-md-3.checkbox, - .path-backup .mform .grouped_settings div.backup-section + form .col-md-3.checkbox { + .path-backup .mform .root_setting .form-group .col-md-3.checkbox, + .path-backup .mform .grouped_settings .form-group .col-md-3.checkbox { width: 0%; } - .path-backup .mform .root_setting .form-group .col-md-9.checkbox, .path-backup .mform .root_setting .form-buttons .col-md-9.checkbox, .path-backup .mform .root_setting .path-admin .buttons .col-md-9.checkbox, .path-admin .path-backup .mform .root_setting .buttons .col-md-9.checkbox, .path-backup .mform .root_setting .fp-content-center form + div .col-md-9.checkbox, .fp-content-center .path-backup .mform .root_setting form + div .col-md-9.checkbox, .path-backup .mform .root_setting div.backup-section + form .col-md-9.checkbox, - .path-backup .mform .grouped_settings .form-group .col-md-9.checkbox, - .path-backup .mform .grouped_settings .form-buttons .col-md-9.checkbox, - .path-backup .mform .grouped_settings .path-admin .buttons .col-md-9.checkbox, - .path-admin .path-backup .mform .grouped_settings .buttons .col-md-9.checkbox, - .path-backup .mform .grouped_settings .fp-content-center form + div .col-md-9.checkbox, - .fp-content-center .path-backup .mform .grouped_settings form + div .col-md-9.checkbox, - .path-backup .mform .grouped_settings div.backup-section + form .col-md-9.checkbox { + .path-backup .mform .root_setting .form-group .col-md-9.checkbox, + .path-backup .mform .grouped_settings .form-group .col-md-9.checkbox { width: 100%; left: 0; } From 40ea67534cc7f4652f68222b1a11acdc94181f45 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 27 Nov 2019 10:49:19 +0100 Subject: [PATCH 18/23] MDL-66999 theme_boost: @extend remove extends for tables --- admin/renderer.php | 4 +- admin/roles/classes/capability_table_base.php | 2 +- .../roles/classes/check_capability_table.php | 1 + .../classes/define_role_table_advanced.php | 1 + admin/tool/capability/index.php | 2 +- .../actions/main_view/main_view.class.php | 3 +- admin/user.php | 2 +- backup/util/ui/renderer.php | 4 +- enrol/renderer.php | 2 +- lib/tablelib.php | 6 +- lib/tests/behat/behat_permissions.php | 3 +- mod/workshop/renderer.php | 2 +- report/log/classes/table_log.php | 2 +- report/loglive/classes/table_log.php | 2 +- theme/boost/scss/moodle.scss | 1 - theme/boost/scss/moodle/expendable.scss | 29 ++- theme/boost/scss/moodle/tables.scss | 50 ++++- theme/boost/style/moodle.css | 200 +++++++----------- theme/classic/style/moodle.css | 200 +++++++----------- 19 files changed, 226 insertions(+), 290 deletions(-) diff --git a/admin/renderer.php b/admin/renderer.php index fb4ce524522..5ba612e10b1 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -1902,7 +1902,7 @@ class core_admin_renderer extends plugin_renderer_base { get_string('status'), ); $servertable->colclasses = array('centeralign name', 'centeralign info', 'leftalign report', 'leftalign plugin', 'centeralign status'); - $servertable->attributes['class'] = 'admintable environmenttable generaltable'; + $servertable->attributes['class'] = 'admintable environmenttable generaltable table-sm'; $servertable->id = 'serverstatus'; $serverdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array()); @@ -1915,7 +1915,7 @@ class core_admin_renderer extends plugin_renderer_base { get_string('status'), ); $othertable->colclasses = array('aligncenter info', 'alignleft report', 'alignleft plugin', 'aligncenter status'); - $othertable->attributes['class'] = 'admintable environmenttable generaltable'; + $othertable->attributes['class'] = 'admintable environmenttable generaltable table-sm'; $othertable->id = 'otherserverstatus'; $otherdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array()); diff --git a/admin/roles/classes/capability_table_base.php b/admin/roles/classes/capability_table_base.php index 2765659f851..ab45e085861 100644 --- a/admin/roles/classes/capability_table_base.php +++ b/admin/roles/classes/capability_table_base.php @@ -43,7 +43,7 @@ abstract class core_role_capability_table_base { protected $id; /** Added to the class="" attribute on output. */ - protected $classes = array('rolecap'); + protected $classes = array('rolecap table-hover'); /** Default number of capabilities in the table for the search UI to be shown. */ const NUM_CAPS_FOR_SEARCH = 12; diff --git a/admin/roles/classes/check_capability_table.php b/admin/roles/classes/check_capability_table.php index b716ae50747..99e8c2ea38c 100644 --- a/admin/roles/classes/check_capability_table.php +++ b/admin/roles/classes/check_capability_table.php @@ -50,6 +50,7 @@ class core_role_check_capability_table extends core_role_capability_table_base { $this->contextname = $contextname; $this->stryes = get_string('yes'); $this->strno = get_string('no'); + $this->add_classes(['table-striped']); } protected function add_header_cells() { diff --git a/admin/roles/classes/define_role_table_advanced.php b/admin/roles/classes/define_role_table_advanced.php index f4ab5625bb7..c0e3d8d5ab8 100644 --- a/admin/roles/classes/define_role_table_advanced.php +++ b/admin/roles/classes/define_role_table_advanced.php @@ -55,6 +55,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi foreach ($levels as $level => $classname) { $this->allcontextlevels[$level] = context_helper::get_level_name($level); } + $this->add_classes(['table-striped']); } protected function load_current_permissions() { diff --git a/admin/tool/capability/index.php b/admin/tool/capability/index.php index 57f071678c8..96a23d34f4e 100644 --- a/admin/tool/capability/index.php +++ b/admin/tool/capability/index.php @@ -138,7 +138,7 @@ function print_report_tree($contextid, $contexts, $allroles) { // If there are any role overrides here, print them. if (!empty($contexts[$contextid]->rolecapabilities)) { $rowcounter = 0; - echo ''; + echo '
'; foreach ($allroles as $role) { if (isset($contexts[$contextid]->rolecapabilities[$role->id])) { $permission = $contexts[$contextid]->rolecapabilities[$role->id]; diff --git a/admin/tool/xmldb/actions/main_view/main_view.class.php b/admin/tool/xmldb/actions/main_view/main_view.class.php index feef78ae00f..7a37f8eb1ad 100644 --- a/admin/tool/xmldb/actions/main_view/main_view.class.php +++ b/admin/tool/xmldb/actions/main_view/main_view.class.php @@ -120,7 +120,8 @@ class main_view extends XMLDBAction { $result = $this->launch('get_db_directories'); // Display list of DB directories if everything is ok if ($result && !empty($XMLDB->dbdirs)) { - $o .= '
'; + $o .= '
'; $row = 0; foreach ($XMLDB->dbdirs as $key => $dbdir) { // Detect if this is the lastused dir diff --git a/admin/user.php b/admin/user.php index 216906ccf4d..a06b2edc047 100644 --- a/admin/user.php +++ b/admin/user.php @@ -300,7 +300,7 @@ $table->head = array (); $table->colclasses = array(); $table->head[] = $fullnamedisplay; - $table->attributes['class'] = 'admintable generaltable'; + $table->attributes['class'] = 'admintable generaltable table-sm'; foreach ($extracolumns as $field) { $table->head[] = ${$field}; } diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php index 8caf0140977..c5312609277 100644 --- a/backup/util/ui/renderer.php +++ b/backup/util/ui/renderer.php @@ -717,7 +717,7 @@ class core_backup_renderer extends plugin_renderer_base { $url = $component->get_url(); $output = html_writer::start_tag('div', array('class' => 'restore-course-search form-inline mb-1')); - $output .= html_writer::start_tag('div', array('class' => 'rcs-results w-75')); + $output .= html_writer::start_tag('div', array('class' => 'rcs-results table-sm w-75')); $table = new html_table(); $table->head = array('', get_string('shortnamecourse'), get_string('fullnamecourse')); @@ -877,7 +877,7 @@ class core_backup_renderer extends plugin_renderer_base { $url = $component->get_url(); $output = html_writer::start_tag('div', array('class' => 'restore-course-search form-inline mb-1')); - $output .= html_writer::start_tag('div', array('class' => 'rcs-results w-75')); + $output .= html_writer::start_tag('div', array('class' => 'rcs-results table-sm w-75')); $table = new html_table(); $table->head = array('', get_string('name'), get_string('description')); diff --git a/enrol/renderer.php b/enrol/renderer.php index bb88d11bce7..8c572d1ae30 100644 --- a/enrol/renderer.php +++ b/enrol/renderer.php @@ -370,7 +370,7 @@ class course_enrolment_table extends html_table implements renderable { $this->sort = optional_param(self::SORTVAR, self::DEFAULTSORT, PARAM_ALPHANUM); $this->sortdirection = optional_param(self::SORTDIRECTIONVAR, self::DEFAULTSORTDIRECTION, PARAM_ALPHA); - $this->attributes = array('class'=>'userenrolment'); + $this->attributes = array('class' => 'userenrolment table-striped'); if (!in_array($this->sort, self::$sortablefields)) { $this->sort = self::DEFAULTSORT; } diff --git a/lib/tablelib.php b/lib/tablelib.php index 81a944a308e..c1093c268c9 100644 --- a/lib/tablelib.php +++ b/lib/tablelib.php @@ -574,11 +574,11 @@ class flexible_table { // Always introduce the "flexible" class for the table if not specified if (empty($this->attributes)) { - $this->attributes['class'] = 'flexible'; + $this->attributes['class'] = 'flexible table table-striped table-hover'; } else if (!isset($this->attributes['class'])) { - $this->attributes['class'] = 'flexible'; + $this->attributes['class'] = 'flexible table table-striped table-hover'; } else if (!in_array('flexible', explode(' ', $this->attributes['class']))) { - $this->attributes['class'] = trim('flexible ' . $this->attributes['class']); + $this->attributes['class'] = trim('flexible table table-striped table-hover ' . $this->attributes['class']); } } diff --git a/lib/tests/behat/behat_permissions.php b/lib/tests/behat/behat_permissions.php index 842e320be7c..b0bca4842f6 100644 --- a/lib/tests/behat/behat_permissions.php +++ b/lib/tests/behat/behat_permissions.php @@ -156,7 +156,8 @@ class behat_permissions extends behat_base { public function capability_has_permission($capabilityname, $permission) { // We already know the name, so we just need the value. - $radioxpath = "//table[@class='rolecap']/descendant::input[@type='radio']" . + $radioxpath = "//table[contains(concat(' ', + normalize-space(@class), ' '), ' rolecap ')]/descendant::input[@type='radio']" . "[@name='" . $capabilityname . "'][@checked]"; $checkedradio = $this->find('xpath', $radioxpath); diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php index 289b5e8ecf8..350c8810ea3 100644 --- a/mod/workshop/renderer.php +++ b/mod/workshop/renderer.php @@ -425,7 +425,7 @@ class mod_workshop_renderer extends plugin_renderer_base { } $table = new html_table(); - $table->attributes['class'] = 'grading-report'; + $table->attributes['class'] = 'grading-report table-striped table-hover'; $sortbyfirstname = $this->helper_sortable_heading(get_string('firstname'), 'firstname', $options->sortby, $options->sorthow); $sortbylastname = $this->helper_sortable_heading(get_string('lastname'), 'lastname', $options->sortby, $options->sorthow); diff --git a/report/log/classes/table_log.php b/report/log/classes/table_log.php index 68c866b07bb..f65aabb8cb7 100644 --- a/report/log/classes/table_log.php +++ b/report/log/classes/table_log.php @@ -59,7 +59,7 @@ class report_log_table_log extends table_sql { public function __construct($uniqueid, $filterparams = null) { parent::__construct($uniqueid); - $this->set_attribute('class', 'reportlog generaltable generalbox'); + $this->set_attribute('class', 'reportlog generaltable generalbox table-sm'); $this->filterparams = $filterparams; // Add course column if logs are displayed for site. $cols = array(); diff --git a/report/loglive/classes/table_log.php b/report/loglive/classes/table_log.php index 848a5dd50dc..798a801467a 100644 --- a/report/loglive/classes/table_log.php +++ b/report/loglive/classes/table_log.php @@ -64,7 +64,7 @@ class report_loglive_table_log extends table_sql { public function __construct($uniqueid, $filterparams = null) { parent::__construct($uniqueid); - $this->set_attribute('class', 'reportloglive generaltable generalbox'); + $this->set_attribute('class', 'reportloglive generaltable table-sm'); $this->set_attribute('aria-live', 'polite'); $this->filterparams = $filterparams; // Add course column if logs are displayed for site. diff --git a/theme/boost/scss/moodle.scss b/theme/boost/scss/moodle.scss index d79cd5a2e2d..fe534cdcb74 100644 --- a/theme/boost/scss/moodle.scss +++ b/theme/boost/scss/moodle.scss @@ -34,7 +34,6 @@ $breadcrumb-divider-rtl: "◀" !default; @import "moodle/templates"; @import "moodle/undo"; @import "moodle/debug"; -@import "moodle/expendable"; @import "moodle/sticky-footer"; @import "moodle/popover-region"; @import "moodle/tool_usertours"; diff --git a/theme/boost/scss/moodle/expendable.scss b/theme/boost/scss/moodle/expendable.scss index def05bd5630..7b608fabbe4 100644 --- a/theme/boost/scss/moodle/expendable.scss +++ b/theme/boost/scss/moodle/expendable.scss @@ -1,15 +1,8 @@ -table#explaincaps, -table#defineroletable, -table.grading-report, -table#listdirectories, -table.rolecaps, -table.userenrolment, -form#movecourses table, -#page-admin-course-index .editcourse, -.forumheaderlist, table.flexible, .generaltable { - @extend .table-striped; + tbody tr:nth-of-type(#{$table-striped-order}) { + background-color: $table-accent-bg; + } } table { @@ -28,17 +21,23 @@ table { #page-admin-user table, .environmenttable, .category_subcategories, -.rcs-results, -table#listdirectories { - @extend .table-sm; +.rcs-results { + th, + td { + padding: $table-cell-padding-sm; + } } -table.grading-report, .forumheaderlist, .generaltable, table.flexible, .category_subcategories, table#modules, table#permissions { - @extend .table-hover; + tbody tr { + @include hover { + color: $table-hover-color; + background-color: $table-hover-bg; + } + } } diff --git a/theme/boost/scss/moodle/tables.scss b/theme/boost/scss/moodle/tables.scss index 24ab7f127cf..d5e89395981 100644 --- a/theme/boost/scss/moodle/tables.scss +++ b/theme/boost/scss/moodle/tables.scss @@ -1,6 +1,48 @@ -table.flexible, .generaltable { - @extend .table; + width: 100%; + margin-bottom: $spacer; + color: $table-color; + background-color: $table-bg; // Reset for nesting within parents with `background-color`. + + th, + td { + padding: $table-cell-padding; + vertical-align: top; + border-top: $table-border-width solid $table-border-color; + } + + thead th { + vertical-align: bottom; + border-bottom: (2 * $table-border-width) solid $table-border-color; + } + + tbody + tbody { + border-top: (2 * $table-border-width) solid $table-border-color; + } + + tbody tr:nth-of-type(#{$table-striped-order}) { + background-color: $table-accent-bg; + } + &.table-sm { + th, + td { + padding: $table-cell-padding-sm; + } + } + tbody tr { + @include hover { + color: $table-hover-color; + background-color: $table-hover-bg; + } + } +} + +table { + caption { + font-size: 24px; + font-weight: bold; + line-height: 42px; + text-align: left; + caption-side: top; + } } -// fancier table styles moved to expendable.less -// to shift after 4096 selector break diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index c02c5b2ba3d..c0a61513ab3 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -3361,34 +3361,23 @@ pre { .offset-xl-11 { margin-left: 91.6666666667%; } } -.table, table.flexible, -.generaltable { +.table { width: 100%; margin-bottom: 1rem; color: #373a3c; } - .table th, table.flexible th, .generaltable th, - .table td, - table.flexible td, - .generaltable td { + .table th, + .table td { padding: 0.75rem; vertical-align: top; border-top: 1px solid #dee2e6; } - .table thead th, table.flexible thead th, .generaltable thead th { + .table thead th { vertical-align: bottom; border-bottom: 2px solid #dee2e6; } - .table tbody + tbody, table.flexible tbody + tbody, .generaltable tbody + tbody { + .table tbody + tbody { border-top: 2px solid #dee2e6; } -.table-sm th, #page-report-loglive-index .generaltable th, #page-admin-report-log-index .generaltable th, #page-report-log-user .generaltable th, #page-admin-user table th, .environmenttable th, .category_subcategories th, .rcs-results th, table#listdirectories th, -.table-sm td, -#page-report-loglive-index .generaltable td, -#page-admin-report-log-index .generaltable td, -#page-report-log-user .generaltable td, -#page-admin-user table td, -.environmenttable td, -.category_subcategories td, -.rcs-results td, -table#listdirectories td { +.table-sm th, +.table-sm td { padding: 0.3rem; } .table-bordered { @@ -3406,10 +3395,10 @@ table#listdirectories td { .table-borderless tbody + tbody { border: 0; } -.table-striped tbody tr:nth-of-type(odd), table#explaincaps tbody tr:nth-of-type(odd), table#defineroletable tbody tr:nth-of-type(odd), table.grading-report tbody tr:nth-of-type(odd), table#listdirectories tbody tr:nth-of-type(odd), table.rolecaps tbody tr:nth-of-type(odd), table.userenrolment tbody tr:nth-of-type(odd), form#movecourses table tbody tr:nth-of-type(odd), #page-admin-course-index .editcourse tbody tr:nth-of-type(odd), .forumheaderlist tbody tr:nth-of-type(odd), table.flexible tbody tr:nth-of-type(odd), .generaltable tbody tr:nth-of-type(odd) { +.table-striped tbody tr:nth-of-type(odd) { background-color: rgba(0, 0, 0, 0.05); } -.table-hover tbody tr:hover, table.grading-report tbody tr:hover, .forumheaderlist tbody tr:hover, .generaltable tbody tr:hover, table.flexible tbody tr:hover, .category_subcategories tbody tr:hover, table#modules tbody tr:hover, table#permissions tbody tr:hover { +.table-hover tbody tr:hover { color: #373a3c; background-color: rgba(0, 0, 0, 0.075); } @@ -3424,17 +3413,10 @@ table#listdirectories td { .table-primary tbody + tbody { border-color: #83b8e7; } -.table-hover .table-primary:hover, table.grading-report .table-primary:hover, .forumheaderlist .table-primary:hover, .generaltable .table-primary:hover, table.flexible .table-primary:hover, .category_subcategories .table-primary:hover, table#modules .table-primary:hover, table#permissions .table-primary:hover { +.table-hover .table-primary:hover { background-color: #a7cdee; } - .table-hover .table-primary:hover > td, table.grading-report .table-primary:hover > td, .forumheaderlist .table-primary:hover > td, .generaltable .table-primary:hover > td, table.flexible .table-primary:hover > td, .category_subcategories .table-primary:hover > td, table#modules .table-primary:hover > td, table#permissions .table-primary:hover > td, - .table-hover .table-primary:hover > th, - table.grading-report .table-primary:hover > th, - .forumheaderlist .table-primary:hover > th, - .generaltable .table-primary:hover > th, - table.flexible .table-primary:hover > th, - .category_subcategories .table-primary:hover > th, - table#modules .table-primary:hover > th, - table#permissions .table-primary:hover > th { + .table-hover .table-primary:hover > td, + .table-hover .table-primary:hover > th { background-color: #a7cdee; } .table-secondary, @@ -3448,17 +3430,10 @@ table#listdirectories td { .table-secondary tbody + tbody { border-color: #e6e9ec; } -.table-hover .table-secondary:hover, table.grading-report .table-secondary:hover, .forumheaderlist .table-secondary:hover, .generaltable .table-secondary:hover, table.flexible .table-secondary:hover, .category_subcategories .table-secondary:hover, table#modules .table-secondary:hover, table#permissions .table-secondary:hover { +.table-hover .table-secondary:hover { background-color: #e2e6ea; } - .table-hover .table-secondary:hover > td, table.grading-report .table-secondary:hover > td, .forumheaderlist .table-secondary:hover > td, .generaltable .table-secondary:hover > td, table.flexible .table-secondary:hover > td, .category_subcategories .table-secondary:hover > td, table#modules .table-secondary:hover > td, table#permissions .table-secondary:hover > td, - .table-hover .table-secondary:hover > th, - table.grading-report .table-secondary:hover > th, - .forumheaderlist .table-secondary:hover > th, - .generaltable .table-secondary:hover > th, - table.flexible .table-secondary:hover > th, - .category_subcategories .table-secondary:hover > th, - table#modules .table-secondary:hover > th, - table#permissions .table-secondary:hover > th { + .table-hover .table-secondary:hover > td, + .table-hover .table-secondary:hover > th { background-color: #e2e6ea; } .table-success, @@ -3472,17 +3447,10 @@ table#listdirectories td { .table-success tbody + tbody { border-color: #aadaaa; } -.table-hover .table-success:hover, table.grading-report .table-success:hover, .forumheaderlist .table-success:hover, .generaltable .table-success:hover, table.flexible .table-success:hover, .category_subcategories .table-success:hover, table#modules .table-success:hover, table#permissions .table-success:hover { +.table-hover .table-success:hover { background-color: #bfe3bf; } - .table-hover .table-success:hover > td, table.grading-report .table-success:hover > td, .forumheaderlist .table-success:hover > td, .generaltable .table-success:hover > td, table.flexible .table-success:hover > td, .category_subcategories .table-success:hover > td, table#modules .table-success:hover > td, table#permissions .table-success:hover > td, - .table-hover .table-success:hover > th, - table.grading-report .table-success:hover > th, - .forumheaderlist .table-success:hover > th, - .generaltable .table-success:hover > th, - table.flexible .table-success:hover > th, - .category_subcategories .table-success:hover > th, - table#modules .table-success:hover > th, - table#permissions .table-success:hover > th { + .table-hover .table-success:hover > td, + .table-hover .table-success:hover > th { background-color: #bfe3bf; } .table-info, @@ -3496,17 +3464,10 @@ table#listdirectories td { .table-info tbody + tbody { border-color: #aadeee; } -.table-hover .table-info:hover, table.grading-report .table-info:hover, .forumheaderlist .table-info:hover, .generaltable .table-info:hover, table.flexible .table-info:hover, .category_subcategories .table-info:hover, table#modules .table-info:hover, table#permissions .table-info:hover { +.table-hover .table-info:hover { background-color: #bce5f2; } - .table-hover .table-info:hover > td, table.grading-report .table-info:hover > td, .forumheaderlist .table-info:hover > td, .generaltable .table-info:hover > td, table.flexible .table-info:hover > td, .category_subcategories .table-info:hover > td, table#modules .table-info:hover > td, table#permissions .table-info:hover > td, - .table-hover .table-info:hover > th, - table.grading-report .table-info:hover > th, - .forumheaderlist .table-info:hover > th, - .generaltable .table-info:hover > th, - table.flexible .table-info:hover > th, - .category_subcategories .table-info:hover > th, - table#modules .table-info:hover > th, - table#permissions .table-info:hover > th { + .table-hover .table-info:hover > td, + .table-hover .table-info:hover > th { background-color: #bce5f2; } .table-warning, @@ -3520,17 +3481,10 @@ table#listdirectories td { .table-warning tbody + tbody { border-color: #f7d4a3; } -.table-hover .table-warning:hover, table.grading-report .table-warning:hover, .forumheaderlist .table-warning:hover, .generaltable .table-warning:hover, table.flexible .table-warning:hover, .category_subcategories .table-warning:hover, table#modules .table-warning:hover, table#permissions .table-warning:hover { +.table-hover .table-warning:hover { background-color: #f9ddb5; } - .table-hover .table-warning:hover > td, table.grading-report .table-warning:hover > td, .forumheaderlist .table-warning:hover > td, .generaltable .table-warning:hover > td, table.flexible .table-warning:hover > td, .category_subcategories .table-warning:hover > td, table#modules .table-warning:hover > td, table#permissions .table-warning:hover > td, - .table-hover .table-warning:hover > th, - table.grading-report .table-warning:hover > th, - .forumheaderlist .table-warning:hover > th, - .generaltable .table-warning:hover > th, - table.flexible .table-warning:hover > th, - .category_subcategories .table-warning:hover > th, - table#modules .table-warning:hover > th, - table#permissions .table-warning:hover > th { + .table-hover .table-warning:hover > td, + .table-hover .table-warning:hover > th { background-color: #f9ddb5; } .table-danger, @@ -3544,17 +3498,10 @@ table#listdirectories td { .table-danger tbody + tbody { border-color: #eba6a3; } -.table-hover .table-danger:hover, table.grading-report .table-danger:hover, .forumheaderlist .table-danger:hover, .generaltable .table-danger:hover, table.flexible .table-danger:hover, .category_subcategories .table-danger:hover, table#modules .table-danger:hover, table#permissions .table-danger:hover { +.table-hover .table-danger:hover { background-color: #efbbb9; } - .table-hover .table-danger:hover > td, table.grading-report .table-danger:hover > td, .forumheaderlist .table-danger:hover > td, .generaltable .table-danger:hover > td, table.flexible .table-danger:hover > td, .category_subcategories .table-danger:hover > td, table#modules .table-danger:hover > td, table#permissions .table-danger:hover > td, - .table-hover .table-danger:hover > th, - table.grading-report .table-danger:hover > th, - .forumheaderlist .table-danger:hover > th, - .generaltable .table-danger:hover > th, - table.flexible .table-danger:hover > th, - .category_subcategories .table-danger:hover > th, - table#modules .table-danger:hover > th, - table#permissions .table-danger:hover > th { + .table-hover .table-danger:hover > td, + .table-hover .table-danger:hover > th { background-color: #efbbb9; } .table-light, @@ -3568,17 +3515,10 @@ table#listdirectories td { .table-light tbody + tbody { border-color: #fbfcfc; } -.table-hover .table-light:hover, table.grading-report .table-light:hover, .forumheaderlist .table-light:hover, .generaltable .table-light:hover, table.flexible .table-light:hover, .category_subcategories .table-light:hover, table#modules .table-light:hover, table#permissions .table-light:hover { +.table-hover .table-light:hover { background-color: #ececf6; } - .table-hover .table-light:hover > td, table.grading-report .table-light:hover > td, .forumheaderlist .table-light:hover > td, .generaltable .table-light:hover > td, table.flexible .table-light:hover > td, .category_subcategories .table-light:hover > td, table#modules .table-light:hover > td, table#permissions .table-light:hover > td, - .table-hover .table-light:hover > th, - table.grading-report .table-light:hover > th, - .forumheaderlist .table-light:hover > th, - .generaltable .table-light:hover > th, - table.flexible .table-light:hover > th, - .category_subcategories .table-light:hover > th, - table#modules .table-light:hover > th, - table#permissions .table-light:hover > th { + .table-hover .table-light:hover > td, + .table-hover .table-light:hover > th { background-color: #ececf6; } .table-dark, @@ -3592,17 +3532,10 @@ table#listdirectories td { .table-dark tbody + tbody { border-color: #97999a; } -.table-hover .table-dark:hover, table.grading-report .table-dark:hover, .forumheaderlist .table-dark:hover, .generaltable .table-dark:hover, table.flexible .table-dark:hover, .category_subcategories .table-dark:hover, table#modules .table-dark:hover, table#permissions .table-dark:hover { +.table-hover .table-dark:hover { background-color: #babbbb; } - .table-hover .table-dark:hover > td, table.grading-report .table-dark:hover > td, .forumheaderlist .table-dark:hover > td, .generaltable .table-dark:hover > td, table.flexible .table-dark:hover > td, .category_subcategories .table-dark:hover > td, table#modules .table-dark:hover > td, table#permissions .table-dark:hover > td, - .table-hover .table-dark:hover > th, - table.grading-report .table-dark:hover > th, - .forumheaderlist .table-dark:hover > th, - .generaltable .table-dark:hover > th, - table.flexible .table-dark:hover > th, - .category_subcategories .table-dark:hover > th, - table#modules .table-dark:hover > th, - table#permissions .table-dark:hover > th { + .table-hover .table-dark:hover > td, + .table-hover .table-dark:hover > th { background-color: #babbbb; } .table-active, @@ -3610,25 +3543,18 @@ table#listdirectories td { .table-active > td { background-color: rgba(0, 0, 0, 0.075); } -.table-hover .table-active:hover, table.grading-report .table-active:hover, .forumheaderlist .table-active:hover, .generaltable .table-active:hover, table.flexible .table-active:hover, .category_subcategories .table-active:hover, table#modules .table-active:hover, table#permissions .table-active:hover { +.table-hover .table-active:hover { background-color: rgba(0, 0, 0, 0.075); } - .table-hover .table-active:hover > td, table.grading-report .table-active:hover > td, .forumheaderlist .table-active:hover > td, .generaltable .table-active:hover > td, table.flexible .table-active:hover > td, .category_subcategories .table-active:hover > td, table#modules .table-active:hover > td, table#permissions .table-active:hover > td, - .table-hover .table-active:hover > th, - table.grading-report .table-active:hover > th, - .forumheaderlist .table-active:hover > th, - .generaltable .table-active:hover > th, - table.flexible .table-active:hover > th, - .category_subcategories .table-active:hover > th, - table#modules .table-active:hover > th, - table#permissions .table-active:hover > th { + .table-hover .table-active:hover > td, + .table-hover .table-active:hover > th { background-color: rgba(0, 0, 0, 0.075); } -.table .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { +.table .thead-dark th { color: #fff; background-color: #373a3c; border-color: #494d50; } -.table .thead-light th, table.flexible .thead-light th, .generaltable .thead-light th { +.table .thead-light th { color: #495057; background-color: #e9ecef; border-color: #dee2e6; } @@ -3642,9 +3568,9 @@ table#listdirectories td { border-color: #494d50; } .table-dark.table-bordered { border: 0; } - .table-dark.table-striped tbody tr:nth-of-type(odd), table.table-dark#explaincaps tbody tr:nth-of-type(odd), table.table-dark#defineroletable tbody tr:nth-of-type(odd), table.table-dark.grading-report tbody tr:nth-of-type(odd), table.table-dark#listdirectories tbody tr:nth-of-type(odd), table.table-dark.rolecaps tbody tr:nth-of-type(odd), table.table-dark.userenrolment tbody tr:nth-of-type(odd), form#movecourses table.table-dark tbody tr:nth-of-type(odd), #page-admin-course-index .table-dark.editcourse tbody tr:nth-of-type(odd), .table-dark.forumheaderlist tbody tr:nth-of-type(odd), table.table-dark.flexible tbody tr:nth-of-type(odd), .table-dark.generaltable tbody tr:nth-of-type(odd) { + .table-dark.table-striped tbody tr:nth-of-type(odd) { background-color: rgba(255, 255, 255, 0.05); } - .table-dark.table-hover tbody tr:hover, table.table-dark.grading-report tbody tr:hover, .table-dark.forumheaderlist tbody tr:hover, .table-dark.generaltable tbody tr:hover, table.table-dark.flexible tbody tr:hover, .table-dark.category_subcategories tbody tr:hover, table.table-dark#modules tbody tr:hover, table.table-dark#permissions tbody tr:hover { + .table-dark.table-hover tbody tr:hover { color: #fff; background-color: rgba(255, 255, 255, 0.075); } @@ -9340,13 +9266,10 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat display: none; } .badge { border: 1px solid #000; } - .table, table.flexible, - .generaltable { + .table { border-collapse: collapse !important; } - .table td, - table.flexible td, - .generaltable td, .table th, table.flexible th, .generaltable th { + .table th { background-color: #fff !important; } .table-bordered th, .table-bordered td { @@ -9358,7 +9281,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .table-dark thead th, .table-dark tbody + tbody { border-color: #dee2e6; } - .table .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { + .table .thead-dark th { color: inherit; border-color: #dee2e6; } } @@ -17276,6 +17199,36 @@ div#dock { .path-backup .wibbler .state12 { background: #222; } +.generaltable { + width: 100%; + margin-bottom: 1rem; + color: #373a3c; } + .generaltable th, + .generaltable td { + padding: 0.75rem; + vertical-align: top; + border-top: 1px solid #dee2e6; } + .generaltable thead th { + vertical-align: bottom; + border-bottom: 2px solid #dee2e6; } + .generaltable tbody + tbody { + border-top: 2px solid #dee2e6; } + .generaltable tbody tr:nth-of-type(odd) { + background-color: rgba(0, 0, 0, 0.05); } + .generaltable.table-sm th, + .generaltable.table-sm td { + padding: 0.3rem; } + .generaltable tbody tr:hover { + color: #373a3c; + background-color: rgba(0, 0, 0, 0.075); } + +table caption { + font-size: 24px; + font-weight: bold; + line-height: 42px; + text-align: left; + caption-side: top; } + .singlebutton { display: inline-block; } .singlebutton + .singlebutton { @@ -17912,13 +17865,6 @@ body.behat-site [data-region="drawer"] { background-color: #99c; font-weight: bold; } -table caption { - font-size: 24px; - font-weight: bold; - line-height: 42px; - text-align: left; - caption-side: top; } - /** * This file contains the styles required to make the footer sticky. */ diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 166659bb040..d9ac1a985e8 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -3363,34 +3363,23 @@ pre { .offset-xl-11 { margin-left: 91.6666666667%; } } -.table, table.flexible, -.generaltable { +.table { width: 100%; margin-bottom: 1rem; color: #373a3c; } - .table th, table.flexible th, .generaltable th, - .table td, - table.flexible td, - .generaltable td { + .table th, + .table td { padding: 0.75rem; vertical-align: top; border-top: 1px solid #dee2e6; } - .table thead th, table.flexible thead th, .generaltable thead th { + .table thead th { vertical-align: bottom; border-bottom: 2px solid #dee2e6; } - .table tbody + tbody, table.flexible tbody + tbody, .generaltable tbody + tbody { + .table tbody + tbody { border-top: 2px solid #dee2e6; } -.table-sm th, #page-report-loglive-index .generaltable th, #page-admin-report-log-index .generaltable th, #page-report-log-user .generaltable th, #page-admin-user table th, .environmenttable th, .category_subcategories th, .rcs-results th, table#listdirectories th, -.table-sm td, -#page-report-loglive-index .generaltable td, -#page-admin-report-log-index .generaltable td, -#page-report-log-user .generaltable td, -#page-admin-user table td, -.environmenttable td, -.category_subcategories td, -.rcs-results td, -table#listdirectories td { +.table-sm th, +.table-sm td { padding: 0.3rem; } .table-bordered { @@ -3408,10 +3397,10 @@ table#listdirectories td { .table-borderless tbody + tbody { border: 0; } -.table-striped tbody tr:nth-of-type(odd), table#explaincaps tbody tr:nth-of-type(odd), table#defineroletable tbody tr:nth-of-type(odd), table.grading-report tbody tr:nth-of-type(odd), table#listdirectories tbody tr:nth-of-type(odd), table.rolecaps tbody tr:nth-of-type(odd), table.userenrolment tbody tr:nth-of-type(odd), form#movecourses table tbody tr:nth-of-type(odd), #page-admin-course-index .editcourse tbody tr:nth-of-type(odd), .forumheaderlist tbody tr:nth-of-type(odd), table.flexible tbody tr:nth-of-type(odd), .generaltable tbody tr:nth-of-type(odd) { +.table-striped tbody tr:nth-of-type(odd) { background-color: rgba(0, 0, 0, 0.05); } -.table-hover tbody tr:hover, table.grading-report tbody tr:hover, .forumheaderlist tbody tr:hover, .generaltable tbody tr:hover, table.flexible tbody tr:hover, .category_subcategories tbody tr:hover, table#modules tbody tr:hover, table#permissions tbody tr:hover { +.table-hover tbody tr:hover { color: #373a3c; background-color: rgba(0, 0, 0, 0.075); } @@ -3426,17 +3415,10 @@ table#listdirectories td { .table-primary tbody + tbody { border-color: #83b8e7; } -.table-hover .table-primary:hover, table.grading-report .table-primary:hover, .forumheaderlist .table-primary:hover, .generaltable .table-primary:hover, table.flexible .table-primary:hover, .category_subcategories .table-primary:hover, table#modules .table-primary:hover, table#permissions .table-primary:hover { +.table-hover .table-primary:hover { background-color: #a7cdee; } - .table-hover .table-primary:hover > td, table.grading-report .table-primary:hover > td, .forumheaderlist .table-primary:hover > td, .generaltable .table-primary:hover > td, table.flexible .table-primary:hover > td, .category_subcategories .table-primary:hover > td, table#modules .table-primary:hover > td, table#permissions .table-primary:hover > td, - .table-hover .table-primary:hover > th, - table.grading-report .table-primary:hover > th, - .forumheaderlist .table-primary:hover > th, - .generaltable .table-primary:hover > th, - table.flexible .table-primary:hover > th, - .category_subcategories .table-primary:hover > th, - table#modules .table-primary:hover > th, - table#permissions .table-primary:hover > th { + .table-hover .table-primary:hover > td, + .table-hover .table-primary:hover > th { background-color: #a7cdee; } .table-secondary, @@ -3450,17 +3432,10 @@ table#listdirectories td { .table-secondary tbody + tbody { border-color: #f4f5f7; } -.table-hover .table-secondary:hover, table.grading-report .table-secondary:hover, .forumheaderlist .table-secondary:hover, .generaltable .table-secondary:hover, table.flexible .table-secondary:hover, .category_subcategories .table-secondary:hover, table#modules .table-secondary:hover, table#permissions .table-secondary:hover { +.table-hover .table-secondary:hover { background-color: #eaedf1; } - .table-hover .table-secondary:hover > td, table.grading-report .table-secondary:hover > td, .forumheaderlist .table-secondary:hover > td, .generaltable .table-secondary:hover > td, table.flexible .table-secondary:hover > td, .category_subcategories .table-secondary:hover > td, table#modules .table-secondary:hover > td, table#permissions .table-secondary:hover > td, - .table-hover .table-secondary:hover > th, - table.grading-report .table-secondary:hover > th, - .forumheaderlist .table-secondary:hover > th, - .generaltable .table-secondary:hover > th, - table.flexible .table-secondary:hover > th, - .category_subcategories .table-secondary:hover > th, - table#modules .table-secondary:hover > th, - table#permissions .table-secondary:hover > th { + .table-hover .table-secondary:hover > td, + .table-hover .table-secondary:hover > th { background-color: #eaedf1; } .table-success, @@ -3474,17 +3449,10 @@ table#listdirectories td { .table-success tbody + tbody { border-color: #aadaaa; } -.table-hover .table-success:hover, table.grading-report .table-success:hover, .forumheaderlist .table-success:hover, .generaltable .table-success:hover, table.flexible .table-success:hover, .category_subcategories .table-success:hover, table#modules .table-success:hover, table#permissions .table-success:hover { +.table-hover .table-success:hover { background-color: #bfe3bf; } - .table-hover .table-success:hover > td, table.grading-report .table-success:hover > td, .forumheaderlist .table-success:hover > td, .generaltable .table-success:hover > td, table.flexible .table-success:hover > td, .category_subcategories .table-success:hover > td, table#modules .table-success:hover > td, table#permissions .table-success:hover > td, - .table-hover .table-success:hover > th, - table.grading-report .table-success:hover > th, - .forumheaderlist .table-success:hover > th, - .generaltable .table-success:hover > th, - table.flexible .table-success:hover > th, - .category_subcategories .table-success:hover > th, - table#modules .table-success:hover > th, - table#permissions .table-success:hover > th { + .table-hover .table-success:hover > td, + .table-hover .table-success:hover > th { background-color: #bfe3bf; } .table-info, @@ -3498,17 +3466,10 @@ table#listdirectories td { .table-info tbody + tbody { border-color: #aadeee; } -.table-hover .table-info:hover, table.grading-report .table-info:hover, .forumheaderlist .table-info:hover, .generaltable .table-info:hover, table.flexible .table-info:hover, .category_subcategories .table-info:hover, table#modules .table-info:hover, table#permissions .table-info:hover { +.table-hover .table-info:hover { background-color: #bce5f2; } - .table-hover .table-info:hover > td, table.grading-report .table-info:hover > td, .forumheaderlist .table-info:hover > td, .generaltable .table-info:hover > td, table.flexible .table-info:hover > td, .category_subcategories .table-info:hover > td, table#modules .table-info:hover > td, table#permissions .table-info:hover > td, - .table-hover .table-info:hover > th, - table.grading-report .table-info:hover > th, - .forumheaderlist .table-info:hover > th, - .generaltable .table-info:hover > th, - table.flexible .table-info:hover > th, - .category_subcategories .table-info:hover > th, - table#modules .table-info:hover > th, - table#permissions .table-info:hover > th { + .table-hover .table-info:hover > td, + .table-hover .table-info:hover > th { background-color: #bce5f2; } .table-warning, @@ -3522,17 +3483,10 @@ table#listdirectories td { .table-warning tbody + tbody { border-color: #f7d4a3; } -.table-hover .table-warning:hover, table.grading-report .table-warning:hover, .forumheaderlist .table-warning:hover, .generaltable .table-warning:hover, table.flexible .table-warning:hover, .category_subcategories .table-warning:hover, table#modules .table-warning:hover, table#permissions .table-warning:hover { +.table-hover .table-warning:hover { background-color: #f9ddb5; } - .table-hover .table-warning:hover > td, table.grading-report .table-warning:hover > td, .forumheaderlist .table-warning:hover > td, .generaltable .table-warning:hover > td, table.flexible .table-warning:hover > td, .category_subcategories .table-warning:hover > td, table#modules .table-warning:hover > td, table#permissions .table-warning:hover > td, - .table-hover .table-warning:hover > th, - table.grading-report .table-warning:hover > th, - .forumheaderlist .table-warning:hover > th, - .generaltable .table-warning:hover > th, - table.flexible .table-warning:hover > th, - .category_subcategories .table-warning:hover > th, - table#modules .table-warning:hover > th, - table#permissions .table-warning:hover > th { + .table-hover .table-warning:hover > td, + .table-hover .table-warning:hover > th { background-color: #f9ddb5; } .table-danger, @@ -3546,17 +3500,10 @@ table#listdirectories td { .table-danger tbody + tbody { border-color: #eba6a3; } -.table-hover .table-danger:hover, table.grading-report .table-danger:hover, .forumheaderlist .table-danger:hover, .generaltable .table-danger:hover, table.flexible .table-danger:hover, .category_subcategories .table-danger:hover, table#modules .table-danger:hover, table#permissions .table-danger:hover { +.table-hover .table-danger:hover { background-color: #efbbb9; } - .table-hover .table-danger:hover > td, table.grading-report .table-danger:hover > td, .forumheaderlist .table-danger:hover > td, .generaltable .table-danger:hover > td, table.flexible .table-danger:hover > td, .category_subcategories .table-danger:hover > td, table#modules .table-danger:hover > td, table#permissions .table-danger:hover > td, - .table-hover .table-danger:hover > th, - table.grading-report .table-danger:hover > th, - .forumheaderlist .table-danger:hover > th, - .generaltable .table-danger:hover > th, - table.flexible .table-danger:hover > th, - .category_subcategories .table-danger:hover > th, - table#modules .table-danger:hover > th, - table#permissions .table-danger:hover > th { + .table-hover .table-danger:hover > td, + .table-hover .table-danger:hover > th { background-color: #efbbb9; } .table-light, @@ -3570,17 +3517,10 @@ table#listdirectories td { .table-light tbody + tbody { border-color: #fbfcfc; } -.table-hover .table-light:hover, table.grading-report .table-light:hover, .forumheaderlist .table-light:hover, .generaltable .table-light:hover, table.flexible .table-light:hover, .category_subcategories .table-light:hover, table#modules .table-light:hover, table#permissions .table-light:hover { +.table-hover .table-light:hover { background-color: #ececf6; } - .table-hover .table-light:hover > td, table.grading-report .table-light:hover > td, .forumheaderlist .table-light:hover > td, .generaltable .table-light:hover > td, table.flexible .table-light:hover > td, .category_subcategories .table-light:hover > td, table#modules .table-light:hover > td, table#permissions .table-light:hover > td, - .table-hover .table-light:hover > th, - table.grading-report .table-light:hover > th, - .forumheaderlist .table-light:hover > th, - .generaltable .table-light:hover > th, - table.flexible .table-light:hover > th, - .category_subcategories .table-light:hover > th, - table#modules .table-light:hover > th, - table#permissions .table-light:hover > th { + .table-hover .table-light:hover > td, + .table-hover .table-light:hover > th { background-color: #ececf6; } .table-dark, @@ -3594,17 +3534,10 @@ table#listdirectories td { .table-dark tbody + tbody { border-color: #97999a; } -.table-hover .table-dark:hover, table.grading-report .table-dark:hover, .forumheaderlist .table-dark:hover, .generaltable .table-dark:hover, table.flexible .table-dark:hover, .category_subcategories .table-dark:hover, table#modules .table-dark:hover, table#permissions .table-dark:hover { +.table-hover .table-dark:hover { background-color: #babbbb; } - .table-hover .table-dark:hover > td, table.grading-report .table-dark:hover > td, .forumheaderlist .table-dark:hover > td, .generaltable .table-dark:hover > td, table.flexible .table-dark:hover > td, .category_subcategories .table-dark:hover > td, table#modules .table-dark:hover > td, table#permissions .table-dark:hover > td, - .table-hover .table-dark:hover > th, - table.grading-report .table-dark:hover > th, - .forumheaderlist .table-dark:hover > th, - .generaltable .table-dark:hover > th, - table.flexible .table-dark:hover > th, - .category_subcategories .table-dark:hover > th, - table#modules .table-dark:hover > th, - table#permissions .table-dark:hover > th { + .table-hover .table-dark:hover > td, + .table-hover .table-dark:hover > th { background-color: #babbbb; } .table-active, @@ -3612,25 +3545,18 @@ table#listdirectories td { .table-active > td { background-color: rgba(0, 0, 0, 0.075); } -.table-hover .table-active:hover, table.grading-report .table-active:hover, .forumheaderlist .table-active:hover, .generaltable .table-active:hover, table.flexible .table-active:hover, .category_subcategories .table-active:hover, table#modules .table-active:hover, table#permissions .table-active:hover { +.table-hover .table-active:hover { background-color: rgba(0, 0, 0, 0.075); } - .table-hover .table-active:hover > td, table.grading-report .table-active:hover > td, .forumheaderlist .table-active:hover > td, .generaltable .table-active:hover > td, table.flexible .table-active:hover > td, .category_subcategories .table-active:hover > td, table#modules .table-active:hover > td, table#permissions .table-active:hover > td, - .table-hover .table-active:hover > th, - table.grading-report .table-active:hover > th, - .forumheaderlist .table-active:hover > th, - .generaltable .table-active:hover > th, - table.flexible .table-active:hover > th, - .category_subcategories .table-active:hover > th, - table#modules .table-active:hover > th, - table#permissions .table-active:hover > th { + .table-hover .table-active:hover > td, + .table-hover .table-active:hover > th { background-color: rgba(0, 0, 0, 0.075); } -.table .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { +.table .thead-dark th { color: #fff; background-color: #373a3c; border-color: #494d50; } -.table .thead-light th, table.flexible .thead-light th, .generaltable .thead-light th { +.table .thead-light th { color: #495057; background-color: #e9ecef; border-color: #dee2e6; } @@ -3644,9 +3570,9 @@ table#listdirectories td { border-color: #494d50; } .table-dark.table-bordered { border: 0; } - .table-dark.table-striped tbody tr:nth-of-type(odd), table.table-dark#explaincaps tbody tr:nth-of-type(odd), table.table-dark#defineroletable tbody tr:nth-of-type(odd), table.table-dark.grading-report tbody tr:nth-of-type(odd), table.table-dark#listdirectories tbody tr:nth-of-type(odd), table.table-dark.rolecaps tbody tr:nth-of-type(odd), table.table-dark.userenrolment tbody tr:nth-of-type(odd), form#movecourses table.table-dark tbody tr:nth-of-type(odd), #page-admin-course-index .table-dark.editcourse tbody tr:nth-of-type(odd), .table-dark.forumheaderlist tbody tr:nth-of-type(odd), table.table-dark.flexible tbody tr:nth-of-type(odd), .table-dark.generaltable tbody tr:nth-of-type(odd) { + .table-dark.table-striped tbody tr:nth-of-type(odd) { background-color: rgba(255, 255, 255, 0.05); } - .table-dark.table-hover tbody tr:hover, table.table-dark.grading-report tbody tr:hover, .table-dark.forumheaderlist tbody tr:hover, .table-dark.generaltable tbody tr:hover, table.table-dark.flexible tbody tr:hover, .table-dark.category_subcategories tbody tr:hover, table.table-dark#modules tbody tr:hover, table.table-dark#permissions tbody tr:hover { + .table-dark.table-hover tbody tr:hover { color: #fff; background-color: rgba(255, 255, 255, 0.075); } @@ -9583,13 +9509,10 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat display: none; } .badge { border: 1px solid #000; } - .table, table.flexible, - .generaltable { + .table { border-collapse: collapse !important; } - .table td, - table.flexible td, - .generaltable td, .table th, table.flexible th, .generaltable th { + .table th { background-color: #fff !important; } .table-bordered th, .table-bordered td { @@ -9601,7 +9524,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat .table-dark thead th, .table-dark tbody + tbody { border-color: #dee2e6; } - .table .thead-dark th, table.flexible .thead-dark th, .generaltable .thead-dark th { + .table .thead-dark th { color: inherit; border-color: #dee2e6; } } @@ -17545,6 +17468,36 @@ div#dock { .path-backup .wibbler .state12 { background: #222; } +.generaltable { + width: 100%; + margin-bottom: 1rem; + color: #373a3c; } + .generaltable th, + .generaltable td { + padding: 0.75rem; + vertical-align: top; + border-top: 1px solid #dee2e6; } + .generaltable thead th { + vertical-align: bottom; + border-bottom: 2px solid #dee2e6; } + .generaltable tbody + tbody { + border-top: 2px solid #dee2e6; } + .generaltable tbody tr:nth-of-type(odd) { + background-color: rgba(0, 0, 0, 0.05); } + .generaltable.table-sm th, + .generaltable.table-sm td { + padding: 0.3rem; } + .generaltable tbody tr:hover { + color: #373a3c; + background-color: rgba(0, 0, 0, 0.075); } + +table caption { + font-size: 24px; + font-weight: bold; + line-height: 42px; + text-align: left; + caption-side: top; } + .singlebutton { display: inline-block; } .singlebutton + .singlebutton { @@ -18124,13 +18077,6 @@ body.behat-site [data-region="drawer"] { background-color: #99c; font-weight: bold; } -table caption { - font-size: 24px; - font-weight: bold; - line-height: 42px; - text-align: left; - caption-side: top; } - /** * This file contains the styles required to make the footer sticky. */ From cacf6925781b5ffefc5f91ea06324ca8b93a9cf8 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 27 Nov 2019 11:11:16 +0100 Subject: [PATCH 19/23] MDL-66999 theme_boost: @extend remove extends for grades --- grade/grading/form/rubric/renderer.php | 2 +- grade/grading/renderer.php | 2 +- grade/grading/tests/behat/behat_grading.php | 2 +- theme/boost/scss/moodle/grade.scss | 4 - theme/boost/style/moodle.css | 238 ++++------------- theme/classic/style/moodle.css | 274 +++++--------------- 6 files changed, 122 insertions(+), 400 deletions(-) diff --git a/grade/grading/form/rubric/renderer.php b/grade/grading/form/rubric/renderer.php index 63826624891..745a244997c 100644 --- a/grade/grading/form/rubric/renderer.php +++ b/grade/grading/form/rubric/renderer.php @@ -403,7 +403,7 @@ class gradingform_rubric_renderer extends plugin_renderer_base { 'value' => $value ); $input = html_writer::empty_tag('input', $criteriainputparams); - $rubrictemplate .= html_writer::tag('div', $input, array('class' => 'addcriterion')); + $rubrictemplate .= html_writer::tag('div', $input, array('class' => 'addcriterion btn btn-secondary')); } $rubrictemplate .= $this->rubric_edit_options($mode, $options); $rubrictemplate .= html_writer::end_tag('div'); diff --git a/grade/grading/renderer.php b/grade/grading/renderer.php index de6adabc6a6..55227660357 100644 --- a/grade/grading/renderer.php +++ b/grade/grading/renderer.php @@ -66,7 +66,7 @@ class core_grading_renderer extends plugin_renderer_base { $img = $this->output->pix_icon($icon, ''); $txt = html_writer::tag('div', $text, array('class' => 'action-text')); - return html_writer::link($url, $img . $txt, array('class' => 'action')); + return html_writer::link($url, $img . $txt, array('class' => 'action btn btn-lg')); } /** diff --git a/grade/grading/tests/behat/behat_grading.php b/grade/grading/tests/behat/behat_grading.php index 2aa49bc5a37..8f3abd1dbd6 100644 --- a/grade/grading/tests/behat/behat_grading.php +++ b/grade/grading/tests/behat/behat_grading.php @@ -66,7 +66,7 @@ class behat_grading extends behat_base { $editactionliteral = behat_context_helper::escape(get_string("manageactionedit", "grading")); // Working both when adding and editing. - $definitionxpath = "//a[@class='action']" . + $definitionxpath = "//a[@class='action btn btn-lg']" . "[./descendant::*[contains(., $newactionliteral) or contains(., $editactionliteral)]]"; $this->execute('behat_grading::i_go_to_advanced_grading_page', $this->escape($activityname)); diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss index e20b86b75a9..9705851844f 100644 --- a/theme/boost/scss/moodle/grade.scss +++ b/theme/boost/scss/moodle/grade.scss @@ -70,8 +70,6 @@ margin-bottom: 1em; .action { - @extend .btn; - @extend .btn-lg; display: inline-block; position: relative; vertical-align: top; @@ -190,7 +188,6 @@ vertical-align: middle; input { - @extend .btn; background-position: 0 0; height: 30px; margin-right: 5px; @@ -201,7 +198,6 @@ .addcriterion { margin-left: 5px; - @extend .btn; padding: 0; input { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index c0a61513ab3..895f822a9c8 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -3992,7 +3992,7 @@ textarea.form-control { .form-inline .custom-control-label { margin-bottom: 0; } } -.btn, #page-grade-grading-manage .actions .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, #rubric-rubric.gradingform_rubric .addcriterion { +.btn { display: inline-block; font-weight: 400; color: #373a3c; @@ -4007,23 +4007,19 @@ textarea.form-control { border-radius: 0; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { - .btn, #page-grade-grading-manage .actions .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, #rubric-rubric.gradingform_rubric .addcriterion { + .btn { transition: none; } } - .btn:hover, #page-grade-grading-manage .actions .action:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:hover, #rubric-rubric.gradingform_rubric .addcriterion:hover { + .btn:hover { color: #373a3c; text-decoration: none; } - .btn:focus, #page-grade-grading-manage .actions .action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:focus, #rubric-rubric.gradingform_rubric .addcriterion:focus, .btn.focus, #page-grade-grading-manage .actions .focus.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.focus, #rubric-rubric.gradingform_rubric .focus.addcriterion { + .btn:focus, .btn.focus { outline: 0; box-shadow: 0 0 0 0.2rem rgba(17, 119, 209, 0.25); } - .btn.disabled, #page-grade-grading-manage .actions .disabled.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.disabled, #rubric-rubric.gradingform_rubric .disabled.addcriterion, .btn:disabled, #page-grade-grading-manage .actions .action:disabled, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:disabled, #rubric-rubric.gradingform_rubric .addcriterion:disabled { + .btn.disabled, .btn:disabled { opacity: 0.65; } -a.btn.disabled, #page-grade-grading-manage .actions a.disabled.action, #rubric-rubric.gradingform_rubric a.disabled.addcriterion, -fieldset:disabled a.btn, -fieldset:disabled #page-grade-grading-manage .actions a.action, -#page-grade-grading-manage .actions fieldset:disabled a.action, -fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, -#rubric-rubric.gradingform_rubric fieldset:disabled a.addcriterion { +a.btn.disabled, +fieldset:disabled a.btn { pointer-events: none; } .btn-primary { @@ -4394,13 +4390,13 @@ fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, color: #868e96; pointer-events: none; } -.btn-lg, .btn-group-lg > .btn, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-lg > input, #rubric-rubric.gradingform_rubric .btn-group-lg > .addcriterion, #page-grade-grading-manage .actions .action { +.btn-lg, .btn-group-lg > .btn { padding: 0.5rem 1rem; font-size: 1.171875rem; line-height: 1.5; border-radius: 0; } -.btn-sm, .btn-group-sm > .btn, #page-grade-grading-manage .actions .btn-group-sm > .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-sm > input, #rubric-rubric.gradingform_rubric .btn-group-sm > .addcriterion { +.btn-sm, .btn-group-sm > .btn { padding: 0.25rem 0.5rem; font-size: 0.8203125rem; line-height: 1.5; @@ -4643,32 +4639,17 @@ input[type="button"].btn-block { position: relative; display: inline-flex; vertical-align: middle; } - .btn-group > .btn, #page-grade-grading-manage .actions .btn-group > .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input, #rubric-rubric.gradingform_rubric .btn-group > .addcriterion, - .btn-group-vertical > .btn, - #page-grade-grading-manage .actions .btn-group-vertical > .action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion { + .btn-group > .btn, + .btn-group-vertical > .btn { position: relative; flex: 1 1 auto; } - .btn-group > .btn:hover, #page-grade-grading-manage .actions .btn-group > .action:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:hover, #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:hover, - .btn-group-vertical > .btn:hover, - #page-grade-grading-manage .actions .btn-group-vertical > .action:hover, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:hover, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:hover { + .btn-group > .btn:hover, + .btn-group-vertical > .btn:hover { z-index: 1; } - .btn-group > .btn:focus, #page-grade-grading-manage .actions .btn-group > .action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:focus, #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:focus, .btn-group > .btn:active, #page-grade-grading-manage .actions .btn-group > .action:active, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:active, #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:active, .btn-group > .btn.active, #page-grade-grading-manage .actions .btn-group > .active.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input.active, #rubric-rubric.gradingform_rubric .btn-group > .active.addcriterion, + .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn:focus, - #page-grade-grading-manage .actions .btn-group-vertical > .action:focus, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:focus, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:focus, .btn-group-vertical > .btn:active, - #page-grade-grading-manage .actions .btn-group-vertical > .action:active, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:active, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:active, - .btn-group-vertical > .btn.active, - #page-grade-grading-manage .actions .btn-group-vertical > .active.action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input.active, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .active.addcriterion { + .btn-group-vertical > .btn.active { z-index: 1; } .btn-toolbar { @@ -4678,7 +4659,7 @@ input[type="button"].btn-block { .btn-toolbar .input-group { width: auto; } -.btn-group > .btn:not(:first-child), #page-grade-grading-manage .actions .btn-group > .action:not(:first-child), #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:not(:first-child), #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:not(:first-child), +.btn-group > .btn:not(:first-child), .btn-group > .btn-group:not(:first-child) { margin-left: -1px; } @@ -4692,11 +4673,11 @@ input[type="button"].btn-block { .dropleft .dropdown-toggle-split::before { margin-right: 0; } -.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split, #page-grade-grading-manage .actions .btn-group-sm > .action + .dropdown-toggle-split, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-sm > input + .dropdown-toggle-split, #rubric-rubric.gradingform_rubric .btn-group-sm > .addcriterion + .dropdown-toggle-split { +.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split { padding-right: 0.375rem; padding-left: 0.375rem; } -.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split, #page-grade-grading-manage .actions .btn-group-lg > .action + .dropdown-toggle-split, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-lg > input + .dropdown-toggle-split, #rubric-rubric.gradingform_rubric .btn-group-lg > .addcriterion + .dropdown-toggle-split, #page-grade-grading-manage .actions .action + .dropdown-toggle-split { +.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split { padding-right: 0.75rem; padding-left: 0.75rem; } @@ -4704,36 +4685,20 @@ input[type="button"].btn-block { flex-direction: column; align-items: flex-start; justify-content: center; } - .btn-group-vertical > .btn, - #page-grade-grading-manage .actions .btn-group-vertical > .action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion, .btn-group-vertical > .btn-group { width: 100%; } - .btn-group-vertical > .btn:not(:first-child), #page-grade-grading-manage .actions .btn-group-vertical > .action:not(:first-child), #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:not(:first-child), #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:not(:first-child), + .btn-group-vertical > .btn:not(:first-child), .btn-group-vertical > .btn-group:not(:first-child) { margin-top: -1px; } -.btn-group-toggle > .btn, #page-grade-grading-manage .actions .btn-group-toggle > .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > input, #rubric-rubric.gradingform_rubric .btn-group-toggle > .addcriterion, -.btn-group-toggle > .btn-group > .btn, -#page-grade-grading-manage .actions .btn-group-toggle > .btn-group > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > .btn-group > input, -#rubric-rubric.gradingform_rubric .btn-group-toggle > .btn-group > .addcriterion { +.btn-group-toggle > .btn, +.btn-group-toggle > .btn-group > .btn { margin-bottom: 0; } - .btn-group-toggle > .btn input[type="radio"], #page-grade-grading-manage .actions .btn-group-toggle > .action input[type="radio"], #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > input input[type="radio"], #rubric-rubric.gradingform_rubric .btn-group-toggle > .addcriterion input[type="radio"], + .btn-group-toggle > .btn input[type="radio"], .btn-group-toggle > .btn input[type="checkbox"], - #page-grade-grading-manage .actions .btn-group-toggle > .action input[type="checkbox"], - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > input input[type="checkbox"], - #rubric-rubric.gradingform_rubric .btn-group-toggle > .addcriterion input[type="checkbox"], .btn-group-toggle > .btn-group > .btn input[type="radio"], - #page-grade-grading-manage .actions .btn-group-toggle > .btn-group > .action input[type="radio"], - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > .btn-group > input input[type="radio"], - #rubric-rubric.gradingform_rubric .btn-group-toggle > .btn-group > .addcriterion input[type="radio"], - .btn-group-toggle > .btn-group > .btn input[type="checkbox"], - #page-grade-grading-manage .actions .btn-group-toggle > .btn-group > .action input[type="checkbox"], - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > .btn-group > input input[type="checkbox"], - #rubric-rubric.gradingform_rubric .btn-group-toggle > .btn-group > .addcriterion input[type="checkbox"] { + .btn-group-toggle > .btn-group > .btn input[type="checkbox"] { position: absolute; clip: rect(0, 0, 0, 0); pointer-events: none; } @@ -4778,96 +4743,21 @@ input[type="button"].btn-block { .input-group-prepend, .input-group-append { display: flex; } - .input-group-prepend .btn, .input-group-prepend #page-grade-grading-manage .actions .action, #page-grade-grading-manage .actions .input-group-prepend .action, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input, .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion, #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion, - .input-group-append .btn, - .input-group-append #page-grade-grading-manage .actions .action, - #page-grade-grading-manage .actions .input-group-append .action, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion { + .input-group-prepend .btn, + .input-group-append .btn { position: relative; z-index: 2; } - .input-group-prepend .btn:focus, .input-group-prepend #page-grade-grading-manage .actions .action:focus, #page-grade-grading-manage .actions .input-group-prepend .action:focus, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input:focus, .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion:focus, #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion:focus, - .input-group-append .btn:focus, - .input-group-append #page-grade-grading-manage .actions .action:focus, - #page-grade-grading-manage .actions .input-group-append .action:focus, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:focus, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input:focus, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion:focus, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion:focus { + .input-group-prepend .btn:focus, + .input-group-append .btn:focus { z-index: 3; } - .input-group-prepend .btn + .btn, .input-group-prepend #page-grade-grading-manage .actions .action + .btn, #page-grade-grading-manage .actions .input-group-prepend .action + .btn, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .btn, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + .btn, .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion + .btn, #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion + .btn, .input-group-prepend #page-grade-grading-manage .actions .btn + .action, #page-grade-grading-manage .actions .input-group-prepend .btn + .action, .input-group-prepend #page-grade-grading-manage .actions .action + .action, #page-grade-grading-manage .actions .input-group-prepend .action + .action, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-grade-grading-manage .actions input + .action, #page-grade-grading-manage .actions .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend #page-grade-grading-manage .actions input + .action, #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + .action, .input-group-prepend #rubric-rubric.gradingform_rubric #page-grade-grading-manage .actions .addcriterion + .action, #page-grade-grading-manage .actions .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion + .action, #rubric-rubric.gradingform_rubric .input-group-prepend #page-grade-grading-manage .actions .addcriterion + .action, #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion + .action, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend .btn + input, .input-group-prepend #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .action + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend #page-grade-grading-manage .actions .action + input, #page-grade-grading-manage .actions .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .action + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-grade-grading-manage .actions .input-group-prepend .action + input, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + input, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .addcriterion + input, #rubric-rubric.gradingform_rubric .input-group-prepend #rubric-criteria .criterion .addlevel .addcriterion + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend .addcriterion + input, .input-group-prepend #rubric-rubric.gradingform_rubric .btn + .addcriterion, #rubric-rubric.gradingform_rubric .input-group-prepend .btn + .addcriterion, .input-group-prepend #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric .action + .addcriterion, #rubric-rubric.gradingform_rubric .input-group-prepend #page-grade-grading-manage .actions .action + .addcriterion, #page-grade-grading-manage .actions .input-group-prepend #rubric-rubric.gradingform_rubric .action + .addcriterion, #rubric-rubric.gradingform_rubric #page-grade-grading-manage .actions .input-group-prepend .action + .addcriterion, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .addcriterion, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + .addcriterion, .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion + .addcriterion, #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion + .addcriterion, + .input-group-prepend .btn + .btn, .input-group-prepend .btn + .input-group-text, - .input-group-prepend #page-grade-grading-manage .actions .action + .input-group-text, - #page-grade-grading-manage .actions .input-group-prepend .action + .input-group-text, - .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .input-group-text, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + .input-group-text, - .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion + .input-group-text, - #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion + .input-group-text, .input-group-prepend .input-group-text + .input-group-text, .input-group-prepend .input-group-text + .btn, - .input-group-prepend #page-grade-grading-manage .actions .input-group-text + .action, - #page-grade-grading-manage .actions .input-group-prepend .input-group-text + .action, - .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-text + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend .input-group-text + input, - .input-group-prepend #rubric-rubric.gradingform_rubric .input-group-text + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-prepend .input-group-text + .addcriterion, .input-group-append .btn + .btn, - .input-group-append #page-grade-grading-manage .actions .action + .btn, - #page-grade-grading-manage .actions .input-group-append .action + .btn, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .btn, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + .btn, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion + .btn, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion + .btn, - .input-group-append #page-grade-grading-manage .actions .btn + .action, - #page-grade-grading-manage .actions .input-group-append .btn + .action, - .input-group-append #page-grade-grading-manage .actions .action + .action, - #page-grade-grading-manage .actions .input-group-append .action + .action, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-grade-grading-manage .actions input + .action, - #page-grade-grading-manage .actions .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append #page-grade-grading-manage .actions input + .action, - #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + .action, - .input-group-append #rubric-rubric.gradingform_rubric #page-grade-grading-manage .actions .addcriterion + .action, - #page-grade-grading-manage .actions .input-group-append #rubric-rubric.gradingform_rubric .addcriterion + .action, - #rubric-rubric.gradingform_rubric .input-group-append #page-grade-grading-manage .actions .addcriterion + .action, - #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric .input-group-append .addcriterion + .action, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append .btn + input, - .input-group-append #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .action + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append #page-grade-grading-manage .actions .action + input, - #page-grade-grading-manage .actions .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .action + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-grade-grading-manage .actions .input-group-append .action + input, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + input, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .addcriterion + input, - #rubric-rubric.gradingform_rubric .input-group-append #rubric-criteria .criterion .addlevel .addcriterion + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append .addcriterion + input, - .input-group-append #rubric-rubric.gradingform_rubric .btn + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append .btn + .addcriterion, - .input-group-append #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric .action + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append #page-grade-grading-manage .actions .action + .addcriterion, - #page-grade-grading-manage .actions .input-group-append #rubric-rubric.gradingform_rubric .action + .addcriterion, - #rubric-rubric.gradingform_rubric #page-grade-grading-manage .actions .input-group-append .action + .addcriterion, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .addcriterion, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + .addcriterion, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion + .addcriterion, .input-group-append .btn + .input-group-text, - .input-group-append #page-grade-grading-manage .actions .action + .input-group-text, - #page-grade-grading-manage .actions .input-group-append .action + .input-group-text, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .input-group-text, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + .input-group-text, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion + .input-group-text, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion + .input-group-text, .input-group-append .input-group-text + .input-group-text, - .input-group-append .input-group-text + .btn, - .input-group-append #page-grade-grading-manage .actions .input-group-text + .action, - #page-grade-grading-manage .actions .input-group-append .input-group-text + .action, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-text + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append .input-group-text + input, - .input-group-append #rubric-rubric.gradingform_rubric .input-group-text + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append .input-group-text + .addcriterion { + .input-group-append .input-group-text + .btn { margin-left: -1px; } .input-group-prepend { @@ -4902,13 +4792,7 @@ input[type="button"].btn-block { .input-group-lg > .input-group-prepend > .input-group-text, .input-group-lg > .input-group-append > .input-group-text, .input-group-lg > .input-group-prepend > .btn, -#page-grade-grading-manage .actions .input-group-lg > .input-group-prepend > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-lg > .input-group-prepend > input, -#rubric-rubric.gradingform_rubric .input-group-lg > .input-group-prepend > .addcriterion, -.input-group-lg > .input-group-append > .btn, -#page-grade-grading-manage .actions .input-group-lg > .input-group-append > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-lg > .input-group-append > input, -#rubric-rubric.gradingform_rubric .input-group-lg > .input-group-append > .addcriterion { +.input-group-lg > .input-group-append > .btn { padding: 0.5rem 1rem; font-size: 1.171875rem; line-height: 1.5; } @@ -4922,13 +4806,7 @@ input[type="button"].btn-block { .input-group-sm > .input-group-prepend > .input-group-text, .input-group-sm > .input-group-append > .input-group-text, .input-group-sm > .input-group-prepend > .btn, -#page-grade-grading-manage .actions .input-group-sm > .input-group-prepend > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-sm > .input-group-prepend > input, -#rubric-rubric.gradingform_rubric .input-group-sm > .input-group-prepend > .addcriterion, -.input-group-sm > .input-group-append > .btn, -#page-grade-grading-manage .actions .input-group-sm > .input-group-append > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-sm > .input-group-append > input, -#rubric-rubric.gradingform_rubric .input-group-sm > .input-group-append > .addcriterion { +.input-group-sm > .input-group-append > .btn { padding: 0.25rem 0.5rem; font-size: 0.8203125rem; line-height: 1.5; } @@ -5780,7 +5658,7 @@ input[type="button"].btn-block { .badge:empty { display: none; } -.btn .badge, #page-grade-grading-manage .actions .action .badge, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input .badge, #rubric-rubric.gradingform_rubric .addcriterion .badge { +.btn .badge { position: relative; top: -1px; } @@ -11434,12 +11312,12 @@ body.h5p-embed .h5pmessages { .emoji-auto-complete { height: 40px; } - .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button, .emoji-auto-complete #page-grade-grading-manage .actions .btn-link.btn-icon.emoji-button.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-link.btn-icon.emoji-button.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.emoji-button, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-link.btn-icon.emoji-button, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-link.btn-icon.emoji-button.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-link.btn-icon.emoji-button.addcriterion { + .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button { height: 40px; width: 40px; line-height: 40px; font-size: 24px; } - .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete #page-grade-grading-manage .actions .btn-link.btn-icon.emoji-button.active.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-link.btn-icon.emoji-button.active.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.emoji-button.active, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-link.btn-icon.emoji-button.active.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-link.btn-icon.emoji-button.active.addcriterion { + .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active { background-color: #e9ecef; } .toast-wrapper { @@ -12177,12 +12055,12 @@ body.h5p-embed .h5pmessages { .block .block-cards .multiline { white-space: normal; } -.block .block-cards .btn.btn-link.btn-icon, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion { +.block .block-cards .btn.btn-link.btn-icon { height: 36px; width: 36px; padding: 0; border-radius: 50%; } - .block .block-cards .btn.btn-link.btn-icon:hover, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action:hover, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action:hover, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon:hover, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion:hover, .block .block-cards .btn.btn-link.btn-icon:focus, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action:focus, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action:focus, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon:focus, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion:focus { + .block .block-cards .btn.btn-link.btn-icon:hover, .block .block-cards .btn.btn-link.btn-icon:focus { background-color: #e9ecef; } .dashboard-card-deck.one-row { @@ -12945,7 +12823,7 @@ body:not(.editing) .sitetopic ul.section { vertical-align: text-bottom; margin-left: 0; } -.path-course-view li.activity form.togglecompletion .btn, .path-course-view li.activity form.togglecompletion #page-grade-grading-manage .actions .action, #page-grade-grading-manage .actions .path-course-view li.activity form.togglecompletion .action, .path-course-view li.activity form.togglecompletion #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .path-course-view li.activity form.togglecompletion input, .path-course-view li.activity form.togglecompletion #rubric-rubric.gradingform_rubric .addcriterion, #rubric-rubric.gradingform_rubric .path-course-view li.activity form.togglecompletion .addcriterion { +.path-course-view li.activity form.togglecompletion .btn { padding: 0; } .path-course-view li.activity form.togglecompletion img { @@ -14707,40 +14585,40 @@ a.ygtvspacer:hover { display: inline-block; } .message-app .overview-section-toggle.collapsed .expanded-icon-container { display: none; } - .message-app .btn.btn-link.btn-icon, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion { + .message-app .btn.btn-link.btn-icon { height: 16px; width: 16px; padding: 0; border-radius: 50%; flex-shrink: 0; } - .message-app .btn.btn-link.btn-icon:hover, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action:hover, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action:hover, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon:hover, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion:hover, .message-app .btn.btn-link.btn-icon:focus, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action:focus, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action:focus, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon:focus, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion:focus { + .message-app .btn.btn-link.btn-icon:hover, .message-app .btn.btn-link.btn-icon:focus { background-color: #e9ecef; } - .message-app .btn.btn-link.btn-icon.icon-size-0, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-0.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-0.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-0, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-0, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-0.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-0.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-0 { height: 20px !important; /* stylelint-disable-line declaration-no-important */ width: 20px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-1, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-1.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-1.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-1, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-1, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-1.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-1.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-1 { height: 24px !important; /* stylelint-disable-line declaration-no-important */ width: 24px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-2, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-2.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-2.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-2, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-2, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-2.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-2.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-2 { height: 28px !important; /* stylelint-disable-line declaration-no-important */ width: 28px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-3, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-3.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-3.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-3, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-3, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-3.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-3.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-3 { height: 36px !important; /* stylelint-disable-line declaration-no-important */ width: 36px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-4, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-4.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-4.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-4, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-4, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-4.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-4.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-4 { height: 44px !important; /* stylelint-disable-line declaration-no-important */ width: 44px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-5, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-5.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-5.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-5, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-5, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-5.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-5.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-5 { height: 68px !important; /* stylelint-disable-line declaration-no-important */ width: 68px !important; @@ -16971,7 +16849,7 @@ div#dock { /** * Mod LTI. */ -.path-admin-mod-lti .btn .loader img, .path-admin-mod-lti #page-grade-grading-manage .actions .action .loader img, #page-grade-grading-manage .actions .path-admin-mod-lti .action .loader img, .path-admin-mod-lti #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input .loader img, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .path-admin-mod-lti input .loader img, .path-admin-mod-lti #rubric-rubric.gradingform_rubric .addcriterion .loader img, #rubric-rubric.gradingform_rubric .path-admin-mod-lti .addcriterion .loader img, +.path-admin-mod-lti .btn .loader img, .path-admin-mod-lti #tool-list-loader-container .loader img { height: auto; } @@ -17256,7 +17134,7 @@ p.arrow_button { .btn-lineup { margin: 0 0 10px 5px; } -.btn.btn-icon, #page-grade-grading-manage .actions .btn-icon.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion { +.btn.btn-icon { height: 36px; width: 36px; font-size: 16px; @@ -17264,9 +17142,9 @@ p.arrow_button { padding: 0; border-radius: 50%; flex-shrink: 0; } - .btn.btn-icon:hover, #page-grade-grading-manage .actions .btn-icon.action:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover, .btn.btn-icon:focus, #page-grade-grading-manage .actions .btn-icon.action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus { + .btn.btn-icon:hover, .btn.btn-icon:focus { background-color: #e9ecef; } - .btn.btn-icon.icon-size-0, #page-grade-grading-manage .actions .btn-icon.icon-size-0.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-0, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-0.addcriterion { + .btn.btn-icon.icon-size-0 { height: 20px !important; /* stylelint-disable-line declaration-no-important */ width: 20px !important; @@ -17275,7 +17153,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 0 !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-1, #page-grade-grading-manage .actions .btn-icon.icon-size-1.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-1, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-1.addcriterion { + .btn.btn-icon.icon-size-1 { height: 24px !important; /* stylelint-disable-line declaration-no-important */ width: 24px !important; @@ -17284,7 +17162,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 4px !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-2, #page-grade-grading-manage .actions .btn-icon.icon-size-2.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-2, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-2.addcriterion { + .btn.btn-icon.icon-size-2 { height: 28px !important; /* stylelint-disable-line declaration-no-important */ width: 28px !important; @@ -17293,7 +17171,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 8px !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-3, #page-grade-grading-manage .actions .btn-icon.icon-size-3.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-3, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-3.addcriterion { + .btn.btn-icon.icon-size-3 { height: 36px !important; /* stylelint-disable-line declaration-no-important */ width: 36px !important; @@ -17302,7 +17180,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 16px !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-4, #page-grade-grading-manage .actions .btn-icon.icon-size-4.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-4, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-4.addcriterion { + .btn.btn-icon.icon-size-4 { height: 44px !important; /* stylelint-disable-line declaration-no-important */ width: 44px !important; @@ -17311,7 +17189,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 24px !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-5, #page-grade-grading-manage .actions .btn-icon.icon-size-5.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-5, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-5.addcriterion { + .btn.btn-icon.icon-size-5 { height: 68px !important; /* stylelint-disable-line declaration-no-important */ width: 68px !important; @@ -17813,13 +17691,7 @@ body.reset-style #page-content { body.reset-style select, body.reset-style input, body.reset-style textarea, -body.reset-style .btn:not(.btn-icon), -body.reset-style #page-grade-grading-manage .actions .action:not(.btn-icon), -#page-grade-grading-manage .actions body.reset-style .action:not(.btn-icon), -body.reset-style #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:not(.btn-icon), -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel body.reset-style input:not(.btn-icon), -body.reset-style #rubric-rubric.gradingform_rubric .addcriterion:not(.btn-icon), -#rubric-rubric.gradingform_rubric body.reset-style .addcriterion:not(.btn-icon) { +body.reset-style .btn:not(.btn-icon) { border-radius: 0.3rem; } body.behat-site .fixed-top { diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index d9ac1a985e8..3140e624f32 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -3998,7 +3998,7 @@ textarea.form-control { .form-inline .custom-control-label { margin-bottom: 0; } } -.btn, #page-grade-grading-manage .actions .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, #rubric-rubric.gradingform_rubric .addcriterion { +.btn { display: inline-block; font-weight: 400; color: #373a3c; @@ -4013,23 +4013,19 @@ textarea.form-control { border-radius: 0.25rem; transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } @media (prefers-reduced-motion: reduce) { - .btn, #page-grade-grading-manage .actions .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, #rubric-rubric.gradingform_rubric .addcriterion { + .btn { transition: none; } } - .btn:hover, #page-grade-grading-manage .actions .action:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:hover, #rubric-rubric.gradingform_rubric .addcriterion:hover { + .btn:hover { color: #373a3c; text-decoration: none; } - .btn:focus, #page-grade-grading-manage .actions .action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:focus, #rubric-rubric.gradingform_rubric .addcriterion:focus, .btn.focus, #page-grade-grading-manage .actions .focus.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.focus, #rubric-rubric.gradingform_rubric .focus.addcriterion { + .btn:focus, .btn.focus { outline: 0; box-shadow: 0 0 0 0.2rem rgba(17, 119, 209, 0.25); } - .btn.disabled, #page-grade-grading-manage .actions .disabled.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.disabled, #rubric-rubric.gradingform_rubric .disabled.addcriterion, .btn:disabled, #page-grade-grading-manage .actions .action:disabled, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:disabled, #rubric-rubric.gradingform_rubric .addcriterion:disabled { + .btn.disabled, .btn:disabled { opacity: 0.65; } -a.btn.disabled, #page-grade-grading-manage .actions a.disabled.action, #rubric-rubric.gradingform_rubric a.disabled.addcriterion, -fieldset:disabled a.btn, -fieldset:disabled #page-grade-grading-manage .actions a.action, -#page-grade-grading-manage .actions fieldset:disabled a.action, -fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, -#rubric-rubric.gradingform_rubric fieldset:disabled a.addcriterion { +a.btn.disabled, +fieldset:disabled a.btn { pointer-events: none; } .btn-primary { @@ -4400,13 +4396,13 @@ fieldset:disabled #rubric-rubric.gradingform_rubric a.addcriterion, color: #868e96; pointer-events: none; } -.btn-lg, .btn-group-lg > .btn, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-lg > input, #rubric-rubric.gradingform_rubric .btn-group-lg > .addcriterion, #page-grade-grading-manage .actions .action { +.btn-lg, .btn-group-lg > .btn { padding: 0.5rem 1rem; font-size: 1.171875rem; line-height: 1.5; border-radius: 0.3rem; } -.btn-sm, .btn-group-sm > .btn, #page-grade-grading-manage .actions .btn-group-sm > .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-sm > input, #rubric-rubric.gradingform_rubric .btn-group-sm > .addcriterion { +.btn-sm, .btn-group-sm > .btn { padding: 0.25rem 0.5rem; font-size: 0.8203125rem; line-height: 1.5; @@ -4650,32 +4646,17 @@ input[type="button"].btn-block { position: relative; display: inline-flex; vertical-align: middle; } - .btn-group > .btn, #page-grade-grading-manage .actions .btn-group > .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input, #rubric-rubric.gradingform_rubric .btn-group > .addcriterion, - .btn-group-vertical > .btn, - #page-grade-grading-manage .actions .btn-group-vertical > .action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion { + .btn-group > .btn, + .btn-group-vertical > .btn { position: relative; flex: 1 1 auto; } - .btn-group > .btn:hover, #page-grade-grading-manage .actions .btn-group > .action:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:hover, #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:hover, - .btn-group-vertical > .btn:hover, - #page-grade-grading-manage .actions .btn-group-vertical > .action:hover, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:hover, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:hover { + .btn-group > .btn:hover, + .btn-group-vertical > .btn:hover { z-index: 1; } - .btn-group > .btn:focus, #page-grade-grading-manage .actions .btn-group > .action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:focus, #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:focus, .btn-group > .btn:active, #page-grade-grading-manage .actions .btn-group > .action:active, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:active, #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:active, .btn-group > .btn.active, #page-grade-grading-manage .actions .btn-group > .active.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input.active, #rubric-rubric.gradingform_rubric .btn-group > .active.addcriterion, + .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn:focus, - #page-grade-grading-manage .actions .btn-group-vertical > .action:focus, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:focus, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:focus, .btn-group-vertical > .btn:active, - #page-grade-grading-manage .actions .btn-group-vertical > .action:active, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:active, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:active, - .btn-group-vertical > .btn.active, - #page-grade-grading-manage .actions .btn-group-vertical > .active.action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input.active, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .active.addcriterion { + .btn-group-vertical > .btn.active { z-index: 1; } .btn-toolbar { @@ -4685,23 +4666,17 @@ input[type="button"].btn-block { .btn-toolbar .input-group { width: auto; } -.btn-group > .btn:not(:first-child), #page-grade-grading-manage .actions .btn-group > .action:not(:first-child), #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:not(:first-child), #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:not(:first-child), +.btn-group > .btn:not(:first-child), .btn-group > .btn-group:not(:first-child) { margin-left: -1px; } -.btn-group > .btn:not(:last-child):not(.dropdown-toggle), #page-grade-grading-manage .actions .btn-group > .action:not(:last-child):not(.dropdown-toggle), #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:not(:last-child):not(.dropdown-toggle), #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:not(:last-child):not(.dropdown-toggle), -.btn-group > .btn-group:not(:last-child) > .btn, -#page-grade-grading-manage .actions .btn-group > .btn-group:not(:last-child) > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > .btn-group:not(:last-child) > input, -#rubric-rubric.gradingform_rubric .btn-group > .btn-group:not(:last-child) > .addcriterion { +.btn-group > .btn:not(:last-child):not(.dropdown-toggle), +.btn-group > .btn-group:not(:last-child) > .btn { border-top-right-radius: 0; border-bottom-right-radius: 0; } -.btn-group > .btn:not(:first-child), #page-grade-grading-manage .actions .btn-group > .action:not(:first-child), #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > input:not(:first-child), #rubric-rubric.gradingform_rubric .btn-group > .addcriterion:not(:first-child), -.btn-group > .btn-group:not(:first-child) > .btn, -#page-grade-grading-manage .actions .btn-group > .btn-group:not(:first-child) > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group > .btn-group:not(:first-child) > input, -#rubric-rubric.gradingform_rubric .btn-group > .btn-group:not(:first-child) > .addcriterion { +.btn-group > .btn:not(:first-child), +.btn-group > .btn-group:not(:first-child) > .btn { border-top-left-radius: 0; border-bottom-left-radius: 0; } @@ -4715,11 +4690,11 @@ input[type="button"].btn-block { .dropleft .dropdown-toggle-split::before { margin-right: 0; } -.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split, #page-grade-grading-manage .actions .btn-group-sm > .action + .dropdown-toggle-split, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-sm > input + .dropdown-toggle-split, #rubric-rubric.gradingform_rubric .btn-group-sm > .addcriterion + .dropdown-toggle-split { +.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split { padding-right: 0.375rem; padding-left: 0.375rem; } -.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split, #page-grade-grading-manage .actions .btn-group-lg > .action + .dropdown-toggle-split, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-lg > input + .dropdown-toggle-split, #rubric-rubric.gradingform_rubric .btn-group-lg > .addcriterion + .dropdown-toggle-split, #page-grade-grading-manage .actions .action + .dropdown-toggle-split { +.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split { padding-right: 0.75rem; padding-left: 0.75rem; } @@ -4727,50 +4702,28 @@ input[type="button"].btn-block { flex-direction: column; align-items: flex-start; justify-content: center; } - .btn-group-vertical > .btn, - #page-grade-grading-manage .actions .btn-group-vertical > .action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion, .btn-group-vertical > .btn-group { width: 100%; } - .btn-group-vertical > .btn:not(:first-child), #page-grade-grading-manage .actions .btn-group-vertical > .action:not(:first-child), #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:not(:first-child), #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:not(:first-child), + .btn-group-vertical > .btn:not(:first-child), .btn-group-vertical > .btn-group:not(:first-child) { margin-top: -1px; } - .btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle), #page-grade-grading-manage .actions .btn-group-vertical > .action:not(:last-child):not(.dropdown-toggle), #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:not(:last-child):not(.dropdown-toggle), #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:not(:last-child):not(.dropdown-toggle), - .btn-group-vertical > .btn-group:not(:last-child) > .btn, - #page-grade-grading-manage .actions .btn-group-vertical > .btn-group:not(:last-child) > .action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > .btn-group:not(:last-child) > input, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .btn-group:not(:last-child) > .addcriterion { + .btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle), + .btn-group-vertical > .btn-group:not(:last-child) > .btn { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } - .btn-group-vertical > .btn:not(:first-child), #page-grade-grading-manage .actions .btn-group-vertical > .action:not(:first-child), #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > input:not(:first-child), #rubric-rubric.gradingform_rubric .btn-group-vertical > .addcriterion:not(:first-child), - .btn-group-vertical > .btn-group:not(:first-child) > .btn, - #page-grade-grading-manage .actions .btn-group-vertical > .btn-group:not(:first-child) > .action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-vertical > .btn-group:not(:first-child) > input, - #rubric-rubric.gradingform_rubric .btn-group-vertical > .btn-group:not(:first-child) > .addcriterion { + .btn-group-vertical > .btn:not(:first-child), + .btn-group-vertical > .btn-group:not(:first-child) > .btn { border-top-left-radius: 0; border-top-right-radius: 0; } -.btn-group-toggle > .btn, #page-grade-grading-manage .actions .btn-group-toggle > .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > input, #rubric-rubric.gradingform_rubric .btn-group-toggle > .addcriterion, -.btn-group-toggle > .btn-group > .btn, -#page-grade-grading-manage .actions .btn-group-toggle > .btn-group > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > .btn-group > input, -#rubric-rubric.gradingform_rubric .btn-group-toggle > .btn-group > .addcriterion { +.btn-group-toggle > .btn, +.btn-group-toggle > .btn-group > .btn { margin-bottom: 0; } - .btn-group-toggle > .btn input[type="radio"], #page-grade-grading-manage .actions .btn-group-toggle > .action input[type="radio"], #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > input input[type="radio"], #rubric-rubric.gradingform_rubric .btn-group-toggle > .addcriterion input[type="radio"], + .btn-group-toggle > .btn input[type="radio"], .btn-group-toggle > .btn input[type="checkbox"], - #page-grade-grading-manage .actions .btn-group-toggle > .action input[type="checkbox"], - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > input input[type="checkbox"], - #rubric-rubric.gradingform_rubric .btn-group-toggle > .addcriterion input[type="checkbox"], .btn-group-toggle > .btn-group > .btn input[type="radio"], - #page-grade-grading-manage .actions .btn-group-toggle > .btn-group > .action input[type="radio"], - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > .btn-group > input input[type="radio"], - #rubric-rubric.gradingform_rubric .btn-group-toggle > .btn-group > .addcriterion input[type="radio"], - .btn-group-toggle > .btn-group > .btn input[type="checkbox"], - #page-grade-grading-manage .actions .btn-group-toggle > .btn-group > .action input[type="checkbox"], - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn-group-toggle > .btn-group > input input[type="checkbox"], - #rubric-rubric.gradingform_rubric .btn-group-toggle > .btn-group > .addcriterion input[type="checkbox"] { + .btn-group-toggle > .btn-group > .btn input[type="checkbox"] { position: absolute; clip: rect(0, 0, 0, 0); pointer-events: none; } @@ -4830,96 +4783,21 @@ input[type="button"].btn-block { .input-group-prepend, .input-group-append { display: flex; } - .input-group-prepend .btn, .input-group-prepend #page-grade-grading-manage .actions .action, #page-grade-grading-manage .actions .input-group-prepend .action, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input, .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion, #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion, - .input-group-append .btn, - .input-group-append #page-grade-grading-manage .actions .action, - #page-grade-grading-manage .actions .input-group-append .action, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion { + .input-group-prepend .btn, + .input-group-append .btn { position: relative; z-index: 2; } - .input-group-prepend .btn:focus, .input-group-prepend #page-grade-grading-manage .actions .action:focus, #page-grade-grading-manage .actions .input-group-prepend .action:focus, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input:focus, .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion:focus, #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion:focus, - .input-group-append .btn:focus, - .input-group-append #page-grade-grading-manage .actions .action:focus, - #page-grade-grading-manage .actions .input-group-append .action:focus, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input:focus, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input:focus, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion:focus, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion:focus { + .input-group-prepend .btn:focus, + .input-group-append .btn:focus { z-index: 3; } - .input-group-prepend .btn + .btn, .input-group-prepend #page-grade-grading-manage .actions .action + .btn, #page-grade-grading-manage .actions .input-group-prepend .action + .btn, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .btn, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + .btn, .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion + .btn, #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion + .btn, .input-group-prepend #page-grade-grading-manage .actions .btn + .action, #page-grade-grading-manage .actions .input-group-prepend .btn + .action, .input-group-prepend #page-grade-grading-manage .actions .action + .action, #page-grade-grading-manage .actions .input-group-prepend .action + .action, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-grade-grading-manage .actions input + .action, #page-grade-grading-manage .actions .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend #page-grade-grading-manage .actions input + .action, #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + .action, .input-group-prepend #rubric-rubric.gradingform_rubric #page-grade-grading-manage .actions .addcriterion + .action, #page-grade-grading-manage .actions .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion + .action, #rubric-rubric.gradingform_rubric .input-group-prepend #page-grade-grading-manage .actions .addcriterion + .action, #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion + .action, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend .btn + input, .input-group-prepend #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .action + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend #page-grade-grading-manage .actions .action + input, #page-grade-grading-manage .actions .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .action + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-grade-grading-manage .actions .input-group-prepend .action + input, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + input, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .addcriterion + input, #rubric-rubric.gradingform_rubric .input-group-prepend #rubric-criteria .criterion .addlevel .addcriterion + input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend .addcriterion + input, .input-group-prepend #rubric-rubric.gradingform_rubric .btn + .addcriterion, #rubric-rubric.gradingform_rubric .input-group-prepend .btn + .addcriterion, .input-group-prepend #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric .action + .addcriterion, #rubric-rubric.gradingform_rubric .input-group-prepend #page-grade-grading-manage .actions .action + .addcriterion, #page-grade-grading-manage .actions .input-group-prepend #rubric-rubric.gradingform_rubric .action + .addcriterion, #rubric-rubric.gradingform_rubric #page-grade-grading-manage .actions .input-group-prepend .action + .addcriterion, .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .addcriterion, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + .addcriterion, .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion + .addcriterion, #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion + .addcriterion, + .input-group-prepend .btn + .btn, .input-group-prepend .btn + .input-group-text, - .input-group-prepend #page-grade-grading-manage .actions .action + .input-group-text, - #page-grade-grading-manage .actions .input-group-prepend .action + .input-group-text, - .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .input-group-text, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend input + .input-group-text, - .input-group-prepend #rubric-rubric.gradingform_rubric .addcriterion + .input-group-text, - #rubric-rubric.gradingform_rubric .input-group-prepend .addcriterion + .input-group-text, .input-group-prepend .input-group-text + .input-group-text, .input-group-prepend .input-group-text + .btn, - .input-group-prepend #page-grade-grading-manage .actions .input-group-text + .action, - #page-grade-grading-manage .actions .input-group-prepend .input-group-text + .action, - .input-group-prepend #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-text + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-prepend .input-group-text + input, - .input-group-prepend #rubric-rubric.gradingform_rubric .input-group-text + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-prepend .input-group-text + .addcriterion, .input-group-append .btn + .btn, - .input-group-append #page-grade-grading-manage .actions .action + .btn, - #page-grade-grading-manage .actions .input-group-append .action + .btn, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .btn, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + .btn, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion + .btn, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion + .btn, - .input-group-append #page-grade-grading-manage .actions .btn + .action, - #page-grade-grading-manage .actions .input-group-append .btn + .action, - .input-group-append #page-grade-grading-manage .actions .action + .action, - #page-grade-grading-manage .actions .input-group-append .action + .action, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-grade-grading-manage .actions input + .action, - #page-grade-grading-manage .actions .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .action, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append #page-grade-grading-manage .actions input + .action, - #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + .action, - .input-group-append #rubric-rubric.gradingform_rubric #page-grade-grading-manage .actions .addcriterion + .action, - #page-grade-grading-manage .actions .input-group-append #rubric-rubric.gradingform_rubric .addcriterion + .action, - #rubric-rubric.gradingform_rubric .input-group-append #page-grade-grading-manage .actions .addcriterion + .action, - #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric .input-group-append .addcriterion + .action, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .btn + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append .btn + input, - .input-group-append #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .action + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append #page-grade-grading-manage .actions .action + input, - #page-grade-grading-manage .actions .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .action + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel #page-grade-grading-manage .actions .input-group-append .action + input, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + input, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .addcriterion + input, - #rubric-rubric.gradingform_rubric .input-group-append #rubric-criteria .criterion .addlevel .addcriterion + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append .addcriterion + input, - .input-group-append #rubric-rubric.gradingform_rubric .btn + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append .btn + .addcriterion, - .input-group-append #page-grade-grading-manage .actions #rubric-rubric.gradingform_rubric .action + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append #page-grade-grading-manage .actions .action + .addcriterion, - #page-grade-grading-manage .actions .input-group-append #rubric-rubric.gradingform_rubric .action + .addcriterion, - #rubric-rubric.gradingform_rubric #page-grade-grading-manage .actions .input-group-append .action + .addcriterion, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .addcriterion, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + .addcriterion, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion + .addcriterion, .input-group-append .btn + .input-group-text, - .input-group-append #page-grade-grading-manage .actions .action + .input-group-text, - #page-grade-grading-manage .actions .input-group-append .action + .input-group-text, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input + .input-group-text, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append input + .input-group-text, - .input-group-append #rubric-rubric.gradingform_rubric .addcriterion + .input-group-text, - #rubric-rubric.gradingform_rubric .input-group-append .addcriterion + .input-group-text, .input-group-append .input-group-text + .input-group-text, - .input-group-append .input-group-text + .btn, - .input-group-append #page-grade-grading-manage .actions .input-group-text + .action, - #page-grade-grading-manage .actions .input-group-append .input-group-text + .action, - .input-group-append #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-text + input, - #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-append .input-group-text + input, - .input-group-append #rubric-rubric.gradingform_rubric .input-group-text + .addcriterion, - #rubric-rubric.gradingform_rubric .input-group-append .input-group-text + .addcriterion { + .input-group-append .input-group-text + .btn { margin-left: -1px; } .input-group-prepend { @@ -4955,13 +4833,7 @@ input[type="button"].btn-block { .input-group-lg > .input-group-prepend > .input-group-text, .input-group-lg > .input-group-append > .input-group-text, .input-group-lg > .input-group-prepend > .btn, -#page-grade-grading-manage .actions .input-group-lg > .input-group-prepend > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-lg > .input-group-prepend > input, -#rubric-rubric.gradingform_rubric .input-group-lg > .input-group-prepend > .addcriterion, -.input-group-lg > .input-group-append > .btn, -#page-grade-grading-manage .actions .input-group-lg > .input-group-append > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-lg > .input-group-append > input, -#rubric-rubric.gradingform_rubric .input-group-lg > .input-group-append > .addcriterion { +.input-group-lg > .input-group-append > .btn { padding: 0.5rem 1rem; font-size: 1.171875rem; line-height: 1.5; @@ -4976,13 +4848,7 @@ input[type="button"].btn-block { .input-group-sm > .input-group-prepend > .input-group-text, .input-group-sm > .input-group-append > .input-group-text, .input-group-sm > .input-group-prepend > .btn, -#page-grade-grading-manage .actions .input-group-sm > .input-group-prepend > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-sm > .input-group-prepend > input, -#rubric-rubric.gradingform_rubric .input-group-sm > .input-group-prepend > .addcriterion, -.input-group-sm > .input-group-append > .btn, -#page-grade-grading-manage .actions .input-group-sm > .input-group-append > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group-sm > .input-group-append > input, -#rubric-rubric.gradingform_rubric .input-group-sm > .input-group-append > .addcriterion { +.input-group-sm > .input-group-append > .btn { padding: 0.25rem 0.5rem; font-size: 0.8203125rem; line-height: 1.5; @@ -4992,32 +4858,20 @@ input[type="button"].btn-block { .input-group-sm > .custom-select { padding-right: 1.75rem; } -.input-group > .input-group-prepend > .btn, #page-grade-grading-manage .actions .input-group > .input-group-prepend > .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group > .input-group-prepend > input, #rubric-rubric.gradingform_rubric .input-group > .input-group-prepend > .addcriterion, +.input-group > .input-group-prepend > .btn, .input-group > .input-group-prepend > .input-group-text, .input-group > .input-group-append:not(:last-child) > .btn, -#page-grade-grading-manage .actions .input-group > .input-group-append:not(:last-child) > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group > .input-group-append:not(:last-child) > input, -#rubric-rubric.gradingform_rubric .input-group > .input-group-append:not(:last-child) > .addcriterion, .input-group > .input-group-append:not(:last-child) > .input-group-text, .input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle), -#page-grade-grading-manage .actions .input-group > .input-group-append:last-child > .action:not(:last-child):not(.dropdown-toggle), -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group > .input-group-append:last-child > input:not(:last-child):not(.dropdown-toggle), -#rubric-rubric.gradingform_rubric .input-group > .input-group-append:last-child > .addcriterion:not(:last-child):not(.dropdown-toggle), .input-group > .input-group-append:last-child > .input-group-text:not(:last-child) { border-top-right-radius: 0; border-bottom-right-radius: 0; } -.input-group > .input-group-append > .btn, #page-grade-grading-manage .actions .input-group > .input-group-append > .action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group > .input-group-append > input, #rubric-rubric.gradingform_rubric .input-group > .input-group-append > .addcriterion, +.input-group > .input-group-append > .btn, .input-group > .input-group-append > .input-group-text, .input-group > .input-group-prepend:not(:first-child) > .btn, -#page-grade-grading-manage .actions .input-group > .input-group-prepend:not(:first-child) > .action, -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group > .input-group-prepend:not(:first-child) > input, -#rubric-rubric.gradingform_rubric .input-group > .input-group-prepend:not(:first-child) > .addcriterion, .input-group > .input-group-prepend:not(:first-child) > .input-group-text, .input-group > .input-group-prepend:first-child > .btn:not(:first-child), -#page-grade-grading-manage .actions .input-group > .input-group-prepend:first-child > .action:not(:first-child), -#rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .input-group > .input-group-prepend:first-child > input:not(:first-child), -#rubric-rubric.gradingform_rubric .input-group > .input-group-prepend:first-child > .addcriterion:not(:first-child), .input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) { border-top-left-radius: 0; border-bottom-left-radius: 0; } @@ -5968,7 +5822,7 @@ input[type="button"].btn-block { .badge:empty { display: none; } -.btn .badge, #page-grade-grading-manage .actions .action .badge, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input .badge, #rubric-rubric.gradingform_rubric .addcriterion .badge { +.btn .badge { position: relative; top: -1px; } @@ -11685,12 +11539,12 @@ body.h5p-embed .h5pmessages { .emoji-auto-complete { height: 40px; } - .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button, .emoji-auto-complete #page-grade-grading-manage .actions .btn-link.btn-icon.emoji-button.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-link.btn-icon.emoji-button.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.emoji-button, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-link.btn-icon.emoji-button, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-link.btn-icon.emoji-button.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-link.btn-icon.emoji-button.addcriterion { + .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button { height: 40px; width: 40px; line-height: 40px; font-size: 24px; } - .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete #page-grade-grading-manage .actions .btn-link.btn-icon.emoji-button.active.action, #page-grade-grading-manage .actions .emoji-auto-complete .btn-link.btn-icon.emoji-button.active.action, .emoji-auto-complete #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.emoji-button.active, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .emoji-auto-complete input.btn-link.btn-icon.emoji-button.active, .emoji-auto-complete #rubric-rubric.gradingform_rubric .btn-link.btn-icon.emoji-button.active.addcriterion, #rubric-rubric.gradingform_rubric .emoji-auto-complete .btn-link.btn-icon.emoji-button.active.addcriterion { + .emoji-auto-complete .btn.btn-link.btn-icon.emoji-button.active { background-color: #e9ecef; } .toast-wrapper { @@ -12429,12 +12283,12 @@ body.h5p-embed .h5pmessages { .block .block-cards .multiline { white-space: normal; } -.block .block-cards .btn.btn-link.btn-icon, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion { +.block .block-cards .btn.btn-link.btn-icon { height: 36px; width: 36px; padding: 0; border-radius: 50%; } - .block .block-cards .btn.btn-link.btn-icon:hover, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action:hover, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action:hover, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon:hover, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion:hover, .block .block-cards .btn.btn-link.btn-icon:focus, .block .block-cards #page-grade-grading-manage .actions .btn-link.btn-icon.action:focus, #page-grade-grading-manage .actions .block .block-cards .btn-link.btn-icon.action:focus, .block .block-cards #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .block .block-cards input.btn-link.btn-icon:focus, .block .block-cards #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .block .block-cards .btn-link.btn-icon.addcriterion:focus { + .block .block-cards .btn.btn-link.btn-icon:hover, .block .block-cards .btn.btn-link.btn-icon:focus { background-color: #e9ecef; } .dashboard-card-deck.one-row { @@ -13197,7 +13051,7 @@ body:not(.editing) .sitetopic ul.section { vertical-align: text-bottom; margin-left: 0; } -.path-course-view li.activity form.togglecompletion .btn, .path-course-view li.activity form.togglecompletion #page-grade-grading-manage .actions .action, #page-grade-grading-manage .actions .path-course-view li.activity form.togglecompletion .action, .path-course-view li.activity form.togglecompletion #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .path-course-view li.activity form.togglecompletion input, .path-course-view li.activity form.togglecompletion #rubric-rubric.gradingform_rubric .addcriterion, #rubric-rubric.gradingform_rubric .path-course-view li.activity form.togglecompletion .addcriterion { +.path-course-view li.activity form.togglecompletion .btn { padding: 0; } .path-course-view li.activity form.togglecompletion img { @@ -14962,40 +14816,40 @@ a.ygtvspacer:hover { display: inline-block; } .message-app .overview-section-toggle.collapsed .expanded-icon-container { display: none; } - .message-app .btn.btn-link.btn-icon, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion { + .message-app .btn.btn-link.btn-icon { height: 16px; width: 16px; padding: 0; border-radius: 50%; flex-shrink: 0; } - .message-app .btn.btn-link.btn-icon:hover, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action:hover, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action:hover, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon:hover, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:hover, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion:hover, .message-app .btn.btn-link.btn-icon:focus, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.action:focus, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.action:focus, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon:focus, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.addcriterion:focus, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.addcriterion:focus { + .message-app .btn.btn-link.btn-icon:hover, .message-app .btn.btn-link.btn-icon:focus { background-color: #e9ecef; } - .message-app .btn.btn-link.btn-icon.icon-size-0, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-0.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-0.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-0, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-0, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-0.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-0.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-0 { height: 20px !important; /* stylelint-disable-line declaration-no-important */ width: 20px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-1, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-1.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-1.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-1, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-1, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-1.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-1.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-1 { height: 24px !important; /* stylelint-disable-line declaration-no-important */ width: 24px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-2, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-2.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-2.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-2, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-2, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-2.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-2.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-2 { height: 28px !important; /* stylelint-disable-line declaration-no-important */ width: 28px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-3, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-3.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-3.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-3, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-3, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-3.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-3.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-3 { height: 36px !important; /* stylelint-disable-line declaration-no-important */ width: 36px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-4, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-4.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-4.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-4, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-4, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-4.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-4.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-4 { height: 44px !important; /* stylelint-disable-line declaration-no-important */ width: 44px !important; /* stylelint-disable-line declaration-no-important */ } - .message-app .btn.btn-link.btn-icon.icon-size-5, .message-app #page-grade-grading-manage .actions .btn-link.btn-icon.icon-size-5.action, #page-grade-grading-manage .actions .message-app .btn-link.btn-icon.icon-size-5.action, .message-app #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-link.btn-icon.icon-size-5, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .message-app input.btn-link.btn-icon.icon-size-5, .message-app #rubric-rubric.gradingform_rubric .btn-link.btn-icon.icon-size-5.addcriterion, #rubric-rubric.gradingform_rubric .message-app .btn-link.btn-icon.icon-size-5.addcriterion { + .message-app .btn.btn-link.btn-icon.icon-size-5 { height: 68px !important; /* stylelint-disable-line declaration-no-important */ width: 68px !important; @@ -17237,7 +17091,7 @@ div#dock { /** * Mod LTI. */ -.path-admin-mod-lti .btn .loader img, .path-admin-mod-lti #page-grade-grading-manage .actions .action .loader img, #page-grade-grading-manage .actions .path-admin-mod-lti .action .loader img, .path-admin-mod-lti #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input .loader img, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel .path-admin-mod-lti input .loader img, .path-admin-mod-lti #rubric-rubric.gradingform_rubric .addcriterion .loader img, #rubric-rubric.gradingform_rubric .path-admin-mod-lti .addcriterion .loader img, +.path-admin-mod-lti .btn .loader img, .path-admin-mod-lti #tool-list-loader-container .loader img { height: auto; } @@ -17525,7 +17379,7 @@ p.arrow_button { .btn-lineup { margin: 0 0 10px 5px; } -.btn.btn-icon, #page-grade-grading-manage .actions .btn-icon.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion { +.btn.btn-icon { height: 36px; width: 36px; font-size: 16px; @@ -17533,9 +17387,9 @@ p.arrow_button { padding: 0; border-radius: 50%; flex-shrink: 0; } - .btn.btn-icon:hover, #page-grade-grading-manage .actions .btn-icon.action:hover, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:hover, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:hover, .btn.btn-icon:focus, #page-grade-grading-manage .actions .btn-icon.action:focus, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon:focus, #rubric-rubric.gradingform_rubric .btn-icon.addcriterion:focus { + .btn.btn-icon:hover, .btn.btn-icon:focus { background-color: #e9ecef; } - .btn.btn-icon.icon-size-0, #page-grade-grading-manage .actions .btn-icon.icon-size-0.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-0, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-0.addcriterion { + .btn.btn-icon.icon-size-0 { height: 20px !important; /* stylelint-disable-line declaration-no-important */ width: 20px !important; @@ -17544,7 +17398,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 0 !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-1, #page-grade-grading-manage .actions .btn-icon.icon-size-1.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-1, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-1.addcriterion { + .btn.btn-icon.icon-size-1 { height: 24px !important; /* stylelint-disable-line declaration-no-important */ width: 24px !important; @@ -17553,7 +17407,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 4px !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-2, #page-grade-grading-manage .actions .btn-icon.icon-size-2.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-2, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-2.addcriterion { + .btn.btn-icon.icon-size-2 { height: 28px !important; /* stylelint-disable-line declaration-no-important */ width: 28px !important; @@ -17562,7 +17416,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 8px !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-3, #page-grade-grading-manage .actions .btn-icon.icon-size-3.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-3, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-3.addcriterion { + .btn.btn-icon.icon-size-3 { height: 36px !important; /* stylelint-disable-line declaration-no-important */ width: 36px !important; @@ -17571,7 +17425,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 16px !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-4, #page-grade-grading-manage .actions .btn-icon.icon-size-4.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-4, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-4.addcriterion { + .btn.btn-icon.icon-size-4 { height: 44px !important; /* stylelint-disable-line declaration-no-important */ width: 44px !important; @@ -17580,7 +17434,7 @@ p.arrow_button { /* stylelint-disable-line declaration-no-important */ line-height: 24px !important; /* stylelint-disable-line declaration-no-important */ } - .btn.btn-icon.icon-size-5, #page-grade-grading-manage .actions .btn-icon.icon-size-5.action, #rubric-rubric.gradingform_rubric #rubric-criteria .criterion .addlevel input.btn-icon.icon-size-5, #rubric-rubric.gradingform_rubric .btn-icon.icon-size-5.addcriterion { + .btn.btn-icon.icon-size-5 { height: 68px !important; /* stylelint-disable-line declaration-no-important */ width: 68px !important; From aa100b767f813d78d238255028c773f100390902 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 27 Nov 2019 11:47:46 +0100 Subject: [PATCH 20/23] MDL-66999 theme_boost: @extend remove extends for questions --- question/behaviour/adaptive/renderer.php | 2 +- question/classes/bank/view.php | 2 +- question/engine/renderer.php | 2 +- theme/boost/scss/moodle/question.scss | 23 ++-- theme/boost/style/moodle.css | 147 +++++++++++--------- theme/classic/style/moodle.css | 166 +++++++++++++---------- 6 files changed, 188 insertions(+), 154 deletions(-) diff --git a/question/behaviour/adaptive/renderer.php b/question/behaviour/adaptive/renderer.php index 3c1f90f8260..b431a839e32 100644 --- a/question/behaviour/adaptive/renderer.php +++ b/question/behaviour/adaptive/renderer.php @@ -68,7 +68,7 @@ class qbehaviour_adaptive_renderer extends qbehaviour_renderer { // Display the grading details from the last graded state. $class = $details->state->get_feedback_class(); return html_writer::tag('div', get_string($class, 'question'), - array('class' => 'correctness ' . $class)) + array('class' => 'correctness badge ' . $class)) . html_writer::tag('div', $this->grading_details($details, $options), array('class' => 'gradingdetails')); } diff --git a/question/classes/bank/view.php b/question/classes/bank/view.php index aa67acc355b..c8ec2257503 100644 --- a/question/classes/bank/view.php +++ b/question/classes/bank/view.php @@ -956,7 +956,7 @@ class view { $classes[] = 'dimmed_text'; } if ($question->id == $this->lastchangedid) { - $classes[] = 'highlight'; + $classes[] = 'highlight text-dark'; } $classes[] = 'r' . ($rowcount % 2); return $classes; diff --git a/question/engine/renderer.php b/question/engine/renderer.php index 6d19acbf753..4ce351e39e4 100644 --- a/question/engine/renderer.php +++ b/question/engine/renderer.php @@ -118,7 +118,7 @@ class core_question_renderer extends plugin_renderer_base { array('class' => 'comment clearfix')); $output .= html_writer::nonempty_tag('div', $this->response_history($qa, $behaviouroutput, $qtoutput, $options), - array('class' => 'history clearfix')); + array('class' => 'history clearfix border p-2')); $output .= html_writer::end_tag('div'); $output .= html_writer::end_tag('div'); diff --git a/theme/boost/scss/moodle/question.scss b/theme/boost/scss/moodle/question.scss index 6154e04def9..ce19643bacc 100644 --- a/theme/boost/scss/moodle/question.scss +++ b/theme/boost/scss/moodle/question.scss @@ -174,10 +174,6 @@ } } - .highlight { - @extend .text-dark; - } - label { margin: 0; display: block; @@ -293,15 +289,19 @@ body.path-question-type { .que .formulation, .que .outcome, .que .comment { - @extend .alert; + position: relative; + padding: $alert-padding-y $alert-padding-x; + margin-bottom: $alert-margin-bottom; + border: $alert-border-width solid transparent; + @include border-radius($alert-border-radius); } .que .outcome, .que .comment { - @extend .alert-warning; + @include alert-variant(theme-color-level('warning', $alert-bg-level), theme-color-level('warning', $alert-border-level), theme-color-level('warning', $alert-color-level)); /* stylelint-disable-line max-line-length */ } .que .formulation { - @extend .alert-info; + @include alert-variant(theme-color-level('info', $alert-bg-level), theme-color-level('info', $alert-border-level), theme-color-level('info', $alert-color-level)); /* stylelint-disable-line max-line-length */ } .que.multichoice .answer div.r0 .icon.fa-check, @@ -339,11 +339,7 @@ body.path-question-type { } .que .comment { - @extend .alert-success; -} - -.que .history { - @extend .card; + @include alert-variant(theme-color-level('success', $alert-bg-level), theme-color-level('success', $alert-border-level), theme-color-level('success', $alert-color-level)); /* stylelint-disable-line max-line-length */ } .que .ablock { @@ -366,7 +362,6 @@ body.path-question-type { } .que .correctness { - @extend .tag; &.correct { background-color: $state-success-text; } @@ -384,7 +379,7 @@ body.path-question-type { } .que .validationerror { - @extend .text-danger; + color: map-get($theme-colors, 'danger'); } // copied from .formFieldState in mixin.less // and made more specific diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 895f822a9c8..8f59909992a 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -2308,12 +2308,8 @@ .fa-meetup:before { content: ""; } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, -.path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, -.path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, -.path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, -.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, +.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, +.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .tag_list > b { position: absolute; width: 1px; @@ -5436,7 +5432,7 @@ input[type="button"].btn-block { .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { color: #fff; } -.card, .que .history, .userprofile .profile_tree section, .groupinfobox, .well { +.card, .userprofile .profile_tree section, .groupinfobox, .well { position: relative; display: flex; flex-direction: column; @@ -5445,7 +5441,7 @@ input[type="button"].btn-block { background-color: #fff; background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); } - .card > hr, .que .history > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { + .card > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { margin-right: 0; margin-left: 0; } @@ -5512,14 +5508,14 @@ input[type="button"].btn-block { .card-deck { display: flex; flex-direction: column; } - .card-deck .card, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-deck { flex-flow: row wrap; margin-right: -0.25rem; margin-left: -0.25rem; } - .card-deck .card, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { display: flex; flex: 1 0 0%; flex-direction: column; @@ -5530,19 +5526,19 @@ input[type="button"].btn-block { .card-group { display: flex; flex-direction: column; } - .card-group > .card, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-group { flex-flow: row wrap; } - .card-group > .card, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { flex: 1 0 0%; margin-bottom: 0; } - .card-group > .card + .card, .que .card-group > .history + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, .que .card-group > .card + .history, .que .card-group > .history + .history, .userprofile .profile_tree .que .card-group > section + .history, .que .userprofile .profile_tree .card-group > section + .history, .que .card-group > .groupinfobox + .history, .que .card-group > .well + .history, .userprofile .profile_tree .card-group > .card + section, .que .userprofile .profile_tree .card-group > .history + section, .userprofile .profile_tree .que .card-group > .history + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, .que .card-group > .history + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, .que .card-group > .history + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { + .card-group > .card + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, .userprofile .profile_tree .card-group > .card + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { margin-left: 0; border-left: 0; } } -.card-columns .card, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { +.card-columns .card, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { margin-bottom: 0.75rem; } @media (min-width: 576px) { @@ -5551,17 +5547,17 @@ input[type="button"].btn-block { column-gap: 1.25rem; orphans: 1; widows: 1; } - .card-columns .card, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { + .card-columns .card, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { display: inline-block; width: 100%; } } -.accordion > .card, .que .accordion > .history, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { +.accordion > .card, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { overflow: hidden; } - .accordion > .card:not(:first-of-type):not(:last-of-type), .que .accordion > .history:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { + .accordion > .card:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { border-bottom: 0; } - .accordion > .card:first-of-type, .que .accordion > .history:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { + .accordion > .card:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { border-bottom: 0; } - .accordion > .card .card-header, .que .accordion > .history .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { + .accordion > .card .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { margin-bottom: -1px; } .breadcrumb { @@ -5758,9 +5754,7 @@ input[type="button"].btn-block { padding-right: 0; padding-left: 0; } -.alert, .que .formulation, -.que .outcome, -.que .comment, .assignfeedback_editpdf_widget .label { +.alert, .assignfeedback_editpdf_widget .label { position: relative; padding: 0.75rem 1.25rem; margin-bottom: 1rem; @@ -5799,34 +5793,31 @@ input[type="button"].btn-block { .alert-secondary .alert-link { color: #525557; } -.alert-success, -.que .comment { +.alert-success { color: #306030; background-color: #def1de; border-color: #d1ebd1; } - .alert-success hr, .que .comment hr { + .alert-success hr { border-top-color: #bfe3bf; } - .alert-success .alert-link, .que .comment .alert-link { + .alert-success .alert-link { color: #1f3e1f; } -.alert-info, .que .formulation, .assignfeedback_editpdf_widget .label { +.alert-info, .assignfeedback_editpdf_widget .label { color: #2f6473; background-color: #def2f8; border-color: #d1edf6; } - .alert-info hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { + .alert-info hr, .assignfeedback_editpdf_widget .label hr { border-top-color: #bce5f2; } - .alert-info .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { + .alert-info .alert-link, .assignfeedback_editpdf_widget .label .alert-link { color: #20454f; } -.alert-warning, -.que .outcome, -.que .comment { +.alert-warning { color: #7d5a29; background-color: #fcefdc; border-color: #fbe8cd; } - .alert-warning hr, .que .outcome hr, .que .comment hr { + .alert-warning hr { border-top-color: #f9ddb5; } - .alert-warning .alert-link, .que .outcome .alert-link, .que .comment .alert-link { + .alert-warning .alert-link { color: #573e1c; } .alert-danger { @@ -7481,12 +7472,8 @@ button.bg-dark:focus { top: 0; z-index: 1020; } } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, -.path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, -.path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, -.path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, -.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, +.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, +.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .tag_list > b { position: absolute; width: 1px; @@ -9052,10 +9039,10 @@ a.text-info:hover, a.text-info:focus { a.text-warning:hover, a.text-warning:focus { color: #df8a13 !important; } -.text-danger, .que .validationerror, .text-error { +.text-danger, .text-error { color: #d9534f !important; } -a.text-danger:hover, .que a.validationerror:hover, a.text-error:hover, a.text-danger:focus, .que a.validationerror:focus, a.text-error:focus { +a.text-danger:hover, a.text-error:hover, a.text-danger:focus, a.text-error:focus { color: #b52b27 !important; } .text-light { @@ -9064,10 +9051,10 @@ a.text-danger:hover, .que a.validationerror:hover, a.text-error:hover, a.text-da a.text-light:hover, a.text-light:focus { color: #cbd3da !important; } -.text-dark, #categoryquestions .highlight { +.text-dark { color: #373a3c !important; } -a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #categoryquestions a.highlight:focus { +a.text-dark:hover, a.text-dark:focus { color: #121314 !important; } .text-body { @@ -9165,7 +9152,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat /* stylelint-disable function-url-scheme-blacklist */ /* stylelint-enable function-url-scheme-blacklist */ -.tag, .que .correctness, .label { +.tag, .label { display: inline-block; padding: 0.25rem 0.4em; font-size: 75%; @@ -9175,7 +9162,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat text-align: center; white-space: nowrap; vertical-align: baseline; } - .tag:empty, .que .correctness:empty, .label:empty { + .tag:empty, .label:empty { display: none; } .form-control-success, @@ -12044,7 +12031,7 @@ body.h5p-embed .h5pmessages { .block .block-cards .icon { margin-right: 0; } -.block .block-cards .card .coursemenubtn, .block .block-cards .que .history .coursemenubtn, .que .block .block-cards .history .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { +.block .block-cards .card .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { margin-top: -0.5rem; } .block .block-cards a.coursename, @@ -13267,12 +13254,6 @@ span.editinstructions { margin: 0.4rem 1rem 0.45rem; } #course-category-listings .select-a-category .notifymessage, #course-category-listings .select-a-category .alert, - #course-category-listings .select-a-category .que .formulation, - .que #course-category-listings .select-a-category .formulation, - #course-category-listings .select-a-category .que .outcome, - .que #course-category-listings .select-a-category .outcome, - #course-category-listings .select-a-category .que .comment, - .que #course-category-listings .select-a-category .comment, #course-category-listings .select-a-category .assignfeedback_editpdf_widget .label, .assignfeedback_editpdf_widget #course-category-listings .select-a-category .label { margin: 1em; } @@ -14874,12 +14855,8 @@ body.path-question-type { font: inherit; position: static; padding-right: .3em; } - body.path-question-type .form-group .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, + body.path-question-type .form-group .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b { position: static; width: auto; @@ -14928,6 +14905,37 @@ body.path-question-type { .que .content { margin: 0 0 0 8.5em; } +.que .formulation, +.que .outcome, +.que .comment { + position: relative; + padding: 0.75rem 1.25rem; + margin-bottom: 1rem; + border: 0 solid transparent; } + +.que .outcome, +.que .comment { + color: #7d5a29; + background-color: #fcefdc; + border-color: #fbe8cd; + /* stylelint-disable-line max-line-length */ } + .que .outcome hr, + .que .comment hr { + border-top-color: #f9ddb5; } + .que .outcome .alert-link, + .que .comment .alert-link { + color: #573e1c; } + +.que .formulation { + color: #2f6473; + background-color: #def2f8; + border-color: #d1edf6; + /* stylelint-disable-line max-line-length */ } + .que .formulation hr { + border-top-color: #bce5f2; } + .que .formulation .alert-link { + color: #20454f; } + .que.multichoice .answer div.r0 .icon.fa-check, .que.multichoice .answer div.r1 .icon.fa-check, .que.multichoice .answer div.r0 .icon.fa-remove, @@ -14956,6 +14964,16 @@ body.path-question-type { width: auto; max-width: 100%; } +.que .comment { + color: #306030; + background-color: #def1de; + border-color: #d1ebd1; + /* stylelint-disable-line max-line-length */ } + .que .comment hr { + border-top-color: #bfe3bf; } + .que .comment .alert-link { + color: #1f3e1f; } + .que .ablock { margin: 0.7em 0 0.3em 0; } @@ -14983,6 +15001,9 @@ body.path-question-type { .que .qtext { margin-bottom: 1.5em; } +.que .validationerror { + color: #d9534f; } + .que .grading, .que .comment, .que .commentlink, @@ -17223,7 +17244,7 @@ p.arrow_button { width: auto; display: inline-flex; flex-direction: column; } - .path-grade-report-grader #region-main > .card, .path-grade-report-grader .que #region-main > .history, .que .path-grade-report-grader #region-main > .history, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { + .path-grade-report-grader #region-main > .card, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { width: auto; overflow-x: initial; } .path-grade-report-grader #region-main div[role="main"] { @@ -17640,12 +17661,12 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu, * - Make the content region flex grow so it pushes things like the * next activity selector to the bottom of the page. */ -body.reset-style #page-header .card, body.reset-style #page-header .que .history, .que body.reset-style #page-header .history, body.reset-style #page-header .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header section, body.reset-style #page-header .groupinfobox, body.reset-style #page-header .well { +body.reset-style #page-header .card, body.reset-style #page-header .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header section, body.reset-style #page-header .groupinfobox, body.reset-style #page-header .well { border: none; } - body.reset-style #page-header .card .page-header-headings h1, body.reset-style #page-header .que .history .page-header-headings h1, .que body.reset-style #page-header .history .page-header-headings h1, body.reset-style #page-header .userprofile .profile_tree section .page-header-headings h1, .userprofile .profile_tree body.reset-style #page-header section .page-header-headings h1, body.reset-style #page-header .groupinfobox .page-header-headings h1, body.reset-style #page-header .well .page-header-headings h1 { + body.reset-style #page-header .card .page-header-headings h1, body.reset-style #page-header .userprofile .profile_tree section .page-header-headings h1, .userprofile .profile_tree body.reset-style #page-header section .page-header-headings h1, body.reset-style #page-header .groupinfobox .page-header-headings h1, body.reset-style #page-header .well .page-header-headings h1 { margin-bottom: 0; } @media (max-width: 767.98px) { - body.reset-style #page-header .card .card-body, body.reset-style #page-header .que .history .card-body, .que body.reset-style #page-header .history .card-body, body.reset-style #page-header .userprofile .profile_tree section .card-body, .userprofile .profile_tree body.reset-style #page-header section .card-body, body.reset-style #page-header .groupinfobox .card-body, body.reset-style #page-header .well .card-body, body.reset-style #page-header .card .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .card section, body.reset-style #page-header .que .history .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .que .history section, .que body.reset-style #page-header .history .userprofile .profile_tree section, .userprofile .profile_tree .que body.reset-style #page-header .history section, body.reset-style #page-header .userprofile .profile_tree section section, .userprofile .profile_tree body.reset-style #page-header section section, body.reset-style #page-header .groupinfobox .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .groupinfobox section, body.reset-style #page-header .well .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .well section { + body.reset-style #page-header .card .card-body, body.reset-style #page-header .userprofile .profile_tree section .card-body, .userprofile .profile_tree body.reset-style #page-header section .card-body, body.reset-style #page-header .groupinfobox .card-body, body.reset-style #page-header .well .card-body, body.reset-style #page-header .card .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .card section, body.reset-style #page-header .userprofile .profile_tree section section, .userprofile .profile_tree body.reset-style #page-header section section, body.reset-style #page-header .groupinfobox .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .groupinfobox section, body.reset-style #page-header .well .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .well section { padding-left: 0; padding-right: 0; } } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 3140e624f32..2818930e241 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -2308,12 +2308,8 @@ .fa-meetup:before { content: ""; } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, -.path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, -.path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, -.path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, -.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, +.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, +.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .tag_list > b { position: absolute; width: 1px; @@ -5517,7 +5513,7 @@ input[type="button"].btn-block { .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { color: #fff; } -.card, .que .history, .userprofile .profile_tree section, .groupinfobox, .well { +.card, .userprofile .profile_tree section, .groupinfobox, .well { position: relative; display: flex; flex-direction: column; @@ -5527,13 +5523,13 @@ input[type="button"].btn-block { background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 0.25rem; } - .card > hr, .que .history > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { + .card > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { margin-right: 0; margin-left: 0; } - .card > .list-group:first-child .list-group-item:first-child, .que .history > .list-group:first-child .list-group-item:first-child, .userprofile .profile_tree section > .list-group:first-child .list-group-item:first-child, .groupinfobox > .list-group:first-child .list-group-item:first-child, .well > .list-group:first-child .list-group-item:first-child { + .card > .list-group:first-child .list-group-item:first-child, .userprofile .profile_tree section > .list-group:first-child .list-group-item:first-child, .groupinfobox > .list-group:first-child .list-group-item:first-child, .well > .list-group:first-child .list-group-item:first-child { border-top-left-radius: 0.25rem; border-top-right-radius: 0.25rem; } - .card > .list-group:last-child .list-group-item:last-child, .que .history > .list-group:last-child .list-group-item:last-child, .userprofile .profile_tree section > .list-group:last-child .list-group-item:last-child, .groupinfobox > .list-group:last-child .list-group-item:last-child, .well > .list-group:last-child .list-group-item:last-child { + .card > .list-group:last-child .list-group-item:last-child, .userprofile .profile_tree section > .list-group:last-child .list-group-item:last-child, .groupinfobox > .list-group:last-child .list-group-item:last-child, .well > .list-group:last-child .list-group-item:last-child { border-bottom-right-radius: 0.25rem; border-bottom-left-radius: 0.25rem; } @@ -5609,14 +5605,14 @@ input[type="button"].btn-block { .card-deck { display: flex; flex-direction: column; } - .card-deck .card, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-deck { flex-flow: row wrap; margin-right: -0.25rem; margin-left: -0.25rem; } - .card-deck .card, .card-deck .que .history, .que .card-deck .history, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { display: flex; flex: 1 0 0%; flex-direction: column; @@ -5627,53 +5623,49 @@ input[type="button"].btn-block { .card-group { display: flex; flex-direction: column; } - .card-group > .card, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-group { flex-flow: row wrap; } - .card-group > .card, .que .card-group > .history, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { flex: 1 0 0%; margin-bottom: 0; } - .card-group > .card + .card, .que .card-group > .history + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, .que .card-group > .card + .history, .que .card-group > .history + .history, .userprofile .profile_tree .que .card-group > section + .history, .que .userprofile .profile_tree .card-group > section + .history, .que .card-group > .groupinfobox + .history, .que .card-group > .well + .history, .userprofile .profile_tree .card-group > .card + section, .que .userprofile .profile_tree .card-group > .history + section, .userprofile .profile_tree .que .card-group > .history + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, .que .card-group > .history + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, .que .card-group > .history + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { + .card-group > .card + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, .userprofile .profile_tree .card-group > .card + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { margin-left: 0; border-left: 0; } - .card-group > .card:not(:last-child), .que .card-group > .history:not(:last-child), .userprofile .profile_tree .card-group > section:not(:last-child), .card-group > .groupinfobox:not(:last-child), .card-group > .well:not(:last-child) { + .card-group > .card:not(:last-child), .userprofile .profile_tree .card-group > section:not(:last-child), .card-group > .groupinfobox:not(:last-child), .card-group > .well:not(:last-child) { border-top-right-radius: 0; border-bottom-right-radius: 0; } - .card-group > .card:not(:last-child) .card-img-top, .que .card-group > .history:not(:last-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-top, .card-group > .groupinfobox:not(:last-child) .card-img-top, .card-group > .well:not(:last-child) .card-img-top, + .card-group > .card:not(:last-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-top, .card-group > .groupinfobox:not(:last-child) .card-img-top, .card-group > .well:not(:last-child) .card-img-top, .card-group > .card:not(:last-child) .card-header, - .que .card-group > .history:not(:last-child) .card-header, .userprofile .profile_tree .card-group > section:not(:last-child) .card-header, .card-group > .groupinfobox:not(:last-child) .card-header, .card-group > .well:not(:last-child) .card-header { border-top-right-radius: 0; } - .card-group > .card:not(:last-child) .card-img-bottom, .que .card-group > .history:not(:last-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-bottom, .card-group > .groupinfobox:not(:last-child) .card-img-bottom, .card-group > .well:not(:last-child) .card-img-bottom, + .card-group > .card:not(:last-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-bottom, .card-group > .groupinfobox:not(:last-child) .card-img-bottom, .card-group > .well:not(:last-child) .card-img-bottom, .card-group > .card:not(:last-child) .card-footer, - .que .card-group > .history:not(:last-child) .card-footer, .userprofile .profile_tree .card-group > section:not(:last-child) .card-footer, .card-group > .groupinfobox:not(:last-child) .card-footer, .card-group > .well:not(:last-child) .card-footer { border-bottom-right-radius: 0; } - .card-group > .card:not(:first-child), .que .card-group > .history:not(:first-child), .userprofile .profile_tree .card-group > section:not(:first-child), .card-group > .groupinfobox:not(:first-child), .card-group > .well:not(:first-child) { + .card-group > .card:not(:first-child), .userprofile .profile_tree .card-group > section:not(:first-child), .card-group > .groupinfobox:not(:first-child), .card-group > .well:not(:first-child) { border-top-left-radius: 0; border-bottom-left-radius: 0; } - .card-group > .card:not(:first-child) .card-img-top, .que .card-group > .history:not(:first-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-top, .card-group > .groupinfobox:not(:first-child) .card-img-top, .card-group > .well:not(:first-child) .card-img-top, + .card-group > .card:not(:first-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-top, .card-group > .groupinfobox:not(:first-child) .card-img-top, .card-group > .well:not(:first-child) .card-img-top, .card-group > .card:not(:first-child) .card-header, - .que .card-group > .history:not(:first-child) .card-header, .userprofile .profile_tree .card-group > section:not(:first-child) .card-header, .card-group > .groupinfobox:not(:first-child) .card-header, .card-group > .well:not(:first-child) .card-header { border-top-left-radius: 0; } - .card-group > .card:not(:first-child) .card-img-bottom, .que .card-group > .history:not(:first-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-bottom, .card-group > .groupinfobox:not(:first-child) .card-img-bottom, .card-group > .well:not(:first-child) .card-img-bottom, + .card-group > .card:not(:first-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-bottom, .card-group > .groupinfobox:not(:first-child) .card-img-bottom, .card-group > .well:not(:first-child) .card-img-bottom, .card-group > .card:not(:first-child) .card-footer, - .que .card-group > .history:not(:first-child) .card-footer, .userprofile .profile_tree .card-group > section:not(:first-child) .card-footer, .card-group > .groupinfobox:not(:first-child) .card-footer, .card-group > .well:not(:first-child) .card-footer { border-bottom-left-radius: 0; } } -.card-columns .card, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { +.card-columns .card, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { margin-bottom: 0.75rem; } @media (min-width: 576px) { @@ -5682,25 +5674,25 @@ input[type="button"].btn-block { column-gap: 1.25rem; orphans: 1; widows: 1; } - .card-columns .card, .card-columns .que .history, .que .card-columns .history, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { + .card-columns .card, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { display: inline-block; width: 100%; } } -.accordion > .card, .que .accordion > .history, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { +.accordion > .card, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { overflow: hidden; } - .accordion > .card:not(:first-of-type) .card-header:first-child, .que .accordion > .history:not(:first-of-type) .card-header:first-child, .userprofile .profile_tree .accordion > section:not(:first-of-type) .card-header:first-child, .accordion > .groupinfobox:not(:first-of-type) .card-header:first-child, .accordion > .well:not(:first-of-type) .card-header:first-child { + .accordion > .card:not(:first-of-type) .card-header:first-child, .userprofile .profile_tree .accordion > section:not(:first-of-type) .card-header:first-child, .accordion > .groupinfobox:not(:first-of-type) .card-header:first-child, .accordion > .well:not(:first-of-type) .card-header:first-child { border-radius: 0; } - .accordion > .card:not(:first-of-type):not(:last-of-type), .que .accordion > .history:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { + .accordion > .card:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { border-bottom: 0; border-radius: 0; } - .accordion > .card:first-of-type, .que .accordion > .history:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { + .accordion > .card:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { border-bottom: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } - .accordion > .card:last-of-type, .que .accordion > .history:last-of-type, .userprofile .profile_tree .accordion > section:last-of-type, .accordion > .groupinfobox:last-of-type, .accordion > .well:last-of-type { + .accordion > .card:last-of-type, .userprofile .profile_tree .accordion > section:last-of-type, .accordion > .groupinfobox:last-of-type, .accordion > .well:last-of-type { border-top-left-radius: 0; border-top-right-radius: 0; } - .accordion > .card .card-header, .que .accordion > .history .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { + .accordion > .card .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { margin-bottom: -1px; } .breadcrumb { @@ -5925,9 +5917,7 @@ input[type="button"].btn-block { padding-left: 0; border-radius: 0; } -.alert, .que .formulation, -.que .outcome, -.que .comment, .assignfeedback_editpdf_widget .label { +.alert, .assignfeedback_editpdf_widget .label { position: relative; padding: 0.75rem 1.25rem; margin-bottom: 1rem; @@ -5967,34 +5957,31 @@ input[type="button"].btn-block { .alert-secondary .alert-link { color: #606162; } -.alert-success, -.que .comment { +.alert-success { color: #306030; background-color: #def1de; border-color: #d1ebd1; } - .alert-success hr, .que .comment hr { + .alert-success hr { border-top-color: #bfe3bf; } - .alert-success .alert-link, .que .comment .alert-link { + .alert-success .alert-link { color: #1f3e1f; } -.alert-info, .que .formulation, .assignfeedback_editpdf_widget .label { +.alert-info, .assignfeedback_editpdf_widget .label { color: #2f6473; background-color: #def2f8; border-color: #d1edf6; } - .alert-info hr, .que .formulation hr, .assignfeedback_editpdf_widget .label hr { + .alert-info hr, .assignfeedback_editpdf_widget .label hr { border-top-color: #bce5f2; } - .alert-info .alert-link, .que .formulation .alert-link, .assignfeedback_editpdf_widget .label .alert-link { + .alert-info .alert-link, .assignfeedback_editpdf_widget .label .alert-link { color: #20454f; } -.alert-warning, -.que .outcome, -.que .comment { +.alert-warning { color: #7d5a29; background-color: #fcefdc; border-color: #fbe8cd; } - .alert-warning hr, .que .outcome hr, .que .comment hr { + .alert-warning hr { border-top-color: #f9ddb5; } - .alert-warning .alert-link, .que .outcome .alert-link, .que .comment .alert-link { + .alert-warning .alert-link { color: #573e1c; } .alert-danger { @@ -7700,12 +7687,8 @@ button.bg-dark:focus { top: 0; z-index: 1020; } } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, -.path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, -.path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, -.path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, -.path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, +.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, +.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode .tag_list > b { position: absolute; width: 1px; @@ -9271,10 +9254,10 @@ a.text-info:hover, a.text-info:focus { a.text-warning:hover, a.text-warning:focus { color: #df8a13 !important; } -.text-danger, .que .validationerror, .text-error { +.text-danger, .text-error { color: #d9534f !important; } -a.text-danger:hover, .que a.validationerror:hover, a.text-error:hover, a.text-danger:focus, .que a.validationerror:focus, a.text-error:focus { +a.text-danger:hover, a.text-error:hover, a.text-danger:focus, a.text-error:focus { color: #b52b27 !important; } .text-light { @@ -9283,10 +9266,10 @@ a.text-danger:hover, .que a.validationerror:hover, a.text-error:hover, a.text-da a.text-light:hover, a.text-light:focus { color: #cbd3da !important; } -.text-dark, #categoryquestions .highlight { +.text-dark { color: #373a3c !important; } -a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #categoryquestions a.highlight:focus { +a.text-dark:hover, a.text-dark:focus { color: #121314 !important; } .text-body { @@ -9384,7 +9367,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat /* stylelint-disable function-url-scheme-blacklist */ /* stylelint-enable function-url-scheme-blacklist */ -.tag, .que .correctness, .label { +.tag, .label { display: inline-block; padding: 0.25rem 0.4em; font-size: 75%; @@ -9395,7 +9378,7 @@ a.text-dark:hover, #categoryquestions a.highlight:hover, a.text-dark:focus, #cat white-space: nowrap; vertical-align: baseline; border-radius: 0.25rem; } - .tag:empty, .que .correctness:empty, .label:empty { + .tag:empty, .label:empty { display: none; } .form-control-success, @@ -12272,7 +12255,7 @@ body.h5p-embed .h5pmessages { .block .block-cards .icon { margin-right: 0; } -.block .block-cards .card .coursemenubtn, .block .block-cards .que .history .coursemenubtn, .que .block .block-cards .history .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { +.block .block-cards .card .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { margin-top: -0.5rem; } .block .block-cards a.coursename, @@ -13497,12 +13480,6 @@ span.editinstructions { margin: 0.4rem 1rem 0.45rem; } #course-category-listings .select-a-category .notifymessage, #course-category-listings .select-a-category .alert, - #course-category-listings .select-a-category .que .formulation, - .que #course-category-listings .select-a-category .formulation, - #course-category-listings .select-a-category .que .outcome, - .que #course-category-listings .select-a-category .outcome, - #course-category-listings .select-a-category .que .comment, - .que #course-category-listings .select-a-category .comment, #course-category-listings .select-a-category .assignfeedback_editpdf_widget .label, .assignfeedback_editpdf_widget #course-category-listings .select-a-category .label { margin: 1em; } @@ -15108,12 +15085,8 @@ body.path-question-type { font: inherit; position: static; padding-right: .3em; } - body.path-question-type .form-group .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, - body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum .nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum .nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.formulation, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.formulation, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.formulation, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.formulation, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.outcome, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.outcome, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.outcome, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.outcome, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .que .discussionlocked.comment, .path-mod-forum.nested-v2-display-mode .que body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .que .path-mod-forum.nested-v2-display-mode .discussionlocked.comment, .que .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.comment, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, + body.path-question-type .form-group .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, + body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b { position: static; width: auto; @@ -15163,6 +15136,38 @@ body.path-question-type { .que .content { margin: 0 0 0 8.5em; } +.que .formulation, +.que .outcome, +.que .comment { + position: relative; + padding: 0.75rem 1.25rem; + margin-bottom: 1rem; + border: 0 solid transparent; + border-radius: 0.25rem; } + +.que .outcome, +.que .comment { + color: #7d5a29; + background-color: #fcefdc; + border-color: #fbe8cd; + /* stylelint-disable-line max-line-length */ } + .que .outcome hr, + .que .comment hr { + border-top-color: #f9ddb5; } + .que .outcome .alert-link, + .que .comment .alert-link { + color: #573e1c; } + +.que .formulation { + color: #2f6473; + background-color: #def2f8; + border-color: #d1edf6; + /* stylelint-disable-line max-line-length */ } + .que .formulation hr { + border-top-color: #bce5f2; } + .que .formulation .alert-link { + color: #20454f; } + .que.multichoice .answer div.r0 .icon.fa-check, .que.multichoice .answer div.r1 .icon.fa-check, .que.multichoice .answer div.r0 .icon.fa-remove, @@ -15191,6 +15196,16 @@ body.path-question-type { width: auto; max-width: 100%; } +.que .comment { + color: #306030; + background-color: #def1de; + border-color: #d1ebd1; + /* stylelint-disable-line max-line-length */ } + .que .comment hr { + border-top-color: #bfe3bf; } + .que .comment .alert-link { + color: #1f3e1f; } + .que .ablock { margin: 0.7em 0 0.3em 0; } @@ -15218,6 +15233,9 @@ body.path-question-type { .que .qtext { margin-bottom: 1.5em; } +.que .validationerror { + color: #d9534f; } + .que .grading, .que .comment, .que .commentlink, @@ -17468,7 +17486,7 @@ p.arrow_button { width: auto; display: inline-flex; flex-direction: column; } - .path-grade-report-grader #region-main > .card, .path-grade-report-grader .que #region-main > .history, .que .path-grade-report-grader #region-main > .history, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { + .path-grade-report-grader #region-main > .card, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { width: auto; overflow-x: initial; } .path-grade-report-grader #region-main div[role="main"] { From 55193f70d87a27b2122ed8aa51df3079de0c83cc Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 27 Nov 2019 12:22:25 +0100 Subject: [PATCH 21/23] MDL-66999 theme_boost: @extend remove extends for users --- group/templates/group_details.mustache | 2 +- theme/boost/scss/moodle/modules.scss | 16 ++- theme/boost/scss/moodle/user.scss | 16 --- theme/boost/style/moodle.css | 111 ++++++++++------- theme/classic/style/moodle.css | 134 ++++++++++++--------- user/classes/output/myprofile/renderer.php | 11 +- 6 files changed, 164 insertions(+), 126 deletions(-) diff --git a/group/templates/group_details.mustache b/group/templates/group_details.mustache index bd6408ff469..8662e45e8c5 100644 --- a/group/templates/group_details.mustache +++ b/group/templates/group_details.mustache @@ -40,7 +40,7 @@ } }} {{#name}} -
+
{{#pictureurl}}
{{{name}}}
{{/pictureurl}} diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss index ae0d3a40070..18628800f1a 100644 --- a/theme/boost/scss/moodle/modules.scss +++ b/theme/boost/scss/moodle/modules.scss @@ -286,7 +286,7 @@ $author-image-margin-sm: 8px; /** Don't show the discussion locked alert in this mode because it's already indicated with a badge. */ .alert.discussionlocked { - @extend .sr-only; + @include sr-only(); } /** Fix muted text contrast ratios for accessibility. */ @@ -305,7 +305,7 @@ $author-image-margin-sm: 8px; /** Make the tag list text screen reader visible only */ .tag_list > b { - @extend .sr-only; + @include sr-only(); } :target > .focus-target { @@ -1316,7 +1316,9 @@ $popout-header-height: 4rem; .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { - @extend .modal-header; + display: flex; + align-items: flex-start; + justify-content: space-between; font-size: $popout-header-font-size; } @@ -1376,8 +1378,12 @@ $popout-header-height: 4rem; } .assignfeedback_editpdf_widget .label { - @extend .alert; - @extend .alert-info; + position: relative; + padding: $alert-padding-y $alert-padding-x; + margin-bottom: $alert-margin-bottom; + border: $alert-border-width solid transparent; + @include border-radius($alert-border-radius); + @include alert-variant(theme-color-level('info', $alert-bg-level), theme-color-level('info', $alert-border-level), theme-color-level('info', $alert-color-level)); /* stylelint-disable-line max-line-length */ } .assignfeedback_editpdf_menu { diff --git a/theme/boost/scss/moodle/user.scss b/theme/boost/scss/moodle/user.scss index 5fe724cc8d0..2f847c675d9 100644 --- a/theme/boost/scss/moodle/user.scss +++ b/theme/boost/scss/moodle/user.scss @@ -15,18 +15,6 @@ .userprofile .profile_tree { column-count: 2; - - section { - @extend .card; - @extend .card-body; - display: inline-block; - width: 100%; - margin-bottom: 1rem; - - h3 { - @extend .lead; - } - } } // This rule overrides the automatic no-overflow on the participants table. It kills the auto-complete. @@ -217,10 +205,6 @@ } } -.groupinfobox { - @extend .card; -} - .groupinfobox .left { padding: 10px; width: 100px; diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 8f59909992a..38982e14cc8 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -2308,9 +2308,7 @@ .fa-meetup:before { content: ""; } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, -.path-mod-forum.nested-v2-display-mode .tag_list > b { +.sr-only { position: absolute; width: 1px; height: 1px; @@ -2650,7 +2648,7 @@ h5, .h5 { h6, .h6 { font-size: 0.9375rem; } -.lead, .userprofile .profile_tree section h3 { +.lead { font-size: 1.171875rem; font-weight: 300; } @@ -5432,7 +5430,7 @@ input[type="button"].btn-block { .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { color: #fff; } -.card, .userprofile .profile_tree section, .groupinfobox, .well { +.card, .well { position: relative; display: flex; flex-direction: column; @@ -5441,11 +5439,11 @@ input[type="button"].btn-block { background-color: #fff; background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); } - .card > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { + .card > hr, .well > hr { margin-right: 0; margin-left: 0; } -.card-body, .userprofile .profile_tree section { +.card-body { flex: 1 1 auto; padding: 1.25rem; } @@ -5508,14 +5506,14 @@ input[type="button"].btn-block { .card-deck { display: flex; flex-direction: column; } - .card-deck .card, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-deck { flex-flow: row wrap; margin-right: -0.25rem; margin-left: -0.25rem; } - .card-deck .card, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .well { display: flex; flex: 1 0 0%; flex-direction: column; @@ -5526,19 +5524,19 @@ input[type="button"].btn-block { .card-group { display: flex; flex-direction: column; } - .card-group > .card, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .card-group > .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-group { flex-flow: row wrap; } - .card-group > .card, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .card-group > .well { flex: 1 0 0%; margin-bottom: 0; } - .card-group > .card + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, .userprofile .profile_tree .card-group > .card + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { + .card-group > .card + .card, .card-group > .well + .card, .card-group > .card + .well, .card-group > .well + .well { margin-left: 0; border-left: 0; } } -.card-columns .card, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { +.card-columns .card, .card-columns .well { margin-bottom: 0.75rem; } @media (min-width: 576px) { @@ -5547,17 +5545,17 @@ input[type="button"].btn-block { column-gap: 1.25rem; orphans: 1; widows: 1; } - .card-columns .card, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { + .card-columns .card, .card-columns .well { display: inline-block; width: 100%; } } -.accordion > .card, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { +.accordion > .card, .accordion > .well { overflow: hidden; } - .accordion > .card:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { + .accordion > .card:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { border-bottom: 0; } - .accordion > .card:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { + .accordion > .card:first-of-type, .accordion > .well:first-of-type { border-bottom: 0; } - .accordion > .card .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { + .accordion > .card .card-header, .accordion > .well .card-header { margin-bottom: -1px; } .breadcrumb { @@ -5754,7 +5752,7 @@ input[type="button"].btn-block { padding-right: 0; padding-left: 0; } -.alert, .assignfeedback_editpdf_widget .label { +.alert { position: relative; padding: 0.75rem 1.25rem; margin-bottom: 1rem; @@ -5802,13 +5800,13 @@ input[type="button"].btn-block { .alert-success .alert-link { color: #1f3e1f; } -.alert-info, .assignfeedback_editpdf_widget .label { +.alert-info { color: #2f6473; background-color: #def2f8; border-color: #d1edf6; } - .alert-info hr, .assignfeedback_editpdf_widget .label hr { + .alert-info hr { border-top-color: #bce5f2; } - .alert-info .alert-link, .assignfeedback_editpdf_widget .label .alert-link { + .alert-info .alert-link { color: #20454f; } .alert-warning { @@ -6165,7 +6163,7 @@ a.close.disabled { .modal-dialog-scrollable .modal-content { max-height: calc(100vh - 1rem); overflow: hidden; } - .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3, .path-mod-assign [data-region="grade-panel"] .modal-dialog-scrollable .popout > .col-md-3, + .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .modal-footer { flex-shrink: 0; } .modal-dialog-scrollable .modal-body { @@ -6212,13 +6210,13 @@ a.close.disabled { .modal-backdrop.show { opacity: 0.5; } -.modal-header, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { +.modal-header { display: flex; align-items: flex-start; justify-content: space-between; padding: 1rem 1rem; border-bottom: 1px solid #dee2e6; } - .modal-header .close, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .close { + .modal-header .close { padding: 1rem 1rem; margin: -1rem -1rem -1rem auto; } @@ -7472,9 +7470,7 @@ button.bg-dark:focus { top: 0; z-index: 1020; } } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, -.path-mod-forum.nested-v2-display-mode .tag_list > b { +.sr-only { position: absolute; width: 1px; height: 1px; @@ -12031,7 +12027,7 @@ body.h5p-embed .h5pmessages { .block .block-cards .icon { margin-right: 0; } -.block .block-cards .card .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { +.block .block-cards .card .coursemenubtn, .block .block-cards .well .coursemenubtn { margin-top: -0.5rem; } .block .block-cards a.coursename, @@ -13253,9 +13249,7 @@ span.editinstructions { color: #868e96; margin: 0.4rem 1rem 0.45rem; } #course-category-listings .select-a-category .notifymessage, - #course-category-listings .select-a-category .alert, - #course-category-listings .select-a-category .assignfeedback_editpdf_widget .label, - .assignfeedback_editpdf_widget #course-category-listings .select-a-category .label { + #course-category-listings .select-a-category .alert { margin: 1em; } #course-category-listings #course-listing .listitem .drag-handle { @@ -14855,9 +14849,7 @@ body.path-question-type { font: inherit; position: static; padding-right: .3em; } - body.path-question-type .form-group .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b { + body.path-question-type .form-group .sr-only { position: static; width: auto; height: auto; @@ -15229,10 +15221,6 @@ body.path-question-type .mform fieldset.hidden { .userprofile .profile_tree { column-count: 2; } - .userprofile .profile_tree section { - display: inline-block; - width: 100%; - margin-bottom: 1rem; } #participantsform .no-overflow { overflow: visible; } @@ -16110,6 +16098,16 @@ select { margin-right: 0; float: none; display: inline-block; } + .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, + .path-mod-forum.nested-v2-display-mode .alert.discussionlocked { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border: 0; } .path-mod-forum .nested-v2-display-mode .text-muted, .path-mod-forum .nested-v2-display-mode .dimmed_text, .path-mod-forum.nested-v2-display-mode .text-muted, @@ -16122,6 +16120,16 @@ select { .path-mod-forum .nested-v2-display-mode .author-header .author-name, .path-mod-forum.nested-v2-display-mode .author-header .author-name { font-style: normal; } + .path-mod-forum .nested-v2-display-mode .tag_list > b, + .path-mod-forum.nested-v2-display-mode .tag_list > b { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border: 0; } .path-mod-forum .nested-v2-display-mode :target > .focus-target, .path-mod-forum.nested-v2-display-mode :target > .focus-target { animation-name: background-highlight; @@ -16808,6 +16816,9 @@ div#dock { margin-bottom: 1rem; } .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { + display: flex; + align-items: flex-start; + justify-content: space-between; font-size: 1.40625rem; } .path-mod-assign [data-region="grade-panel"] .popout [data-region="popout-button"] { @@ -16850,6 +16861,20 @@ div#dock { .assignfeedback_editpdf_widget .commentcolourbutton img { border-width: 0; } +.assignfeedback_editpdf_widget .label { + position: relative; + padding: 0.75rem 1.25rem; + margin-bottom: 1rem; + border: 0 solid transparent; + color: #2f6473; + background-color: #def2f8; + border-color: #d1edf6; + /* stylelint-disable-line max-line-length */ } + .assignfeedback_editpdf_widget .label hr { + border-top-color: #bce5f2; } + .assignfeedback_editpdf_widget .label .alert-link { + color: #20454f; } + .assignfeedback_editpdf_menu { padding: 0; } @@ -17244,7 +17269,7 @@ p.arrow_button { width: auto; display: inline-flex; flex-direction: column; } - .path-grade-report-grader #region-main > .card, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { + .path-grade-report-grader #region-main > .card, .path-grade-report-grader #region-main > .well { width: auto; overflow-x: initial; } .path-grade-report-grader #region-main div[role="main"] { @@ -17661,12 +17686,12 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu, * - Make the content region flex grow so it pushes things like the * next activity selector to the bottom of the page. */ -body.reset-style #page-header .card, body.reset-style #page-header .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header section, body.reset-style #page-header .groupinfobox, body.reset-style #page-header .well { +body.reset-style #page-header .card, body.reset-style #page-header .well { border: none; } - body.reset-style #page-header .card .page-header-headings h1, body.reset-style #page-header .userprofile .profile_tree section .page-header-headings h1, .userprofile .profile_tree body.reset-style #page-header section .page-header-headings h1, body.reset-style #page-header .groupinfobox .page-header-headings h1, body.reset-style #page-header .well .page-header-headings h1 { + body.reset-style #page-header .card .page-header-headings h1, body.reset-style #page-header .well .page-header-headings h1 { margin-bottom: 0; } @media (max-width: 767.98px) { - body.reset-style #page-header .card .card-body, body.reset-style #page-header .userprofile .profile_tree section .card-body, .userprofile .profile_tree body.reset-style #page-header section .card-body, body.reset-style #page-header .groupinfobox .card-body, body.reset-style #page-header .well .card-body, body.reset-style #page-header .card .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .card section, body.reset-style #page-header .userprofile .profile_tree section section, .userprofile .profile_tree body.reset-style #page-header section section, body.reset-style #page-header .groupinfobox .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .groupinfobox section, body.reset-style #page-header .well .userprofile .profile_tree section, .userprofile .profile_tree body.reset-style #page-header .well section { + body.reset-style #page-header .card .card-body, body.reset-style #page-header .well .card-body { padding-left: 0; padding-right: 0; } } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 2818930e241..9f038fa58ab 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -2308,9 +2308,7 @@ .fa-meetup:before { content: ""; } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, -.path-mod-forum.nested-v2-display-mode .tag_list > b { +.sr-only { position: absolute; width: 1px; height: 1px; @@ -2650,7 +2648,7 @@ h5, .h5 { h6, .h6 { font-size: 0.9375rem; } -.lead, .userprofile .profile_tree section h3 { +.lead { font-size: 1.171875rem; font-weight: 300; } @@ -5513,7 +5511,7 @@ input[type="button"].btn-block { .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { color: #fff; } -.card, .userprofile .profile_tree section, .groupinfobox, .well { +.card, .well { position: relative; display: flex; flex-direction: column; @@ -5523,17 +5521,17 @@ input[type="button"].btn-block { background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 0.25rem; } - .card > hr, .userprofile .profile_tree section > hr, .groupinfobox > hr, .well > hr { + .card > hr, .well > hr { margin-right: 0; margin-left: 0; } - .card > .list-group:first-child .list-group-item:first-child, .userprofile .profile_tree section > .list-group:first-child .list-group-item:first-child, .groupinfobox > .list-group:first-child .list-group-item:first-child, .well > .list-group:first-child .list-group-item:first-child { + .card > .list-group:first-child .list-group-item:first-child, .well > .list-group:first-child .list-group-item:first-child { border-top-left-radius: 0.25rem; border-top-right-radius: 0.25rem; } - .card > .list-group:last-child .list-group-item:last-child, .userprofile .profile_tree section > .list-group:last-child .list-group-item:last-child, .groupinfobox > .list-group:last-child .list-group-item:last-child, .well > .list-group:last-child .list-group-item:last-child { + .card > .list-group:last-child .list-group-item:last-child, .well > .list-group:last-child .list-group-item:last-child { border-bottom-right-radius: 0.25rem; border-bottom-left-radius: 0.25rem; } -.card-body, .userprofile .profile_tree section { +.card-body { flex: 1 1 auto; padding: 1.25rem; } @@ -5605,14 +5603,14 @@ input[type="button"].btn-block { .card-deck { display: flex; flex-direction: column; } - .card-deck .card, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-deck { flex-flow: row wrap; margin-right: -0.25rem; margin-left: -0.25rem; } - .card-deck .card, .card-deck .userprofile .profile_tree section, .userprofile .profile_tree .card-deck section, .card-deck .groupinfobox, .card-deck .well { + .card-deck .card, .card-deck .well { display: flex; flex: 1 0 0%; flex-direction: column; @@ -5623,49 +5621,41 @@ input[type="button"].btn-block { .card-group { display: flex; flex-direction: column; } - .card-group > .card, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .card-group > .well { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-group { flex-flow: row wrap; } - .card-group > .card, .userprofile .profile_tree .card-group > section, .card-group > .groupinfobox, .card-group > .well { + .card-group > .card, .card-group > .well { flex: 1 0 0%; margin-bottom: 0; } - .card-group > .card + .card, .userprofile .profile_tree .card-group > section + .card, .card-group > .groupinfobox + .card, .card-group > .well + .card, .userprofile .profile_tree .card-group > .card + section, .userprofile .profile_tree .card-group > section + section, .userprofile .profile_tree .card-group > .groupinfobox + section, .userprofile .profile_tree .card-group > .well + section, .card-group > .card + .groupinfobox, .userprofile .profile_tree .card-group > section + .groupinfobox, .card-group > .groupinfobox + .groupinfobox, .card-group > .well + .groupinfobox, .card-group > .card + .well, .userprofile .profile_tree .card-group > section + .well, .card-group > .groupinfobox + .well, .card-group > .well + .well { + .card-group > .card + .card, .card-group > .well + .card, .card-group > .card + .well, .card-group > .well + .well { margin-left: 0; border-left: 0; } - .card-group > .card:not(:last-child), .userprofile .profile_tree .card-group > section:not(:last-child), .card-group > .groupinfobox:not(:last-child), .card-group > .well:not(:last-child) { + .card-group > .card:not(:last-child), .card-group > .well:not(:last-child) { border-top-right-radius: 0; border-bottom-right-radius: 0; } - .card-group > .card:not(:last-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-top, .card-group > .groupinfobox:not(:last-child) .card-img-top, .card-group > .well:not(:last-child) .card-img-top, + .card-group > .card:not(:last-child) .card-img-top, .card-group > .well:not(:last-child) .card-img-top, .card-group > .card:not(:last-child) .card-header, - .userprofile .profile_tree .card-group > section:not(:last-child) .card-header, - .card-group > .groupinfobox:not(:last-child) .card-header, .card-group > .well:not(:last-child) .card-header { border-top-right-radius: 0; } - .card-group > .card:not(:last-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:last-child) .card-img-bottom, .card-group > .groupinfobox:not(:last-child) .card-img-bottom, .card-group > .well:not(:last-child) .card-img-bottom, + .card-group > .card:not(:last-child) .card-img-bottom, .card-group > .well:not(:last-child) .card-img-bottom, .card-group > .card:not(:last-child) .card-footer, - .userprofile .profile_tree .card-group > section:not(:last-child) .card-footer, - .card-group > .groupinfobox:not(:last-child) .card-footer, .card-group > .well:not(:last-child) .card-footer { border-bottom-right-radius: 0; } - .card-group > .card:not(:first-child), .userprofile .profile_tree .card-group > section:not(:first-child), .card-group > .groupinfobox:not(:first-child), .card-group > .well:not(:first-child) { + .card-group > .card:not(:first-child), .card-group > .well:not(:first-child) { border-top-left-radius: 0; border-bottom-left-radius: 0; } - .card-group > .card:not(:first-child) .card-img-top, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-top, .card-group > .groupinfobox:not(:first-child) .card-img-top, .card-group > .well:not(:first-child) .card-img-top, + .card-group > .card:not(:first-child) .card-img-top, .card-group > .well:not(:first-child) .card-img-top, .card-group > .card:not(:first-child) .card-header, - .userprofile .profile_tree .card-group > section:not(:first-child) .card-header, - .card-group > .groupinfobox:not(:first-child) .card-header, .card-group > .well:not(:first-child) .card-header { border-top-left-radius: 0; } - .card-group > .card:not(:first-child) .card-img-bottom, .userprofile .profile_tree .card-group > section:not(:first-child) .card-img-bottom, .card-group > .groupinfobox:not(:first-child) .card-img-bottom, .card-group > .well:not(:first-child) .card-img-bottom, + .card-group > .card:not(:first-child) .card-img-bottom, .card-group > .well:not(:first-child) .card-img-bottom, .card-group > .card:not(:first-child) .card-footer, - .userprofile .profile_tree .card-group > section:not(:first-child) .card-footer, - .card-group > .groupinfobox:not(:first-child) .card-footer, .card-group > .well:not(:first-child) .card-footer { border-bottom-left-radius: 0; } } -.card-columns .card, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { +.card-columns .card, .card-columns .well { margin-bottom: 0.75rem; } @media (min-width: 576px) { @@ -5674,25 +5664,25 @@ input[type="button"].btn-block { column-gap: 1.25rem; orphans: 1; widows: 1; } - .card-columns .card, .card-columns .userprofile .profile_tree section, .userprofile .profile_tree .card-columns section, .card-columns .groupinfobox, .card-columns .well { + .card-columns .card, .card-columns .well { display: inline-block; width: 100%; } } -.accordion > .card, .userprofile .profile_tree .accordion > section, .accordion > .groupinfobox, .accordion > .well { +.accordion > .card, .accordion > .well { overflow: hidden; } - .accordion > .card:not(:first-of-type) .card-header:first-child, .userprofile .profile_tree .accordion > section:not(:first-of-type) .card-header:first-child, .accordion > .groupinfobox:not(:first-of-type) .card-header:first-child, .accordion > .well:not(:first-of-type) .card-header:first-child { + .accordion > .card:not(:first-of-type) .card-header:first-child, .accordion > .well:not(:first-of-type) .card-header:first-child { border-radius: 0; } - .accordion > .card:not(:first-of-type):not(:last-of-type), .userprofile .profile_tree .accordion > section:not(:first-of-type):not(:last-of-type), .accordion > .groupinfobox:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { + .accordion > .card:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { border-bottom: 0; border-radius: 0; } - .accordion > .card:first-of-type, .userprofile .profile_tree .accordion > section:first-of-type, .accordion > .groupinfobox:first-of-type, .accordion > .well:first-of-type { + .accordion > .card:first-of-type, .accordion > .well:first-of-type { border-bottom: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } - .accordion > .card:last-of-type, .userprofile .profile_tree .accordion > section:last-of-type, .accordion > .groupinfobox:last-of-type, .accordion > .well:last-of-type { + .accordion > .card:last-of-type, .accordion > .well:last-of-type { border-top-left-radius: 0; border-top-right-radius: 0; } - .accordion > .card .card-header, .userprofile .profile_tree .accordion > section .card-header, .accordion > .groupinfobox .card-header, .accordion > .well .card-header { + .accordion > .card .card-header, .accordion > .well .card-header { margin-bottom: -1px; } .breadcrumb { @@ -5917,7 +5907,7 @@ input[type="button"].btn-block { padding-left: 0; border-radius: 0; } -.alert, .assignfeedback_editpdf_widget .label { +.alert { position: relative; padding: 0.75rem 1.25rem; margin-bottom: 1rem; @@ -5966,13 +5956,13 @@ input[type="button"].btn-block { .alert-success .alert-link { color: #1f3e1f; } -.alert-info, .assignfeedback_editpdf_widget .label { +.alert-info { color: #2f6473; background-color: #def2f8; border-color: #d1edf6; } - .alert-info hr, .assignfeedback_editpdf_widget .label hr { + .alert-info hr { border-top-color: #bce5f2; } - .alert-info .alert-link, .assignfeedback_editpdf_widget .label .alert-link { + .alert-info .alert-link { color: #20454f; } .alert-warning { @@ -6372,7 +6362,7 @@ a.close.disabled { .modal-dialog-scrollable .modal-content { max-height: calc(100vh - 1rem); overflow: hidden; } - .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3, .path-mod-assign [data-region="grade-panel"] .modal-dialog-scrollable .popout > .col-md-3, + .modal-dialog-scrollable .modal-header, .modal-dialog-scrollable .modal-footer { flex-shrink: 0; } .modal-dialog-scrollable .modal-body { @@ -6420,7 +6410,7 @@ a.close.disabled { .modal-backdrop.show { opacity: 0.5; } -.modal-header, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { +.modal-header { display: flex; align-items: flex-start; justify-content: space-between; @@ -6428,7 +6418,7 @@ a.close.disabled { border-bottom: 1px solid #dee2e6; border-top-left-radius: 0.3rem; border-top-right-radius: 0.3rem; } - .modal-header .close, .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 .close { + .modal-header .close { padding: 1rem 1rem; margin: -1rem -1rem -1rem auto; } @@ -7687,9 +7677,7 @@ button.bg-dark:focus { top: 0; z-index: 1020; } } -.sr-only, .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, -.path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .tag_list > b, -.path-mod-forum.nested-v2-display-mode .tag_list > b { +.sr-only { position: absolute; width: 1px; height: 1px; @@ -12255,7 +12243,7 @@ body.h5p-embed .h5pmessages { .block .block-cards .icon { margin-right: 0; } -.block .block-cards .card .coursemenubtn, .block .block-cards .userprofile .profile_tree section .coursemenubtn, .userprofile .profile_tree .block .block-cards section .coursemenubtn, .block .block-cards .groupinfobox .coursemenubtn, .block .block-cards .well .coursemenubtn { +.block .block-cards .card .coursemenubtn, .block .block-cards .well .coursemenubtn { margin-top: -0.5rem; } .block .block-cards a.coursename, @@ -13479,9 +13467,7 @@ span.editinstructions { color: #868e96; margin: 0.4rem 1rem 0.45rem; } #course-category-listings .select-a-category .notifymessage, - #course-category-listings .select-a-category .alert, - #course-category-listings .select-a-category .assignfeedback_editpdf_widget .label, - .assignfeedback_editpdf_widget #course-category-listings .select-a-category .label { + #course-category-listings .select-a-category .alert { margin: 1em; } #course-category-listings #course-listing .listitem .drag-handle { @@ -15085,9 +15071,7 @@ body.path-question-type { font: inherit; position: static; padding-right: .3em; } - body.path-question-type .form-group .sr-only, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum .nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .alert.discussionlocked, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .alert.discussionlocked, body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget .discussionlocked.label, .path-mod-forum.nested-v2-display-mode .assignfeedback_editpdf_widget body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode .discussionlocked.label, .assignfeedback_editpdf_widget .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .discussionlocked.label, body.path-question-type .form-group .path-mod-forum .nested-v2-display-mode .tag_list > b, .path-mod-forum .nested-v2-display-mode body.path-question-type .form-group .tag_list > b, - body.path-question-type .form-group .path-mod-forum.nested-v2-display-mode .tag_list > b, .path-mod-forum.nested-v2-display-mode body.path-question-type .form-group .tag_list > b { + body.path-question-type .form-group .sr-only { position: static; width: auto; height: auto; @@ -15465,10 +15449,6 @@ body.path-question-type .mform fieldset.hidden { .userprofile .profile_tree { column-count: 2; } - .userprofile .profile_tree section { - display: inline-block; - width: 100%; - margin-bottom: 1rem; } #participantsform .no-overflow { overflow: visible; } @@ -16348,6 +16328,16 @@ select { margin-right: 0; float: none; display: inline-block; } + .path-mod-forum .nested-v2-display-mode .alert.discussionlocked, + .path-mod-forum.nested-v2-display-mode .alert.discussionlocked { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border: 0; } .path-mod-forum .nested-v2-display-mode .text-muted, .path-mod-forum .nested-v2-display-mode .dimmed_text, .path-mod-forum.nested-v2-display-mode .text-muted, @@ -16360,6 +16350,16 @@ select { .path-mod-forum .nested-v2-display-mode .author-header .author-name, .path-mod-forum.nested-v2-display-mode .author-header .author-name { font-style: normal; } + .path-mod-forum .nested-v2-display-mode .tag_list > b, + .path-mod-forum.nested-v2-display-mode .tag_list > b { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border: 0; } .path-mod-forum .nested-v2-display-mode :target > .focus-target, .path-mod-forum.nested-v2-display-mode :target > .focus-target { animation-name: background-highlight; @@ -17047,6 +17047,9 @@ div#dock { margin-bottom: 1rem; } .path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 { + display: flex; + align-items: flex-start; + justify-content: space-between; font-size: 1.40625rem; } .path-mod-assign [data-region="grade-panel"] .popout [data-region="popout-button"] { @@ -17089,6 +17092,21 @@ div#dock { .assignfeedback_editpdf_widget .commentcolourbutton img { border-width: 0; } +.assignfeedback_editpdf_widget .label { + position: relative; + padding: 0.75rem 1.25rem; + margin-bottom: 1rem; + border: 0 solid transparent; + border-radius: 0.25rem; + color: #2f6473; + background-color: #def2f8; + border-color: #d1edf6; + /* stylelint-disable-line max-line-length */ } + .assignfeedback_editpdf_widget .label hr { + border-top-color: #bce5f2; } + .assignfeedback_editpdf_widget .label .alert-link { + color: #20454f; } + .assignfeedback_editpdf_menu { padding: 0; } @@ -17486,7 +17504,7 @@ p.arrow_button { width: auto; display: inline-flex; flex-direction: column; } - .path-grade-report-grader #region-main > .card, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well { + .path-grade-report-grader #region-main > .card, .path-grade-report-grader #region-main > .well { width: auto; overflow-x: initial; } .path-grade-report-grader #region-main div[role="main"] { diff --git a/user/classes/output/myprofile/renderer.php b/user/classes/output/myprofile/renderer.php index 43a83637fe9..48292bceae4 100644 --- a/user/classes/output/myprofile/renderer.php +++ b/user/classes/output/myprofile/renderer.php @@ -60,11 +60,15 @@ class renderer extends \plugin_renderer_base { public function render_category(category $category) { $classes = $category->classes; if (empty($classes)) { - $return = \html_writer::start_tag('section', array('class' => 'node_category')); + $return = \html_writer::start_tag('section', + array('class' => 'node_category card d-inline-block w-100 mb-3')); + $return .= \html_writer::start_tag('div', array('class' => 'card-body')); } else { - $return = \html_writer::start_tag('section', array('class' => 'node_category ' . $classes)); + $return = \html_writer::start_tag('section', + array('class' => 'node_category card d-inline-block w-100 mb-3' . $classes)); + $return .= \html_writer::start_tag('div', array('class' => 'card-body')); } - $return .= \html_writer::tag('h3', $category->title); + $return .= \html_writer::tag('h3', $category->title, array('class' => 'lead')); $nodes = $category->nodes; if (empty($nodes)) { // No nodes, nothing to render. @@ -75,6 +79,7 @@ class renderer extends \plugin_renderer_base { $return .= $this->render($node); } $return .= \html_writer::end_tag('ul'); + $return .= \html_writer::end_tag('div'); $return .= \html_writer::end_tag('section'); return $return; } From 2b34870dbbe8d83510b26e87f4b1119886104c31 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 27 Nov 2019 12:30:52 +0100 Subject: [PATCH 22/23] MDL-66999 theme_boost: @extend extends from bs2compat --- theme/boost/scss/moodle/bs2-compat.scss | 30 +++-- theme/boost/style/moodle.css | 135 +++++++++++++++----- theme/classic/style/moodle.css | 162 +++++++++++++++++------- 3 files changed, 236 insertions(+), 91 deletions(-) diff --git a/theme/boost/scss/moodle/bs2-compat.scss b/theme/boost/scss/moodle/bs2-compat.scss index 8e48384c252..e8552a8220e 100644 --- a/theme/boost/scss/moodle/bs2-compat.scss +++ b/theme/boost/scss/moodle/bs2-compat.scss @@ -2,41 +2,51 @@ // Well -> Panel -> Card. We skipped panel (BS3) so lets just support well and card. .well { - @extend .card; + border: $border-width solid $border-color; + padding: $card-spacer-x; } // Some things just got renamed. .img-responsive { - @extend .img-fluid; + @include img-fluid; } .text-error { - @extend .text-danger; + color: map-get($theme-colors, 'danger'); } .btn-default { - @extend .btn-secondary; + @include button-variant(map-get($theme-colors, 'secondary'), map-get($theme-colors, 'secondary')); } .label { - @extend .tag; - @include tag-variant($tag-default-bg); + display: inline-block; + padding: $badge-padding-y $badge-padding-x; + @include font-size($badge-font-size); + font-weight: $badge-font-weight; + line-height: 1; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + @include border-radius($badge-border-radius); + @include transition($badge-transition); + @include badge-variant($tag-default-bg); } .label-success { - @include tag-variant($tag-success-bg); + @include badge-variant($tag-success-bg); } .label-info { - @include tag-variant($tag-info-bg); + @include badge-variant($tag-info-bg); } .label-warning { - @include tag-variant($tag-warning-bg); + @include badge-variant($tag-warning-bg); } .label-important { - @include tag-variant($tag-danger-bg); + @include badge-variant($tag-danger-bg); } // Floats. diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 38982e14cc8..8e637ef39c6 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -2716,7 +2716,7 @@ mark, .blockquote-footer::before { content: "\2014\00A0"; } -.img-fluid, .img-responsive { +.img-fluid { max-width: 100%; height: auto; } @@ -4039,29 +4039,27 @@ fieldset:disabled a.btn { .show > .btn-primary.dropdown-toggle:focus { box-shadow: 0 0 0 0.2rem rgba(53, 139, 216, 0.5); } -.btn-secondary, .btn-default { +.btn-secondary { color: #212529; background-color: #ced4da; border-color: #ced4da; } - .btn-secondary:hover, .btn-default:hover { + .btn-secondary:hover { color: #212529; background-color: #b8c1ca; border-color: #b1bbc4; } - .btn-secondary:focus, .btn-default:focus, .btn-secondary.focus, .focus.btn-default { + .btn-secondary:focus, .btn-secondary.focus { box-shadow: 0 0 0 0.2rem rgba(180, 186, 191, 0.5); } - .btn-secondary.disabled, .disabled.btn-default, .btn-secondary:disabled, .btn-default:disabled { + .btn-secondary.disabled, .btn-secondary:disabled { color: #212529; background-color: #ced4da; border-color: #ced4da; } - .btn-secondary:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, .btn-default:not(:disabled):not(.disabled).active, - .show > .btn-secondary.dropdown-toggle, - .show > .dropdown-toggle.btn-default { + .btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, + .show > .btn-secondary.dropdown-toggle { color: #212529; background-color: #b1bbc4; border-color: #aab4bf; } - .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, .btn-default:not(:disabled):not(.disabled).active:focus, - .show > .btn-secondary.dropdown-toggle:focus, - .show > .dropdown-toggle.btn-default:focus { + .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, + .show > .btn-secondary.dropdown-toggle:focus { box-shadow: 0 0 0 0.2rem rgba(180, 186, 191, 0.5); } .btn-success { @@ -5430,7 +5428,7 @@ input[type="button"].btn-block { .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { color: #fff; } -.card, .well { +.card { position: relative; display: flex; flex-direction: column; @@ -5439,7 +5437,7 @@ input[type="button"].btn-block { background-color: #fff; background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); } - .card > hr, .well > hr { + .card > hr { margin-right: 0; margin-left: 0; } @@ -5506,14 +5504,14 @@ input[type="button"].btn-block { .card-deck { display: flex; flex-direction: column; } - .card-deck .card, .card-deck .well { + .card-deck .card { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-deck { flex-flow: row wrap; margin-right: -0.25rem; margin-left: -0.25rem; } - .card-deck .card, .card-deck .well { + .card-deck .card { display: flex; flex: 1 0 0%; flex-direction: column; @@ -5524,19 +5522,19 @@ input[type="button"].btn-block { .card-group { display: flex; flex-direction: column; } - .card-group > .card, .card-group > .well { + .card-group > .card { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-group { flex-flow: row wrap; } - .card-group > .card, .card-group > .well { + .card-group > .card { flex: 1 0 0%; margin-bottom: 0; } - .card-group > .card + .card, .card-group > .well + .card, .card-group > .card + .well, .card-group > .well + .well { + .card-group > .card + .card { margin-left: 0; border-left: 0; } } -.card-columns .card, .card-columns .well { +.card-columns .card { margin-bottom: 0.75rem; } @media (min-width: 576px) { @@ -5545,17 +5543,17 @@ input[type="button"].btn-block { column-gap: 1.25rem; orphans: 1; widows: 1; } - .card-columns .card, .card-columns .well { + .card-columns .card { display: inline-block; width: 100%; } } -.accordion > .card, .accordion > .well { +.accordion > .card { overflow: hidden; } - .accordion > .card:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { + .accordion > .card:not(:first-of-type):not(:last-of-type) { border-bottom: 0; } - .accordion > .card:first-of-type, .accordion > .well:first-of-type { + .accordion > .card:first-of-type { border-bottom: 0; } - .accordion > .card .card-header, .accordion > .well .card-header { + .accordion > .card .card-header { margin-bottom: -1px; } .breadcrumb { @@ -9035,10 +9033,10 @@ a.text-info:hover, a.text-info:focus { a.text-warning:hover, a.text-warning:focus { color: #df8a13 !important; } -.text-danger, .text-error { +.text-danger { color: #d9534f !important; } -a.text-danger:hover, a.text-error:hover, a.text-danger:focus, a.text-error:focus { +a.text-danger:hover, a.text-danger:focus { color: #b52b27 !important; } .text-light { @@ -9148,7 +9146,7 @@ a.text-dark:hover, a.text-dark:focus { /* stylelint-disable function-url-scheme-blacklist */ /* stylelint-enable function-url-scheme-blacklist */ -.tag, .label { +.tag { display: inline-block; padding: 0.25rem 0.4em; font-size: 75%; @@ -9158,7 +9156,7 @@ a.text-dark:hover, a.text-dark:focus { text-align: center; white-space: nowrap; vertical-align: baseline; } - .tag:empty, .label:empty { + .tag:empty { display: none; } .form-control-success, @@ -12027,7 +12025,7 @@ body.h5p-embed .h5pmessages { .block .block-cards .icon { margin-right: 0; } -.block .block-cards .card .coursemenubtn, .block .block-cards .well .coursemenubtn { +.block .block-cards .card .coursemenubtn { margin-top: -0.5rem; } .block .block-cards a.coursename, @@ -17269,7 +17267,7 @@ p.arrow_button { width: auto; display: inline-flex; flex-direction: column; } - .path-grade-report-grader #region-main > .card, .path-grade-report-grader #region-main > .well { + .path-grade-report-grader #region-main > .card { width: auto; overflow-x: initial; } .path-grade-report-grader #region-main div[role="main"] { @@ -17686,12 +17684,12 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu, * - Make the content region flex grow so it pushes things like the * next activity selector to the bottom of the page. */ -body.reset-style #page-header .card, body.reset-style #page-header .well { +body.reset-style #page-header .card { border: none; } - body.reset-style #page-header .card .page-header-headings h1, body.reset-style #page-header .well .page-header-headings h1 { + body.reset-style #page-header .card .page-header-headings h1 { margin-bottom: 0; } @media (max-width: 767.98px) { - body.reset-style #page-header .card .card-body, body.reset-style #page-header .well .card-body { + body.reset-style #page-header .card .card-body { padding-left: 0; padding-right: 0; } } @@ -18221,30 +18219,101 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont margin-left: -15px; width: 275px; } +.well { + border: 1px solid #dee2e6; + padding: 1.25rem; } + +.img-responsive { + max-width: 100%; + height: auto; } + +.text-error { + color: #d9534f; } + +.btn-default { + color: #212529; + background-color: #ced4da; + border-color: #ced4da; } + .btn-default:hover { + color: #212529; + background-color: #b8c1ca; + border-color: #b1bbc4; } + .btn-default:focus, .btn-default.focus { + box-shadow: 0 0 0 0.2rem rgba(180, 186, 191, 0.5); } + .btn-default.disabled, .btn-default:disabled { + color: #212529; + background-color: #ced4da; + border-color: #ced4da; } + .btn-default:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled).active, + .show > .btn-default.dropdown-toggle { + color: #212529; + background-color: #b1bbc4; + border-color: #aab4bf; } + .btn-default:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled).active:focus, + .show > .btn-default.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(180, 186, 191, 0.5); } + .label { + display: inline-block; + padding: 0.25em 0.4em; + font-size: 75%; + font-weight: 700; + line-height: 1; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + color: #fff; background-color: #868e96; } + @media (prefers-reduced-motion: reduce) { + .label { + transition: none; } } .label[href]:hover, .label[href]:focus { + color: #fff; background-color: #6c757d; } + .label[href]:focus, .label[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5); } .label-success { + color: #fff; background-color: #5cb85c; } .label-success[href]:hover, .label-success[href]:focus { + color: #fff; background-color: #449d44; } + .label-success[href]:focus, .label-success[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(92, 184, 92, 0.5); } .label-info { + color: #212529; background-color: #5bc0de; } .label-info[href]:hover, .label-info[href]:focus { + color: #212529; background-color: #31b0d5; } + .label-info[href]:focus, .label-info[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); } .label-warning { + color: #fff; background-color: #ff7518; } .label-warning[href]:hover, .label-warning[href]:focus { + color: #fff; background-color: #e45c00; } + .label-warning[href]:focus, .label-warning[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(255, 117, 24, 0.5); } .label-important { + color: #fff; background-color: #d9534f; } .label-important[href]:hover, .label-important[href]:focus { + color: #fff; background-color: #c9302c; } + .label-important[href]:focus, .label-important[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(217, 83, 79, 0.5); } .pull-left { float: left !important; diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 9f038fa58ab..6866fc1966a 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -2716,7 +2716,7 @@ mark, .blockquote-footer::before { content: "\2014\00A0"; } -.img-fluid, .img-responsive { +.img-fluid { max-width: 100%; height: auto; } @@ -4045,29 +4045,27 @@ fieldset:disabled a.btn { .show > .btn-primary.dropdown-toggle:focus { box-shadow: 0 0 0 0.2rem rgba(53, 139, 216, 0.5); } -.btn-secondary, .btn-default { +.btn-secondary { color: #212529; background-color: #e9ecef; border-color: #e9ecef; } - .btn-secondary:hover, .btn-default:hover { + .btn-secondary:hover { color: #212529; background-color: #d3d9df; border-color: #cbd3da; } - .btn-secondary:focus, .btn-default:focus, .btn-secondary.focus, .focus.btn-default { + .btn-secondary:focus, .btn-secondary.focus { box-shadow: 0 0 0 0.2rem rgba(203, 206, 209, 0.5); } - .btn-secondary.disabled, .disabled.btn-default, .btn-secondary:disabled, .btn-default:disabled { + .btn-secondary.disabled, .btn-secondary:disabled { color: #212529; background-color: #e9ecef; border-color: #e9ecef; } - .btn-secondary:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, .btn-default:not(:disabled):not(.disabled).active, - .show > .btn-secondary.dropdown-toggle, - .show > .dropdown-toggle.btn-default { + .btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active, + .show > .btn-secondary.dropdown-toggle { color: #212529; background-color: #cbd3da; border-color: #c4ccd4; } - .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, .btn-default:not(:disabled):not(.disabled).active:focus, - .show > .btn-secondary.dropdown-toggle:focus, - .show > .dropdown-toggle.btn-default:focus { + .btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus, + .show > .btn-secondary.dropdown-toggle:focus { box-shadow: 0 0 0 0.2rem rgba(203, 206, 209, 0.5); } .btn-success { @@ -5511,7 +5509,7 @@ input[type="button"].btn-block { .navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus { color: #fff; } -.card, .well { +.card { position: relative; display: flex; flex-direction: column; @@ -5521,13 +5519,13 @@ input[type="button"].btn-block { background-clip: border-box; border: 1px solid rgba(0, 0, 0, 0.125); border-radius: 0.25rem; } - .card > hr, .well > hr { + .card > hr { margin-right: 0; margin-left: 0; } - .card > .list-group:first-child .list-group-item:first-child, .well > .list-group:first-child .list-group-item:first-child { + .card > .list-group:first-child .list-group-item:first-child { border-top-left-radius: 0.25rem; border-top-right-radius: 0.25rem; } - .card > .list-group:last-child .list-group-item:last-child, .well > .list-group:last-child .list-group-item:last-child { + .card > .list-group:last-child .list-group-item:last-child { border-bottom-right-radius: 0.25rem; border-bottom-left-radius: 0.25rem; } @@ -5603,14 +5601,14 @@ input[type="button"].btn-block { .card-deck { display: flex; flex-direction: column; } - .card-deck .card, .card-deck .well { + .card-deck .card { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-deck { flex-flow: row wrap; margin-right: -0.25rem; margin-left: -0.25rem; } - .card-deck .card, .card-deck .well { + .card-deck .card { display: flex; flex: 1 0 0%; flex-direction: column; @@ -5621,41 +5619,37 @@ input[type="button"].btn-block { .card-group { display: flex; flex-direction: column; } - .card-group > .card, .card-group > .well { + .card-group > .card { margin-bottom: 0.25rem; } @media (min-width: 576px) { .card-group { flex-flow: row wrap; } - .card-group > .card, .card-group > .well { + .card-group > .card { flex: 1 0 0%; margin-bottom: 0; } - .card-group > .card + .card, .card-group > .well + .card, .card-group > .card + .well, .card-group > .well + .well { + .card-group > .card + .card { margin-left: 0; border-left: 0; } - .card-group > .card:not(:last-child), .card-group > .well:not(:last-child) { + .card-group > .card:not(:last-child) { border-top-right-radius: 0; border-bottom-right-radius: 0; } - .card-group > .card:not(:last-child) .card-img-top, .card-group > .well:not(:last-child) .card-img-top, - .card-group > .card:not(:last-child) .card-header, - .card-group > .well:not(:last-child) .card-header { + .card-group > .card:not(:last-child) .card-img-top, + .card-group > .card:not(:last-child) .card-header { border-top-right-radius: 0; } - .card-group > .card:not(:last-child) .card-img-bottom, .card-group > .well:not(:last-child) .card-img-bottom, - .card-group > .card:not(:last-child) .card-footer, - .card-group > .well:not(:last-child) .card-footer { + .card-group > .card:not(:last-child) .card-img-bottom, + .card-group > .card:not(:last-child) .card-footer { border-bottom-right-radius: 0; } - .card-group > .card:not(:first-child), .card-group > .well:not(:first-child) { + .card-group > .card:not(:first-child) { border-top-left-radius: 0; border-bottom-left-radius: 0; } - .card-group > .card:not(:first-child) .card-img-top, .card-group > .well:not(:first-child) .card-img-top, - .card-group > .card:not(:first-child) .card-header, - .card-group > .well:not(:first-child) .card-header { + .card-group > .card:not(:first-child) .card-img-top, + .card-group > .card:not(:first-child) .card-header { border-top-left-radius: 0; } - .card-group > .card:not(:first-child) .card-img-bottom, .card-group > .well:not(:first-child) .card-img-bottom, - .card-group > .card:not(:first-child) .card-footer, - .card-group > .well:not(:first-child) .card-footer { + .card-group > .card:not(:first-child) .card-img-bottom, + .card-group > .card:not(:first-child) .card-footer { border-bottom-left-radius: 0; } } -.card-columns .card, .card-columns .well { +.card-columns .card { margin-bottom: 0.75rem; } @media (min-width: 576px) { @@ -5664,25 +5658,25 @@ input[type="button"].btn-block { column-gap: 1.25rem; orphans: 1; widows: 1; } - .card-columns .card, .card-columns .well { + .card-columns .card { display: inline-block; width: 100%; } } -.accordion > .card, .accordion > .well { +.accordion > .card { overflow: hidden; } - .accordion > .card:not(:first-of-type) .card-header:first-child, .accordion > .well:not(:first-of-type) .card-header:first-child { + .accordion > .card:not(:first-of-type) .card-header:first-child { border-radius: 0; } - .accordion > .card:not(:first-of-type):not(:last-of-type), .accordion > .well:not(:first-of-type):not(:last-of-type) { + .accordion > .card:not(:first-of-type):not(:last-of-type) { border-bottom: 0; border-radius: 0; } - .accordion > .card:first-of-type, .accordion > .well:first-of-type { + .accordion > .card:first-of-type { border-bottom: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; } - .accordion > .card:last-of-type, .accordion > .well:last-of-type { + .accordion > .card:last-of-type { border-top-left-radius: 0; border-top-right-radius: 0; } - .accordion > .card .card-header, .accordion > .well .card-header { + .accordion > .card .card-header { margin-bottom: -1px; } .breadcrumb { @@ -9242,10 +9236,10 @@ a.text-info:hover, a.text-info:focus { a.text-warning:hover, a.text-warning:focus { color: #df8a13 !important; } -.text-danger, .text-error { +.text-danger { color: #d9534f !important; } -a.text-danger:hover, a.text-error:hover, a.text-danger:focus, a.text-error:focus { +a.text-danger:hover, a.text-danger:focus { color: #b52b27 !important; } .text-light { @@ -9355,7 +9349,7 @@ a.text-dark:hover, a.text-dark:focus { /* stylelint-disable function-url-scheme-blacklist */ /* stylelint-enable function-url-scheme-blacklist */ -.tag, .label { +.tag { display: inline-block; padding: 0.25rem 0.4em; font-size: 75%; @@ -9366,7 +9360,7 @@ a.text-dark:hover, a.text-dark:focus { white-space: nowrap; vertical-align: baseline; border-radius: 0.25rem; } - .tag:empty, .label:empty { + .tag:empty { display: none; } .form-control-success, @@ -12243,7 +12237,7 @@ body.h5p-embed .h5pmessages { .block .block-cards .icon { margin-right: 0; } -.block .block-cards .card .coursemenubtn, .block .block-cards .well .coursemenubtn { +.block .block-cards .card .coursemenubtn { margin-top: -0.5rem; } .block .block-cards a.coursename, @@ -17504,7 +17498,7 @@ p.arrow_button { width: auto; display: inline-flex; flex-direction: column; } - .path-grade-report-grader #region-main > .card, .path-grade-report-grader #region-main > .well { + .path-grade-report-grader #region-main > .card { width: auto; overflow-x: initial; } .path-grade-report-grader #region-main div[role="main"] { @@ -18406,30 +18400,102 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont margin-left: -15px; width: 275px; } +.well { + border: 1px solid #dee2e6; + padding: 1.25rem; } + +.img-responsive { + max-width: 100%; + height: auto; } + +.text-error { + color: #d9534f; } + +.btn-default { + color: #212529; + background-color: #e9ecef; + border-color: #e9ecef; } + .btn-default:hover { + color: #212529; + background-color: #d3d9df; + border-color: #cbd3da; } + .btn-default:focus, .btn-default.focus { + box-shadow: 0 0 0 0.2rem rgba(203, 206, 209, 0.5); } + .btn-default.disabled, .btn-default:disabled { + color: #212529; + background-color: #e9ecef; + border-color: #e9ecef; } + .btn-default:not(:disabled):not(.disabled):active, .btn-default:not(:disabled):not(.disabled).active, + .show > .btn-default.dropdown-toggle { + color: #212529; + background-color: #cbd3da; + border-color: #c4ccd4; } + .btn-default:not(:disabled):not(.disabled):active:focus, .btn-default:not(:disabled):not(.disabled).active:focus, + .show > .btn-default.dropdown-toggle:focus { + box-shadow: 0 0 0 0.2rem rgba(203, 206, 209, 0.5); } + .label { + display: inline-block; + padding: 0.25em 0.4em; + font-size: 75%; + font-weight: 700; + line-height: 1; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: 0.25rem; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + color: #fff; background-color: #868e96; } + @media (prefers-reduced-motion: reduce) { + .label { + transition: none; } } .label[href]:hover, .label[href]:focus { + color: #fff; background-color: #6c757d; } + .label[href]:focus, .label[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(134, 142, 150, 0.5); } .label-success { + color: #fff; background-color: #5cb85c; } .label-success[href]:hover, .label-success[href]:focus { + color: #fff; background-color: #449d44; } + .label-success[href]:focus, .label-success[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(92, 184, 92, 0.5); } .label-info { + color: #212529; background-color: #5bc0de; } .label-info[href]:hover, .label-info[href]:focus { + color: #212529; background-color: #31b0d5; } + .label-info[href]:focus, .label-info[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); } .label-warning { + color: #fff; background-color: #ff7518; } .label-warning[href]:hover, .label-warning[href]:focus { + color: #fff; background-color: #e45c00; } + .label-warning[href]:focus, .label-warning[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(255, 117, 24, 0.5); } .label-important { + color: #fff; background-color: #d9534f; } .label-important[href]:hover, .label-important[href]:focus { + color: #fff; background-color: #c9302c; } + .label-important[href]:focus, .label-important[href].focus { + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(217, 83, 79, 0.5); } .pull-left { float: left !important; From 072fcde3ee71e8bf0b45f135b6bccfeab05cfb88 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 27 Nov 2019 13:38:09 +0100 Subject: [PATCH 23/23] MDL-66999 theme_boost: @extend phpunit fixes --- .../adaptive/tests/mark_display_test.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/question/behaviour/adaptive/tests/mark_display_test.php b/question/behaviour/adaptive/tests/mark_display_test.php index 738d5accbe2..5a91a25bb95 100644 --- a/question/behaviour/adaptive/tests/mark_display_test.php +++ b/question/behaviour/adaptive/tests/mark_display_test.php @@ -58,7 +58,7 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { } public function test_correct_no_penalty() { - $this->assertEquals('
' . get_string('correct', 'question') . '
' . + $this->assertEquals('
' . get_string('correct', 'question') . '
' . '
' . get_string('gradingdetails', 'qbehaviour_adaptive', array('cur' => '1.00', 'raw' => '1.00', 'max' => '1.00')) . '
', @@ -67,8 +67,8 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { } public function test_partial_first_try() { - $this->assertEquals('
' . get_string('partiallycorrect', 'question') . '
' . - '
' . + $this->assertEquals('
' . get_string('partiallycorrect', 'question') . + '
' . get_string('gradingdetails', 'qbehaviour_adaptive', array('cur' => '0.50', 'raw' => '0.50', 'max' => '1.00')) . ' ' . get_string('gradingdetailspenalty', 'qbehaviour_adaptive', '0.10') . '
', @@ -78,8 +78,8 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { public function test_partial_second_try() { $mark = array('cur' => '0.80', 'raw' => '0.90', 'max' => '1.00'); - $this->assertEquals('
' . get_string('partiallycorrect', 'question') . '
' . - '
' . + $this->assertEquals('
' . get_string('partiallycorrect', 'question') . + '
' . get_string('gradingdetails', 'qbehaviour_adaptive', $mark) . ' ' . get_string('gradingdetailsadjustment', 'qbehaviour_adaptive', $mark) . ' ' . get_string('gradingdetailspenalty', 'qbehaviour_adaptive', '0.10') . ' ' . @@ -90,8 +90,8 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { public function test_correct_third_try() { $mark = array('cur' => '0.80', 'raw' => '1.00', 'max' => '1.00'); - $this->assertEquals('
' . get_string('partiallycorrect', 'question') . '
' . - '
' . + $this->assertEquals('
' . get_string('partiallycorrect', 'question') . + '
' . get_string('gradingdetails', 'qbehaviour_adaptive', $mark) . ' ' . get_string('gradingdetailsadjustment', 'qbehaviour_adaptive', $mark) . '
', $this->renderer->render_adaptive_marks(new qbehaviour_adaptive_mark_details( @@ -100,8 +100,8 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { public function test_correct_third_try_if_we_dont_increase_penalties_for_wrong() { $mark = array('cur' => '0.80', 'raw' => '1.00', 'max' => '1.00'); - $this->assertEquals('
' . get_string('partiallycorrect', 'question') . '
' . - '
' . + $this->assertEquals('
' . get_string('partiallycorrect', 'question') . + '
' . get_string('gradingdetails', 'qbehaviour_adaptive', $mark) . ' ' . get_string('gradingdetailsadjustment', 'qbehaviour_adaptive', $mark) . '
', $this->renderer->render_adaptive_marks(new qbehaviour_adaptive_mark_details(