From 0a03018116ad8be3d7a019dca8aa83af0178e3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= Date: Wed, 12 Jun 2024 16:04:33 +0200 Subject: [PATCH 1/4] MDL-75671 theme_boost: Refactor spacing classes for BS5 - Add SCSS code for spacing utility classes to the Boostrap 5 bridge SCSS file - Replace all occurrences in the codebase (pr-1 > pe-1, ml-auto > ms-auto, ml-sm-3 > ms-sm-3, ...) --- .../local/systemreports/users.php | 4 +- admin/renderer.php | 24 +- admin/roles/override.php | 2 +- .../themeselector/theme_card.mustache | 4 +- admin/templates/webservice_token_new.mustache | 2 +- .../templates/export_options.mustache | 2 +- .../bootstrap/components/button-group.md | 6 +- .../content/bootstrap/components/dropdowns.md | 2 +- .../content/bootstrap/components/forms.md | 18 +- .../bootstrap/components/media-object.md | 20 +- .../content/bootstrap/components/modal.md | 16 +- .../content/bootstrap/components/navbar.md | 40 +-- .../content/bootstrap/components/scrollspy.md | 16 +- .../content/bootstrap/components/spinners.md | 2 +- .../content/bootstrap/components/toasts.md | 66 ++-- .../content/bootstrap/layout/grid.md | 10 +- .../bootstrap/layout/utilities-for-layout.md | 2 +- .../content/bootstrap/utilities/flex.md | 6 +- .../content/bootstrap/utilities/overflow.md | 2 +- .../content/bootstrap/utilities/spacing.md | 2 +- .../bootstrap/utilities/stretched-link.md | 4 +- .../content/library/getting-started.md | 2 +- .../content/library/moodle-javascript.md | 6 +- .../moodle/accessibility/keyboard-access.md | 16 +- .../moodle/components/activityicons.md | 20 +- .../content/moodle/components/buttons.md | 10 +- .../content/moodle/components/toggle.md | 2 +- .../content/moodle/themes/iconsizes.md | 12 +- .../content/moodle/themes/positioning.md | 18 +- .../hugo/site/layouts/_default/docs.html | 6 +- .../customlang/templates/translator.mustache | 2 +- .../classes/output/expired_contexts_table.php | 4 +- .../templates/component_status.mustache | 10 +- .../templates/data_registry.mustache | 2 +- .../templates/request_details.mustache | 8 +- .../dataprivacy/templates/summary.mustache | 2 +- .../lp/templates/action_selector.mustache | 2 +- .../lp/templates/competency_picker.mustache | 2 +- .../competency_picker_competencyform.mustache | 2 +- .../competency_picker_user_plans.mustache | 2 +- admin/tool/mfa/templates/mfa_card.mustache | 2 +- .../mfa/templates/verification_form.mustache | 2 +- .../templates/chooser_footer.mustache | 2 +- .../chooser_footer_close_mnet.mustache | 2 +- .../moodlenet/templates/view-cards.mustache | 2 +- admin/user.php | 2 +- admin/webservice/tokens.php | 2 +- .../insight_info_message_prediction.mustache | 2 +- auth/oauth2/templates/idps.mustache | 2 +- auth/shibboleth/templates/login_form.mustache | 4 +- ...odle-availability_completion-form-debug.js | 2 +- ...moodle-availability_completion-form-min.js | 2 +- .../moodle-availability_completion-form.js | 2 +- .../completion/yui/src/form/js/form.js | 2 +- .../moodle-availability_date-form-debug.js | 2 +- .../moodle-availability_date-form-min.js | 2 +- .../moodle-availability_date-form.js | 2 +- .../condition/date/yui/src/form/js/form.js | 2 +- .../moodle-availability_grade-form-debug.js | 2 +- .../moodle-availability_grade-form-min.js | 2 +- .../moodle-availability_grade-form.js | 2 +- .../condition/grade/yui/src/form/js/form.js | 2 +- .../moodle-availability_group-form-debug.js | 2 +- .../moodle-availability_group-form-min.js | 2 +- .../moodle-availability_group-form.js | 2 +- .../condition/group/yui/src/form/js/form.js | 2 +- ...moodle-availability_grouping-form-debug.js | 2 +- .../moodle-availability_grouping-form-min.js | 2 +- .../moodle-availability_grouping-form.js | 2 +- .../grouping/yui/src/form/js/form.js | 2 +- .../moodle-availability_profile-form-debug.js | 2 +- .../moodle-availability_profile-form-min.js | 2 +- .../moodle-availability_profile-form.js | 2 +- .../condition/profile/yui/src/form/js/form.js | 2 +- backup/moodle2/backup_activity_task.class.php | 2 +- .../moodle2/restore_activity_task.class.php | 2 +- backup/util/ui/renderer.php | 8 +- badges/criteria/award_criteria.php | 2 +- badges/renderer.php | 4 +- badges/templates/issued_badge.mustache | 4 +- blocks/login/block_login.php | 2 +- .../templates/course-action-menu.mustache | 2 +- .../templates/nav-grouping-selector.mustache | 4 +- .../templates/nav-search-widget.mustache | 2 +- .../templates/nav-sort-selector.mustache | 2 +- .../myoverview/templates/view-cards.mustache | 4 +- .../myoverview/templates/view-list.mustache | 2 +- .../templates/view-summary.mustache | 2 +- .../templates/course-card.mustache | 2 +- .../templates/placeholder-item.mustache | 2 +- .../templates/view-cards.mustache | 2 +- .../site_main_menu/block_site_main_menu.php | 2 +- .../block_social_activities.php | 2 +- .../course-item-loading-placeholder.mustache | 2 +- .../templates/event-list-item.mustache | 6 +- .../templates/event-list-loadmore.mustache | 2 +- blocks/timeline/templates/event-list.mustache | 2 +- blocks/timeline/templates/main.mustache | 4 +- .../placeholder-event-list-item.mustache | 6 +- calendar/renderer.php | 8 +- calendar/templates/upcoming_mini.mustache | 2 +- calendar/templates/view_selector.mustache | 2 +- comment/lib.php | 2 +- comment/locallib.php | 2 +- completion/classes/form/form_trait.php | 2 +- contentbank/templates/bankcontent.mustache | 2 +- .../templates/bankcontent/toolbar.mustache | 4 +- .../bankcontent/toolbar_dropdown.mustache | 2 +- .../viewcontent/toolbarview.mustache | 4 +- course/classes/management_renderer.php | 24 +- .../local/content/availability.mustache | 2 +- .../local/content/bulkedittools.mustache | 6 +- .../local/content/cm/activity.mustache | 8 +- .../local/content/cm/activitybadge.mustache | 2 +- .../local/content/cm/cmicon.mustache | 2 +- .../local/content/cm/cmname.mustache | 2 +- .../content/cm/completion_dialog.mustache | 2 +- .../local/content/cm/groupmode.mustache | 2 +- .../local/content/movecmsection.mustache | 6 +- .../local/content/section/cmsummary.mustache | 2 +- .../local/content/section/content.mustache | 6 +- .../content/section/controlmenu.mustache | 2 +- .../local/content/section/header.mustache | 2 +- .../templates/local/courseindex/cm.mustache | 4 +- .../local/courseindex/placeholders.mustache | 8 +- .../local/courseindex/section.mustache | 10 +- .../templates/activitychooserbutton.mustache | 2 +- course/templates/activityinstance.mustache | 8 +- .../templates/bulkactivitycompletion.mustache | 4 +- course/templates/category_actionbar.mustache | 2 +- course/templates/coursecard.mustache | 4 +- .../defaultactivitycompletion.mustache | 8 +- .../templates/editdefaultcompletion.mustache | 2 +- course/templates/placeholder-course.mustache | 2 +- course/templates/view-cards.mustache | 2 +- customfield/classes/output/management.php | 2 +- .../local/ltiadvantage/tool_details.mustache | 4 +- enrol/yui/rolemanager/rolemanager.js | 2 +- grade/edit/outcome/course_form.html | 2 +- grade/edit/tree/lib.php | 2 +- .../grades/grader/gradingpanel.mustache | 4 +- .../grades/grader/gradingpanel.mustache | 2 +- .../grader/lang/en/gradereport_grader.php | 2 +- grade/report/grader/lib.php | 4 +- .../grader/templates/action_bar.mustache | 2 +- .../templates/collapse/collapsebody.mustache | 2 +- .../collapse/collapseresultitems.mustache | 2 +- .../singleview/classes/local/screen/user.php | 2 +- .../singleview/templates/action_bar.mustache | 6 +- .../singleview/templates/bulk_insert.mustache | 2 +- .../templates/grade_item_selector.mustache | 4 +- .../templates/page_toggler.mustache | 2 +- .../templates/report_navigation.mustache | 10 +- grade/report/user/classes/report/user.php | 4 +- .../report/user/templates/action_bar.mustache | 2 +- .../user/templates/all_users_item.mustache | 2 +- .../user/templates/user_navigation.mustache | 6 +- .../user_report_category_content.mustache | 2 +- .../tree/bulk_move_category_item.mustache | 2 +- grade/templates/feedback_modal.mustache | 2 +- .../grade_category_visibility_toggle.mustache | 2 +- .../gradebook_setup_action_bar.mustache | 2 +- .../manage_outcomes_action_bar.mustache | 2 +- .../searchwidget/searchitem.mustache | 6 +- grade/templates/user_heading.mustache | 4 +- .../templates/weight_override_field.mustache | 2 +- .../comboboxsearch/group_selector.mustache | 2 +- .../comboboxsearch/resultitem.mustache | 4 +- .../moodlenet/share_progress_table.php | 2 +- lib/classes/output/core_renderer.php | 12 +- lib/classes/report_helper.php | 2 +- .../moodle-atto_h5p-button-debug.js | 4 +- .../moodle-atto_h5p-button-min.js | 2 +- .../moodle-atto_h5p-button.js | 4 +- .../plugins/h5p/yui/src/button/js/button.js | 4 +- .../moodle-atto_image-button-debug.js | 8 +- .../moodle-atto_image-button-min.js | 2 +- .../moodle-atto_image-button.js | 8 +- .../plugins/image/yui/src/button/js/button.js | 8 +- .../moodle-atto_media-button-debug.js | 8 +- .../moodle-atto_media-button-min.js | 4 +- .../moodle-atto_media-button.js | 8 +- .../plugins/media/yui/src/button/js/button.js | 8 +- .../moodle-atto_table-button-debug.js | 4 +- .../moodle-atto_table-button-min.js | 2 +- .../moodle-atto_table-button.js | 4 +- .../plugins/table/yui/src/button/js/button.js | 4 +- .../tiny/plugins/h5p/templates/modal.mustache | 4 +- .../embed_media_modal_audio.mustache | 12 +- .../embed_media_modal_video.mustache | 16 +- .../insert_image_modal_details.mustache | 22 +- ...insert_image_modal_details_footer.mustache | 2 +- .../insert_image_modal_insert_footer.mustache | 8 +- .../templates/audio_recorder.mustache | 2 +- .../templates/screen_recorder.mustache | 2 +- .../templates/video_recorder.mustache | 2 +- .../templates/element-advcheckbox.mustache | 2 +- lib/form/templates/element-button.mustache | 2 +- lib/form/templates/element-checkbox.mustache | 2 +- .../element-duration-inline.mustache | 2 +- lib/form/templates/element-header.mustache | 4 +- .../templates/element-passwordunmask.mustache | 2 +- lib/form/templates/element-radio.mustache | 2 +- lib/form/templates/element-template.mustache | 2 +- lib/installlib.php | 8 +- lib/templates/add_block_button.mustache | 2 +- .../bulkactions/bulk_action_trigger.mustache | 2 +- .../bulkactions/bulk_actions.mustache | 4 +- .../checkbox-toggleall-master.mustache | 2 +- .../autocomplete_selection_items.mustache | 4 +- lib/templates/datafilter/filter.mustache | 4 +- lib/templates/datafilter/filter_row.mustache | 12 +- .../filtertypes/binary_selector.mustache | 2 +- lib/templates/dataformat_selector.mustache | 4 +- lib/templates/editswitch.mustache | 4 +- lib/templates/emoji/picker.mustache | 4 +- lib/templates/filemanager_fileselect.mustache | 2 +- .../filemanager_modal_generallayout.mustache | 2 +- .../form_autocomplete_input.mustache | 4 +- lib/templates/full_header.mustache | 8 +- lib/templates/initials_bar.mustache | 6 +- lib/templates/local/notification/cta.mustache | 4 +- .../local/process_monitor/process.mustache | 2 +- lib/templates/local/toast/message.mustache | 4 +- .../send_activity_modal_base.mustache | 2 +- .../paged_content_paging_bar.mustache | 4 +- lib/templates/progress_bar.mustache | 2 +- lib/templates/report_link_page.mustache | 2 +- lib/templates/search_input.mustache | 2 +- .../settings_link_page_single.mustache | 2 +- lib/templates/single_select.mustache | 2 +- lib/templates/url_select.mustache | 4 +- .../user_action_menu_submenu_items.mustache | 2 +- lib/templates/user_menu.mustache | 4 +- lib/templates/user_menu_metadata.mustache | 2 +- .../userfeedback_footer_link.mustache | 2 +- .../action_menu_subpanel_output_testpage.php | 4 +- message/templates/message_drawer.mustache | 2 +- .../message_drawer_contacts_list.mustache | 4 +- ...er_contacts_list_item_placeholder.mustache | 2 +- ...message_drawer_conversations_list.mustache | 4 +- ...versations_list_items_placeholder.mustache | 4 +- .../message_drawer_messages_list.mustache | 4 +- ...er_messages_list_item_placeholder.mustache | 4 +- .../message_drawer_non_contacts_list.mustache | 4 +- ...message_drawer_view_contacts_body.mustache | 2 +- ...ntacts_body_section_requests_list.mustache | 2 +- ...ssage_drawer_view_contacts_header.mustache | 4 +- ...conversation_body_day_placeholder.mustache | 18 +- ...er_view_conversation_body_message.mustache | 14 +- ..._view_conversation_footer_content.mustache | 4 +- ...ation_header_content_type_private.mustache | 10 +- ..._content_type_private_no_controls.mustache | 8 +- ...sation_header_content_type_public.mustache | 14 +- ...ersation_header_content_type_self.mustache | 8 +- ...iew_conversation_header_edit_mode.mustache | 4 +- ...w_conversation_header_placeholder.mustache | 8 +- ...view_group_info_participants_list.mustache | 4 +- ...articipants_list_item_placeholder.mustache | 2 +- ...ssage_drawer_view_overview_header.mustache | 4 +- ...sage_drawer_view_overview_section.mustache | 6 +- ...message_drawer_view_search_header.mustache | 2 +- ...drawer_view_settings_body_content.mustache | 2 +- ...er_view_settings_body_placeholder.mustache | 12 +- ...ssage_drawer_view_settings_header.mustache | 2 +- .../extra_filters_dropdown_trigger.mustache | 4 +- .../templates/grading_actionmenu.mustache | 4 +- .../templates/submission_actionmenu.mustache | 2 +- .../user_submission_actionmenu.mustache | 6 +- .../participant_single_select.mustache | 2 +- .../templates/room_view.mustache | 2 +- mod/book/locallib.php | 2 +- mod/book/templates/main_action_menu.mustache | 2 +- .../tool/print/templates/print_book.mustache | 10 +- mod/chat/gui_ajax/index.php | 2 +- mod/choice/renderer.php | 8 +- mod/data/field.php | 2 +- mod/data/field/checkbox/field.class.php | 4 +- .../checkbox/templates/checkbox.mustache | 2 +- mod/data/field/latlong/field.class.php | 2 +- mod/data/field/menu/templates/menu.mustache | 2 +- mod/data/field/multimenu/field.class.php | 2 +- .../multimenu/templates/multimenu.mustache | 2 +- mod/data/field/radiobutton/field.class.php | 2 +- .../templates/radiobutton.mustache | 2 +- .../field/text/templates/autolink.mustache | 2 +- .../textarea/templates/textarea.mustache | 6 +- mod/data/field/url/field.class.php | 4 +- mod/data/field/url/templates/url.mustache | 4 +- mod/data/lib.php | 16 +- .../preset/imagegallery/listtemplate.html | 4 +- mod/data/preset/imagegallery/rsstemplate.html | 4 +- .../preset/imagegallery/singletemplate.html | 4 +- mod/data/preset/journal/listtemplate.html | 6 +- mod/data/preset/journal/rsstemplate.html | 4 +- mod/data/preset/journal/singletemplate.html | 4 +- mod/data/preset/proposals/listtemplate.html | 6 +- mod/data/preset/proposals/rsstemplate.html | 4 +- mod/data/preset/proposals/singletemplate.html | 4 +- mod/data/preset/resources/rsstemplate.html | 6 +- mod/data/preset/resources/singletemplate.html | 6 +- mod/data/renderer.php | 2 +- mod/data/templates/action_bar.mustache | 2 +- .../defaulttemplate_listtemplate.mustache | 6 +- .../defaulttemplate_singletemplate.mustache | 4 +- .../templates/fields/basicfields.mustache | 4 +- .../templates/fields/requiredfield.mustache | 2 +- mod/data/templates/fields_action_bar.mustache | 2 +- mod/data/templates/fields_footer.mustache | 2 +- mod/data/templates/presets.mustache | 8 +- mod/data/templates/template_editor.mustache | 2 +- mod/data/templates/view_action_bar.mustache | 2 +- mod/data/templates/view_footer.mustache | 2 +- mod/feedback/classes/complete_form.php | 2 +- mod/feedback/show_nonrespondents.php | 2 +- .../templates/main_action_menu.mustache | 2 +- mod/folder/renderer.php | 2 +- mod/forum/classes/output/big_search_form.php | 20 +- .../classes/output/subscription_actionbar.php | 2 +- mod/forum/index.php | 2 +- .../templates/bulk_action_menu.mustache | 4 +- .../summary/templates/filter_groups.mustache | 4 +- mod/forum/templates/discussion_list.mustache | 4 +- .../templates/forum_action_menu.mustache | 2 +- mod/forum/templates/forum_actionbar.mustache | 2 +- mod/forum/templates/forum_discussion.mustache | 6 +- ...m_discussion_nested_v2_first_post.mustache | 16 +- ...m_discussion_nested_v2_post_reply.mustache | 4 +- .../templates/forum_discussion_post.mustache | 6 +- .../forum_subscription_action.mustache | 2 +- .../grades/grader/discussion/posts.mustache | 2 +- mod/forum/templates/inpage_reply_v2.mustache | 2 +- .../local/grader/grade_placeholder.mustache | 126 ++++---- .../grades/local/grader/grading.mustache | 2 +- .../module_content_placeholder.mustache | 32 +- .../grades/local/grader/navigation.mustache | 12 +- .../local/grader/status_placeholder.mustache | 2 +- .../grades/local/grader/user_picker.mustache | 4 +- .../local/grader/user_picker/user.mustache | 2 +- .../grader/user_picker_placeholder.mustache | 6 +- .../local/grades/view_grade.mustache | 8 +- mod/forum/templates/settings_header.mustache | 2 +- mod/glossary/editcategories.html | 2 +- .../templates/standard_action_menu.mustache | 2 +- mod/lesson/locallib.php | 2 +- mod/lesson/renderer.php | 6 +- .../local/entities/tool_types.php | 2 +- mod/lti/mod_form.php | 2 +- .../build/modal_add_random_question.min.js | 2 +- .../modal_add_random_question.min.js.map | 2 +- mod/quiz/amd/src/modal_add_random_question.js | 2 +- .../local/reports/attempts_report_table.php | 2 +- mod/quiz/classes/output/edit_renderer.php | 8 +- mod/quiz/mod_form.php | 2 +- mod/quiz/report/overview/overview_table.php | 2 +- .../add_random_question_form.mustache | 8 +- mod/quiz/templates/list_of_attempts.mustache | 2 +- mod/quiz/templates/question_slot.mustache | 2 +- mod/quiz/templates/timer.mustache | 4 +- mod/scorm/locallib.php | 4 +- mod/scorm/templates/report_actionbar.mustache | 2 +- .../templates/user_report_actionbar.mustache | 2 +- .../templates/response_action_bar.mustache | 2 +- mod/wiki/pagelib.php | 2 +- mod/wiki/templates/action_bar.mustache | 2 +- mod/workshop/submission.php | 6 +- mod/workshop/switchphase.php | 2 +- .../classes/output/column_sort_ui.php | 2 +- .../templates/action_handle.mustache | 2 +- .../templates/add_column.mustache | 2 +- .../templates/reset_columns.mustache | 2 +- .../comment/classes/comment_count_column.php | 2 +- .../classes/custom_field_column.php | 2 +- .../hidden_condition_advanced.mustache | 2 +- .../classes/question_status_column.php | 2 +- .../history/classes/version_number_column.php | 2 +- .../classes/category_condition.php | 2 +- .../templates/category_condition.mustache | 4 +- .../category_condition_advanced.mustache | 2 +- .../include_subcategories_checkbox.mustache | 4 +- .../templates/preview_question.mustache | 16 +- .../classes/columns/discrimination_index.php | 2 +- .../columns/discriminative_efficiency.php | 2 +- .../classes/columns/facility_index.php | 2 +- .../classes/question_last_used_column.php | 2 +- .../usage/classes/question_usage_column.php | 2 +- .../classes/creator_name_column.php | 2 +- .../classes/modifier_name_column.php | 2 +- .../question_name_idnumber_tags_column.php | 6 +- .../templates/question_text_format.mustache | 2 +- .../classes/local/bank/edit_menu_column.php | 2 +- question/templates/column_header.mustache | 10 +- question/templates/qbank_action_menu.mustache | 2 +- question/type/match/renderer.php | 2 +- question/type/multichoice/renderer.php | 6 +- question/type/truefalse/renderer.php | 4 +- report/log/classes/renderer.php | 22 +- report/outline/templates/activity.mustache | 2 +- .../templates/delegatedsection.mustache | 2 +- report/participation/locallib.php | 2 +- report/progress/classes/output/renderer.php | 6 +- reportbuilder/classes/form/condition.php | 2 +- reportbuilder/classes/form/filter.php | 2 +- reportbuilder/classes/output/renderer.php | 2 +- .../templates/editor_navbar.mustache | 4 +- .../templates/local/audience/form.mustache | 6 +- .../local/conditions/header.mustache | 2 +- .../local/dynamictabs/schedules.mustache | 2 +- .../templates/local/filters/area.mustache | 2 +- .../templates/local/settings/area.mustache | 2 +- .../templates/local/settings/filters.mustache | 4 +- .../templates/local/settings/sorting.mustache | 4 +- .../local/sidebar-menu/area.mustache | 4 +- .../local/sidebar-menu/card_item.mustache | 4 +- .../templates/table_header_cell.mustache | 2 +- reportbuilder/templates/toggle_card.mustache | 6 +- theme/boost/scss/moodle/bs5-bridge.scss | 28 ++ theme/boost/style/moodle.css | 300 +++++++++--------- .../templates/custom_menu_footer.mustache | 2 +- theme/boost/templates/drawers.mustache | 2 +- .../boost/templates/flat_navigation.mustache | 8 +- theme/boost/templates/language_menu.mustache | 4 +- theme/boost/templates/navbar-secure.mustache | 4 +- theme/boost/templates/navbar.mustache | 6 +- .../templates/primary-drawer-mobile.mustache | 6 +- theme/classic/style/moodle.css | 300 +++++++++--------- .../templates/core/full_header.mustache | 6 +- .../classic/templates/core/user_menu.mustache | 4 +- .../classic/templates/navbar-secure.mustache | 2 +- theme/classic/templates/navbar.mustache | 4 +- user/filters/date.php | 4 +- user/index.php | 2 +- user/lib.php | 2 +- user/profile/index.php | 2 +- user/selector/lib.php | 8 +- user/templates/add_bulk_note.mustache | 2 +- .../comboboxsearch/resultitem.mustache | 2 +- .../comboboxsearch/user_selector.mustache | 2 +- ...ontact_site_support_not_available.mustache | 2 +- .../form_user_selector_searchtype.mustache | 4 +- 440 files changed, 1345 insertions(+), 1317 deletions(-) diff --git a/admin/classes/reportbuilder/local/systemreports/users.php b/admin/classes/reportbuilder/local/systemreports/users.php index cbf9868f145..c789a40da18 100644 --- a/admin/classes/reportbuilder/local/systemreports/users.php +++ b/admin/classes/reportbuilder/local/systemreports/users.php @@ -159,11 +159,11 @@ class users extends system_report { ->add_callback(static function(string $fullname, \stdClass $row): string { if ($row->suspended) { $fullname .= ' ' . \html_writer::tag('span', get_string('suspended', 'moodle'), - ['class' => 'badge badge-secondary ml-1']); + ['class' => 'badge badge-secondary ms-1']); } if (!$row->confirmed) { $fullname .= ' ' . \html_writer::tag('span', get_string('confirmationpending', 'admin'), - ['class' => 'badge badge-danger ml-1']); + ['class' => 'badge badge-danger ms-1']); } return $fullname; }); diff --git a/admin/renderer.php b/admin/renderer.php index 6e53a42ad2e..62b4538c896 100644 --- a/admin/renderer.php +++ b/admin/renderer.php @@ -1241,7 +1241,7 @@ class core_admin_renderer extends plugin_renderer_base { new moodle_url($this->page->url, array('installupdatex' => 1)), get_string('updateavailableinstallall', 'core_admin', count($installableupdates)), 'post', - array('class' => 'singlebutton updateavailableinstallall mr-1') + array('class' => 'singlebutton updateavailableinstallall me-1') ); } @@ -1250,7 +1250,7 @@ class core_admin_renderer extends plugin_renderer_base { new moodle_url($this->page->url, array('abortinstallx' => 1, 'confirmplugincheck' => 0)), get_string('cancelinstallall', 'core_plugin', count($installabortable)), 'post', - array('class' => 'singlebutton cancelinstallall mr-1') + array('class' => 'singlebutton cancelinstallall me-1') ); } @@ -1259,17 +1259,17 @@ class core_admin_renderer extends plugin_renderer_base { new moodle_url($this->page->url, array('abortupgradex' => 1)), get_string('cancelupgradeall', 'core_plugin', count($upgradeabortable)), 'post', - array('class' => 'singlebutton cancelupgradeall mr-1') + array('class' => 'singlebutton cancelupgradeall me-1') ); } $out .= html_writer::div(html_writer::link(new moodle_url($this->page->url, array('showallplugins' => 0)), get_string('plugincheckattention', 'core_plugin')).' '.html_writer::span($sumattention, 'badge bg-light text-dark'), - 'btn btn-link mr-1'); + 'btn btn-link me-1'); $out .= html_writer::div(html_writer::link(new moodle_url($this->page->url, array('showallplugins' => 1)), get_string('plugincheckall', 'core_plugin')).' '.html_writer::span($sumtotal, 'badge bg-light text-dark'), - 'btn btn-link mr-1'); + 'btn btn-link me-1'); $out .= $this->output->container_end(); // End of .actions container. $out .= $this->output->container_end(); // End of #plugins-check-info container. @@ -1376,13 +1376,13 @@ class core_admin_renderer extends plugin_renderer_base { new moodle_url($this->page->url, array('installdepx' => 1)), get_string('dependencyinstallmissing', 'core_plugin', count($installable)), 'post', - array('class' => 'singlebutton dependencyinstallmissing d-inline-block mr-1') + array('class' => 'singlebutton dependencyinstallmissing d-inline-block me-1') ); } $out .= html_writer::div(html_writer::link(new moodle_url('/admin/tool/installaddon/'), get_string('dependencyuploadmissing', 'core_plugin'), array('class' => 'btn btn-link')), - 'dependencyuploadmissing d-inline-block mr-1'); + 'dependencyuploadmissing d-inline-block me-1'); $out .= $this->output->container_end(); // End of .plugins-check-dependencies-actions container. @@ -1448,29 +1448,29 @@ class core_admin_renderer extends plugin_renderer_base { $info .= html_writer::div( html_writer::link('https://moodle.org/plugins/view.php?plugin='.$plugin->component, get_string('misdepinfoplugin', 'core_plugin')), - 'misdepinfoplugin d-inline-block mr-3 mb-1' + 'misdepinfoplugin d-inline-block me-3 mb-1' ); $info .= html_writer::div( html_writer::link('https://moodle.org/plugins/pluginversion.php?id='.$plugin->version->id, get_string('misdepinfoversion', 'core_plugin')), - 'misdepinfoversion d-inline-block mr-3 mb-1' + 'misdepinfoversion d-inline-block me-3 mb-1' ); $info .= html_writer::div(html_writer::link($plugin->version->downloadurl, get_string('download')), - 'misdepdownload d-inline-block mr-3 mb-1'); + 'misdepdownload d-inline-block me-3 mb-1'); if ($pluginman->is_remote_plugin_installable($plugin->component, $plugin->version->version, $reason)) { $info .= $this->output->single_button( new moodle_url($this->page->url, array('installdep' => $plugin->component)), get_string('dependencyinstall', 'core_plugin'), 'post', - array('class' => 'singlebutton dependencyinstall mr-3 mb-1') + array('class' => 'singlebutton dependencyinstall me-3 mb-1') ); } else { $reasonhelp = $this->info_remote_plugin_not_installable($reason); if ($reasonhelp) { - $info .= html_writer::div($reasonhelp, 'reasonhelp dependencyinstall d-inline-block mr-3 mb-1'); + $info .= html_writer::div($reasonhelp, 'reasonhelp dependencyinstall d-inline-block me-3 mb-1'); } } diff --git a/admin/roles/override.php b/admin/roles/override.php index f9d97a3fcbf..580b868d5cd 100644 --- a/admin/roles/override.php +++ b/admin/roles/override.php @@ -165,7 +165,7 @@ if (!empty($capabilities)) { $attrs = array('type'=>'submit', 'name'=>'savechanges', 'value'=>get_string('savechanges'), 'class'=>'btn btn-primary'); echo html_writer::empty_tag('input', $attrs); $attrs = array('type' => 'submit', 'name' => 'cancel', 'value' => get_string('cancel'), - 'class' => 'btn btn-secondary ml-1'); + 'class' => 'btn btn-secondary ms-1'); echo html_writer::empty_tag('input', $attrs); echo html_writer::end_tag('div'); echo html_writer::end_tag('div'); diff --git a/admin/templates/themeselector/theme_card.mustache b/admin/templates/themeselector/theme_card.mustache index 82d9cc52657..34e69d08e8e 100644 --- a/admin/templates/themeselector/theme_card.mustache +++ b/admin/templates/themeselector/theme_card.mustache @@ -58,7 +58,7 @@ {{#str}}themeusagereportname, admin, {{name}}{{/str}} @@ -68,7 +68,7 @@ {{#str}}themeeditsettingsname, admin, {{name}}{{/str}} diff --git a/admin/templates/webservice_token_new.mustache b/admin/templates/webservice_token_new.mustache index a063b651d8e..a7ac6d88767 100644 --- a/admin/templates/webservice_token_new.mustache +++ b/admin/templates/webservice_token_new.mustache @@ -36,7 +36,7 @@
{{tokenname}}
{{token}}
-
diff --git a/admin/tool/analytics/templates/export_options.mustache b/admin/tool/analytics/templates/export_options.mustache index c05550d7961..460ffb40b18 100644 --- a/admin/tool/analytics/templates/export_options.mustache +++ b/admin/tool/analytics/templates/export_options.mustache @@ -39,7 +39,7 @@ -
+
diff --git a/admin/tool/componentlibrary/content/bootstrap/components/button-group.md b/admin/tool/componentlibrary/content/bootstrap/components/button-group.md index 0e72b1fb72e..0c7622a64de 100644 --- a/admin/tool/componentlibrary/content/bootstrap/components/button-group.md +++ b/admin/tool/componentlibrary/content/bootstrap/components/button-group.md @@ -32,13 +32,13 @@ Combine sets of button groups into button toolbars for more complex components. {{< example >}}