Merge branch 'MDL-72822' of https://github.com/roland04/moodle

moodle · Dec 1, 2021 · 3ae9f4c · 3ae9f4c
2 parents d5698ac + 08d31c6
commit 3ae9f4c
Show file tree

Hide file tree

Showing 43 changed files with 148 additions and 86 deletions.
diff --git a/lib/templates/dynamic_tabs.mustache b/lib/templates/dynamic_tabs.mustache
@@ -48,7 +48,7 @@
     {{#showtabsnavigation}}
         <ul class="nav nav-tabs mb-4" id="dynamictabs-tabs" role="tablist">
             {{#tabs}}
-                <li class="nav-item">
+                <li class="nav-item" role="presentation">
                     <a class="nav-link {{#active}}active{{/active}} {{^enabled}}disabled{{/enabled}}" id="{{shortname}}-tab" data-toggle="tab" href="#{{shortname}}" role="tab" aria-controls="{{shortname}}">
                         {{{displayname}}}
                     </a>

diff --git a/reportbuilder/amd/build/local/editor/columns.min.js b/reportbuilder/amd/build/local/editor/columns.min.js