diff --git a/.upgradenotes/MDL-86548-2025091104035997.yml b/.upgradenotes/MDL-86548-2025091104035997.yml new file mode 100644 index 00000000000..ca0a20f4536 --- /dev/null +++ b/.upgradenotes/MDL-86548-2025091104035997.yml @@ -0,0 +1,8 @@ +issueNumber: MDL-86548 +notes: + theme_boost: + - message: >- + Tables affected by unwanted styling (e.g., borders) from the reset of + Bootstrap _reboot.scss styles can now opt out and preserve the original + behavior by adding the styleless .table-reboot class. + type: improved diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index 809da94b757..cf2f952998a 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -162,7 +162,7 @@ if ( $hook >0 ) { echo "

"; ?> - +
@@ -235,7 +235,7 @@ echo $OUTPUT->heading(format_string($glossary->name), 2); ?> - +
@@ -250,7 +250,7 @@ echo $OUTPUT->heading(format_string($glossary->name), 2); $categories = $DB->get_records("glossary_categories", array("glossaryid"=>$glossary->id), "name ASC"); if ( $categories ) { - echo '
'; + echo '
'; foreach ($categories as $category) { $num_entries = $DB->count_records("glossary_entries_categories", array("categoryid"=>$category->id)); ?> @@ -286,7 +286,7 @@ echo $OUTPUT->heading(format_string($glossary->name), 2); $options['id'] = $cm->id; $options['action'] = "add"; - echo "
"; + echo "
"; echo $OUTPUT->single_button(new moodle_url("editcategories.php", $options), get_string("addcategory", "glossary")); echo ""; unset($options['action']); diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php index 01fafce6be8..d947f53817e 100644 --- a/mod/glossary/formats.php +++ b/mod/glossary/formats.php @@ -67,7 +67,7 @@ $yes = get_string("yes"); $no = get_string("no"); echo ''; -echo ''; +echo '
'; ?>
diff --git a/mod/glossary/formats/continuous/continuous_format.php b/mod/glossary/formats/continuous/continuous_format.php index 694330fc834..55f7b2dec69 100644 --- a/mod/glossary/formats/continuous/continuous_format.php +++ b/mod/glossary/formats/continuous/continuous_format.php @@ -4,7 +4,7 @@ function glossary_show_entry_continuous($course, $cm, $glossary, $entry, $mode=' global $USER, $OUTPUT; - echo ''; + echo '
'; echo ''; echo '
'; glossary_print_entry_approval($cm, $entry, $mode); diff --git a/mod/glossary/formats/dictionary/dictionary_format.php b/mod/glossary/formats/dictionary/dictionary_format.php index 97aaf2aa474..0e42ab4205c 100644 --- a/mod/glossary/formats/dictionary/dictionary_format.php +++ b/mod/glossary/formats/dictionary/dictionary_format.php @@ -4,7 +4,7 @@ function glossary_show_entry_dictionary($course, $cm, $glossary, $entry, $mode=' global $CFG, $USER, $OUTPUT; - echo ''; + echo '
'; echo ''; echo '
'; glossary_print_entry_approval($cm, $entry, $mode); diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php index 7e2a518a17b..0cfb9ad0d69 100644 --- a/mod/glossary/formats/encyclopedia/encyclopedia_format.php +++ b/mod/glossary/formats/encyclopedia/encyclopedia_format.php @@ -8,7 +8,7 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode $strby = get_string('writtenby', 'glossary'); if ($entry) { - echo ''; + echo '
'; echo ''; echo '
'; diff --git a/mod/glossary/formats/entrylist/entrylist_format.php b/mod/glossary/formats/entrylist/entrylist_format.php index aae1cc0c007..c02d4c27713 100644 --- a/mod/glossary/formats/entrylist/entrylist_format.php +++ b/mod/glossary/formats/entrylist/entrylist_format.php @@ -5,7 +5,7 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode='' $return = false; - echo ''; + echo '
'; echo ''; echo '
'; diff --git a/mod/glossary/formats/faq/faq_format.php b/mod/glossary/formats/faq/faq_format.php index c9ed8ca0676..95d413c0381 100644 --- a/mod/glossary/formats/faq/faq_format.php +++ b/mod/glossary/formats/faq/faq_format.php @@ -4,7 +4,7 @@ function glossary_show_entry_faq($course, $cm, $glossary, $entry, $mode="", $hoo global $USER, $OUTPUT; if ( $entry ) { - echo ''; + echo '
'; echo ''; echo '
'; diff --git a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php index e72213b10ab..75f9b0991a6 100644 --- a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php +++ b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php @@ -8,7 +8,7 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo $strby = get_string('writtenby', 'glossary'); if ($entry) { - echo ''; + echo '
'; echo ''; echo '
'; diff --git a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php index cfb7b4eff44..e23c8e8164f 100644 --- a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php +++ b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php @@ -5,7 +5,7 @@ function glossary_show_entry_fullwithoutauthor($course, $cm, $glossary, $entry, if ($entry) { - echo ''; + echo '
'; echo ''; echo '
'; diff --git a/mod/glossary/import.php b/mod/glossary/import.php index 85c4f1d620d..8ee9be5209a 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -329,7 +329,7 @@ if ($xml = glossary_read_imported_file($result)) { // processed entries echo $OUTPUT->box_start('glossarydisplay generalbox'); - echo ''; + echo '
'; echo ''; echo '
'; echo get_string("totalentries","glossary"); @@ -364,7 +364,7 @@ if ($xml = glossary_read_imported_file($result)) { // rejected entries if ($rejections) { echo $OUTPUT->heading(get_string("rejectionrpt","glossary"), 4); - echo ''; + echo '
'; echo $rejections; echo '
'; } diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 4c6226c9199..5d6e2a16d67 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1357,7 +1357,7 @@ function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mo $icons = glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode, $hook,'html'); } if ($aliases || $icons || !empty($entry->rating)) { - echo ''; + echo '
'; if ( $aliases ) { $id = "keyword-{$entry->id}"; echo '
' . @@ -1418,7 +1418,7 @@ function glossary_print_entry_approval($cm, $entry, $mode, $align="right", $ins if ($mode == 'approval' and !$entry->approved) { if ($insidetable) { - echo '
'; + echo '
'; } echo $OUTPUT->action_icon( new moodle_url('approve.php', array('eid' => $entry->id, 'mode' => $mode, 'sesskey' => sesskey())), @@ -1905,7 +1905,7 @@ function glossary_print_categories_menu($cm, $glossary, $hook, $category) { $fmtoptions = array( 'context' => $context); - echo ''; + echo '
'; echo ''; echo '
'; @@ -2183,7 +2183,7 @@ function glossary_print_dynaentry($courseid, $entries, $displayformat = -1) { global $USER, $CFG, $DB; echo '
'; - echo ''; + echo '
'; echo '
'; if ( $entries ) { foreach ( $entries as $entry ) { diff --git a/mod/glossary/locallib.php b/mod/glossary/locallib.php index 46e44e5df17..44d7197d4b3 100644 --- a/mod/glossary/locallib.php +++ b/mod/glossary/locallib.php @@ -407,7 +407,7 @@ class glossary_entry_portfolio_caller extends portfolio_module_caller_base { $options->trusted = $entry->definitiontrust; $options->context = $context; - $output = '' . "\n"; + $output = '
' . "\n"; $output .= '' . "\n"; $output .= '
' . "\n"; @@ -446,7 +446,7 @@ class glossary_entry_portfolio_caller extends portfolio_module_caller_base { } $fs = get_file_storage(); if ($files = $fs->get_area_files($filecontext->id, 'mod_glossary', 'attachment', $entry->id, "timemodified", false)) { - $output .= '
' . "\n"; + $output .= '
' . "\n"; foreach ($files as $file) { $output .= $format->file_output($file); diff --git a/mod/glossary/view.php b/mod/glossary/view.php index 1f0394c7db5..0cc3f7b4deb 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -435,7 +435,7 @@ if ($allentries) { // print the group break if apply echo '
'; - echo ''; + echo '
'; echo ''; if ($userispivot) { diff --git a/theme/boost/scss/moodle/undo.scss b/theme/boost/scss/moodle/undo.scss index 1cf8ef34e6c..9ff7ee18313 100644 --- a/theme/boost/scss/moodle/undo.scss +++ b/theme/boost/scss/moodle/undo.scss @@ -242,8 +242,10 @@ $allow-reset-style: true !default; /** * Reset the Bootstrap _reboot.scss styles for tables. * That reboot mainly affects tables added by the tiny editor. + * If a table should continue using the original _reboot.scss styles, add the .table-reboot (styleless) class to opt out + * of this reset. */ -table:not(.table):not(.ygtvtable) { +table:not(.table):not(.ygtvtable):not(.table-reboot) { thead, tbody, tfoot, diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 279b1b9f425..b67e8f71e0d 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -38262,13 +38262,15 @@ body.reset-style .btn:not(.btn-icon) { /** * Reset the Bootstrap _reboot.scss styles for tables. * That reboot mainly affects tables added by the tiny editor. + * If a table should continue using the original _reboot.scss styles, add the .table-reboot (styleless) class to opt out + * of this reset. */ -table:not(.table):not(.ygtvtable) thead, -table:not(.table):not(.ygtvtable) tbody, -table:not(.table):not(.ygtvtable) tfoot, -table:not(.table):not(.ygtvtable) tr, -table:not(.table):not(.ygtvtable) td, -table:not(.table):not(.ygtvtable) th { +table:not(.table):not(.ygtvtable):not(.table-reboot) thead, +table:not(.table):not(.ygtvtable):not(.table-reboot) tbody, +table:not(.table):not(.ygtvtable):not(.table-reboot) tfoot, +table:not(.table):not(.ygtvtable):not(.table-reboot) tr, +table:not(.table):not(.ygtvtable):not(.table-reboot) td, +table:not(.table):not(.ygtvtable):not(.table-reboot) th { border-color: var(--bs-border-color); border-style: solid; border-width: var(--bs-border-width); diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 1bbc086be77..977fa9b11ce 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -38196,13 +38196,15 @@ body:not(.jsenabled) .langmenu:hover > .dropdown-menu, /** * Reset the Bootstrap _reboot.scss styles for tables. * That reboot mainly affects tables added by the tiny editor. + * If a table should continue using the original _reboot.scss styles, add the .table-reboot (styleless) class to opt out + * of this reset. */ -table:not(.table):not(.ygtvtable) thead, -table:not(.table):not(.ygtvtable) tbody, -table:not(.table):not(.ygtvtable) tfoot, -table:not(.table):not(.ygtvtable) tr, -table:not(.table):not(.ygtvtable) td, -table:not(.table):not(.ygtvtable) th { +table:not(.table):not(.ygtvtable):not(.table-reboot) thead, +table:not(.table):not(.ygtvtable):not(.table-reboot) tbody, +table:not(.table):not(.ygtvtable):not(.table-reboot) tfoot, +table:not(.table):not(.ygtvtable):not(.table-reboot) tr, +table:not(.table):not(.ygtvtable):not(.table-reboot) td, +table:not(.table):not(.ygtvtable):not(.table-reboot) th { border-color: var(--bs-border-color); border-style: solid; border-width: var(--bs-border-width);