From 6baf2046d523b0ebfa29bd2abd38c4f808f411b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= Date: Mon, 17 Jun 2024 12:41:41 +0200 Subject: [PATCH] MDL-75671 theme_boost: Refactor float classes for BS5 - Add SCSS code for float utility classes to the Boostrap 5 bridge SCSS file - Replace all occurrences in the codebase (float-left > float-start, float-sm-right > float-sm-end, ...) --- .../classes/define_role_table_advanced.php | 2 +- .../templates/export_import.mustache | 2 +- .../content/bootstrap/components/forms.md | 2 +- .../content/bootstrap/components/spinners.md | 2 +- .../content/bootstrap/content/images.md | 4 +-- .../content/bootstrap/utilities/clearfix.md | 4 +-- .../content/bootstrap/utilities/float.md | 12 +++---- .../templates/data_deletion.mustache | 6 ++-- .../data_registry_compliance.mustache | 2 +- .../templates/data_requests.mustache | 2 +- .../data_requests_bulk_actions.mustache | 4 +-- .../templates/request_details.mustache | 6 ++-- .../templates/competencies_move_tree.mustache | 2 +- .../lp/templates/competency_grader.mustache | 2 +- .../lp/templates/competency_picker.mustache | 2 +- .../competency_picker_competencyform.mustache | 2 +- .../competency_picker_user_plans.mustache | 2 +- .../competency_plan_navigation.mustache | 2 +- .../templates/competency_rule_config.mustache | 2 +- .../lp/templates/competency_summary.mustache | 2 +- .../course_competencies_page.mustache | 8 ++--- .../course_competency_settings.mustache | 2 +- .../lp/templates/evidence_summary.mustache | 2 +- .../templates/form_competency_list.mustache | 2 +- .../manage_competencies_page.mustache | 2 +- ...manage_competency_frameworks_page.mustache | 2 +- .../templates/manage_templates_page.mustache | 2 +- .../lp/templates/module_navigation.mustache | 2 +- admin/tool/lp/templates/plan_page.mustache | 6 ++-- admin/tool/lp/templates/plans_page.mustache | 4 +-- .../templates/related_competencies.mustache | 2 +- .../scale_configuration_page.mustache | 2 +- .../template_competencies_page.mustache | 4 +-- ...user_competency_course_navigation.mustache | 2 +- .../user_competency_summary.mustache | 2 +- ...user_competency_summary_in_course.mustache | 2 +- .../user_competency_summary_in_plan.mustache | 4 +-- .../user_evidence_list_page.mustache | 2 +- .../lp/templates/user_evidence_page.mustache | 4 +-- admin/tool/mfa/factor/sms/classes/factor.php | 2 +- .../policy/templates/page_agreedocs.mustache | 4 +-- .../policy/templates/page_viewalldoc.mustache | 2 +- .../policy/templates/page_viewdoc.mustache | 6 ++-- .../templates/event-list-item.mustache | 2 +- blog/rsslib.php | 2 +- calendar/renderer.php | 12 +++---- calendar/templates/add_event_button.mustache | 2 +- calendar/templates/event_item.mustache | 2 +- course/classes/management_renderer.php | 26 +++++++-------- course/templates/activity_navigation.mustache | 4 +-- customfield/classes/output/management.php | 2 +- customfield/templates/list.mustache | 2 +- .../singleview/classes/report/singleview.php | 2 +- lib/form/templates/filetypes-browser.mustache | 4 +-- lib/templates/block.mustache | 2 +- .../filemanager_modal_generallayout.mustache | 2 +- .../filemanager_page_generallayout.mustache | 2 +- .../reactive/debuginstancepanel.mustache | 2 +- ...ation_header_content_type_private.mustache | 2 +- ...sation_header_content_type_public.mustache | 2 +- mod/assign/templates/grading_app.mustache | 2 +- .../tool/print/templates/print_book.mustache | 6 ++-- mod/data/templates/presets.mustache | 2 +- .../classes/output/subscription_actionbar.php | 2 +- .../templates/bulk_action_menu.mustache | 4 +-- .../templates/filter_dates_popover.mustache | 4 +-- .../summary/templates/filter_groups.mustache | 2 +- .../forum_subscription_action.mustache | 2 +- mod/forum/templates/inpage_reply.mustache | 2 +- mod/glossary/editcategories.html | 4 +-- mod/lti/templates/tool_card.mustache | 2 +- mod/lti/templates/tool_proxy_card.mustache | 2 +- .../templates/response_action_bar.mustache | 2 +- .../templates/user_course_navigation.mustache | 2 +- .../templates/local/settings/sorting.mustache | 2 +- theme/boost/scss/moodle/bs5-bridge.scss | 12 +++++++ theme/boost/scss/moodle/core.scss | 9 ------ theme/boost/scss/moodle/course.scss | 4 +-- theme/boost/style/moodle.css | 32 +++++++------------ theme/classic/style/moodle.css | 32 +++++++------------ user/profile/index.php | 2 +- user/templates/edit_profile_fields.mustache | 2 +- 82 files changed, 163 insertions(+), 176 deletions(-) diff --git a/admin/roles/classes/define_role_table_advanced.php b/admin/roles/classes/define_role_table_advanced.php index 632cb3e39a6..402e7e514fa 100644 --- a/admin/roles/classes/define_role_table_advanced.php +++ b/admin/roles/classes/define_role_table_advanced.php @@ -655,7 +655,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi echo "\n"; } if ($helpicon) { - echo ''.$helpicon.''; + echo ''.$helpicon.''; } echo ''; if (isset($this->errors[$name])) { diff --git a/admin/tool/admin_presets/templates/export_import.mustache b/admin/tool/admin_presets/templates/export_import.mustache index 78b773fb8cf..8a66b1e00a7 100644 --- a/admin/tool/admin_presets/templates/export_import.mustache +++ b/admin/tool/admin_presets/templates/export_import.mustache @@ -40,7 +40,7 @@ } }} -
+
{{#export}}{{> core/single_button}}{{/export}} {{#import}}{{> core/single_button}}{{/import}}
diff --git a/admin/tool/componentlibrary/content/bootstrap/components/forms.md b/admin/tool/componentlibrary/content/bootstrap/components/forms.md index e17e47fc578..40d1d47d2a4 100644 --- a/admin/tool/componentlibrary/content/bootstrap/components/forms.md +++ b/admin/tool/componentlibrary/content/bootstrap/components/forms.md @@ -383,7 +383,7 @@ At times, you maybe need to use margin or padding utilities to create that perfe
- Radios + Radios
diff --git a/admin/tool/componentlibrary/content/bootstrap/components/spinners.md b/admin/tool/componentlibrary/content/bootstrap/components/spinners.md index 1140477e077..34d4d37ac34 100644 --- a/admin/tool/componentlibrary/content/bootstrap/components/spinners.md +++ b/admin/tool/componentlibrary/content/bootstrap/components/spinners.md @@ -105,7 +105,7 @@ Use [flexbox utilities][flex], [float utilities][float], or [text alignment][tex {{< example >}}
-
+
Loading...
diff --git a/admin/tool/componentlibrary/content/bootstrap/content/images.md b/admin/tool/componentlibrary/content/bootstrap/content/images.md index 0a25b13449e..f5af9d08c38 100644 --- a/admin/tool/componentlibrary/content/bootstrap/content/images.md +++ b/admin/tool/componentlibrary/content/bootstrap/content/images.md @@ -33,8 +33,8 @@ In addition to our [border-radius utilities]({{< docsref "/utilities/borders" >} Align images with the [helper float classes]({{< docsref "/utilities/float" >}}) or [text alignment classes]({{< docsref "/utilities/text#text-alignment" >}}). `block`-level images can be centered using [the `.mx-auto` margin utility class]({{< docsref "/utilities/spacing#horizontal-centering" >}}). {{< example >}} -{{< placeholder width="200" height="200" class="rounded float-left" >}} -{{< placeholder width="200" height="200" class="rounded float-right" >}} +{{< placeholder width="200" height="200" class="rounded float-start" >}} +{{< placeholder width="200" height="200" class="rounded float-end" >}} {{< /example >}} {{< example >}} diff --git a/admin/tool/componentlibrary/content/bootstrap/utilities/clearfix.md b/admin/tool/componentlibrary/content/bootstrap/utilities/clearfix.md index c2f129a7150..2d2f7a22a1b 100644 --- a/admin/tool/componentlibrary/content/bootstrap/utilities/clearfix.md +++ b/admin/tool/componentlibrary/content/bootstrap/utilities/clearfix.md @@ -31,7 +31,7 @@ The following example shows how the clearfix can be used. Without the clearfix t {{< example >}}
- - + +
{{< /example >}} diff --git a/admin/tool/componentlibrary/content/bootstrap/utilities/float.md b/admin/tool/componentlibrary/content/bootstrap/utilities/float.md index be35d729d12..1f6cdab4a1e 100644 --- a/admin/tool/componentlibrary/content/bootstrap/utilities/float.md +++ b/admin/tool/componentlibrary/content/bootstrap/utilities/float.md @@ -15,8 +15,8 @@ These utility classes float an element to the left or right, or disable floating Toggle a float with a class: {{< example >}} -
Float left on all viewport sizes

-
Float right on all viewport sizes

+
Float left on all viewport sizes

+
Float right on all viewport sizes

Don't float on all viewport sizes
{{< /example >}} @@ -41,10 +41,10 @@ Or by Sass mixin: Responsive variations also exist for each `float` value. {{< example >}} -
Float left on viewports sized SM (small) or wider

-
Float left on viewports sized MD (medium) or wider

-
Float left on viewports sized LG (large) or wider

-
Float left on viewports sized XL (extra-large) or wider

+
Float left on viewports sized SM (small) or wider

+
Float left on viewports sized MD (medium) or wider

+
Float left on viewports sized LG (large) or wider

+
Float left on viewports sized XL (extra-large) or wider

{{< /example >}} Here are all the support classes; diff --git a/admin/tool/dataprivacy/templates/data_deletion.mustache b/admin/tool/dataprivacy/templates/data_deletion.mustache index 7f2e346ce26..137e00a2b70 100644 --- a/admin/tool/dataprivacy/templates/data_deletion.mustache +++ b/admin/tool/dataprivacy/templates/data_deletion.mustache @@ -58,13 +58,13 @@
{{#str}}datadeletionpagehelp, tool_dataprivacy{{/str}}
-
+
{{#filter}} {{> core/single_select}} {{/filter}}
{{#existingcontexts}} -
+
{{/existingcontexts}} @@ -74,7 +74,7 @@
{{#existingcontexts}} -
+
{{/existingcontexts}} diff --git a/admin/tool/dataprivacy/templates/data_registry_compliance.mustache b/admin/tool/dataprivacy/templates/data_registry_compliance.mustache index ab66f577483..2e377a86810 100644 --- a/admin/tool/dataprivacy/templates/data_registry_compliance.mustache +++ b/admin/tool/dataprivacy/templates/data_registry_compliance.mustache @@ -51,7 +51,7 @@
{{#str}}userlistexplanation, tool_dataprivacy{{/str}}

- + {{#types}}
diff --git a/admin/tool/dataprivacy/templates/data_requests.mustache b/admin/tool/dataprivacy/templates/data_requests.mustache index a1e4c598edd..e7c7b826ac6 100644 --- a/admin/tool/dataprivacy/templates/data_requests.mustache +++ b/admin/tool/dataprivacy/templates/data_requests.mustache @@ -61,7 +61,7 @@
-
+
{{#str}}newrequest, tool_dataprivacy{{/str}} diff --git a/admin/tool/dataprivacy/templates/data_requests_bulk_actions.mustache b/admin/tool/dataprivacy/templates/data_requests_bulk_actions.mustache index 1f985626d55..561e52abd7f 100644 --- a/admin/tool/dataprivacy/templates/data_requests_bulk_actions.mustache +++ b/admin/tool/dataprivacy/templates/data_requests_bulk_actions.mustache @@ -45,7 +45,7 @@ } }}
-
+
-
+
{{{ perpage }}}
diff --git a/admin/tool/dataprivacy/templates/request_details.mustache b/admin/tool/dataprivacy/templates/request_details.mustache index 65815ac3cdf..f4709bca52a 100644 --- a/admin/tool/dataprivacy/templates/request_details.mustache +++ b/admin/tool/dataprivacy/templates/request_details.mustache @@ -66,15 +66,15 @@ {{foruser.email}}
- + {{#str}}daterequesteddetail, tool_dataprivacy{{/str}} {{#userdate}} {{timecreated}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}} - + {{#str}}statusdetail, tool_dataprivacy{{/str}} {{statuslabel}} - + {{#str}}requestbydetail, tool_dataprivacy{{/str}} {{requestedbyuser.fullname}} diff --git a/admin/tool/lp/templates/competencies_move_tree.mustache b/admin/tool/lp/templates/competencies_move_tree.mustache index ff8d078ae3f..c20be2f7b64 100644 --- a/admin/tool/lp/templates/competencies_move_tree.mustache +++ b/admin/tool/lp/templates/competencies_move_tree.mustache @@ -53,7 +53,7 @@
-
+
diff --git a/admin/tool/lp/templates/competency_grader.mustache b/admin/tool/lp/templates/competency_grader.mustache index 6677cd91787..9827b42ee3d 100644 --- a/admin/tool/lp/templates/competency_grader.mustache +++ b/admin/tool/lp/templates/competency_grader.mustache @@ -50,7 +50,7 @@
-
+
diff --git a/admin/tool/lp/templates/competency_picker.mustache b/admin/tool/lp/templates/competency_picker.mustache index 87e42299827..a7fc1616309 100644 --- a/admin/tool/lp/templates/competency_picker.mustache +++ b/admin/tool/lp/templates/competency_picker.mustache @@ -78,7 +78,7 @@ -
+
diff --git a/admin/tool/lp/templates/competency_picker_competencyform.mustache b/admin/tool/lp/templates/competency_picker_competencyform.mustache index f9d3131e022..46359cf899d 100644 --- a/admin/tool/lp/templates/competency_picker_competencyform.mustache +++ b/admin/tool/lp/templates/competency_picker_competencyform.mustache @@ -60,7 +60,7 @@ -
+
diff --git a/admin/tool/lp/templates/competency_picker_user_plans.mustache b/admin/tool/lp/templates/competency_picker_user_plans.mustache index 5a1c561c20f..b1861ffaff2 100644 --- a/admin/tool/lp/templates/competency_picker_user_plans.mustache +++ b/admin/tool/lp/templates/competency_picker_user_plans.mustache @@ -84,7 +84,7 @@ -
+
diff --git a/admin/tool/lp/templates/competency_plan_navigation.mustache b/admin/tool/lp/templates/competency_plan_navigation.mustache index 66747cbe855..df6ed84e7fe 100644 --- a/admin/tool/lp/templates/competency_plan_navigation.mustache +++ b/admin/tool/lp/templates/competency_plan_navigation.mustache @@ -32,7 +32,7 @@ // No example context because the JS is connected to webservices }} -
+
{{#hascompetencies}} diff --git a/admin/tool/lp/templates/competency_rule_config.mustache b/admin/tool/lp/templates/competency_rule_config.mustache index 63e1264cbe7..d4e60d3e2a8 100644 --- a/admin/tool/lp/templates/competency_rule_config.mustache +++ b/admin/tool/lp/templates/competency_rule_config.mustache @@ -81,7 +81,7 @@ {{/config}}
-
+
{{#config}} {{/config}} diff --git a/admin/tool/lp/templates/competency_summary.mustache b/admin/tool/lp/templates/competency_summary.mustache index 74251dbcfa1..79135652bf0 100644 --- a/admin/tool/lp/templates/competency_summary.mustache +++ b/admin/tool/lp/templates/competency_summary.mustache @@ -70,7 +70,7 @@

{{{competency.description}}}

{{/competency.description}} {{#comppath}} - {{#str}}path, tool_lp{{/str}} {{> tool_lp/competency_path }} + {{#str}}path, tool_lp{{/str}} {{> tool_lp/competency_path }} {{/comppath}} {{#showrelatedcompetencies}} {{> tool_lp/related_competencies }} diff --git a/admin/tool/lp/templates/course_competencies_page.mustache b/admin/tool/lp/templates/course_competencies_page.mustache index 6837bfdebe0..7a386ac9fb3 100644 --- a/admin/tool/lp/templates/course_competencies_page.mustache +++ b/admin/tool/lp/templates/course_competencies_page.mustache @@ -25,7 +25,7 @@ }}
-
+
{{#canmanagecoursecompetencies}} {{/canmanagecoursecompetencies}} @@ -61,8 +61,8 @@ {{#canmanagecoursecompetencies}} - -
+ +
{{#pix}}t/delete, core, {{#str}}delete{{/str}}{{/pix}} @@ -78,7 +78,7 @@

{{{competency.description}}}

{{/competency}} {{#comppath}} - {{#str}}path, tool_lp{{/str}} {{> tool_lp/competency_path }} + {{#str}}path, tool_lp{{/str}} {{> tool_lp/competency_path }} {{/comppath}} {{#usercompetencycourse}} {{#grade}} diff --git a/admin/tool/lp/templates/course_competency_settings.mustache b/admin/tool/lp/templates/course_competency_settings.mustache index a43908ca9be..97f34e88c4a 100644 --- a/admin/tool/lp/templates/course_competency_settings.mustache +++ b/admin/tool/lp/templates/course_competency_settings.mustache @@ -49,7 +49,7 @@
-
+
diff --git a/admin/tool/lp/templates/evidence_summary.mustache b/admin/tool/lp/templates/evidence_summary.mustache index a0922d59491..6b324578b02 100644 --- a/admin/tool/lp/templates/evidence_summary.mustache +++ b/admin/tool/lp/templates/evidence_summary.mustache @@ -46,7 +46,7 @@ }}
{{#candelete}} -
+ {{/candelete}} diff --git a/admin/tool/lp/templates/form_competency_list.mustache b/admin/tool/lp/templates/form_competency_list.mustache index 4500c147749..fe0f14ab146 100644 --- a/admin/tool/lp/templates/form_competency_list.mustache +++ b/admin/tool/lp/templates/form_competency_list.mustache @@ -48,7 +48,7 @@