Merge branch 'MDL-61894-master' of https://github.com/lucaboesch/moodle

moodle · Jun 19, 2018 · ec4d05c · ec4d05c
2 parents fca5c2d + e691488
commit ec4d05c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/amd/build/tag.min.js b/lib/amd/build/tag.min.js
diff --git a/lib/amd/src/tag.js b/lib/amd/src/tag.js
@@ -150,8 +150,8 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                 ]).done(function(s) {
                     var el = $('<div><form id="combinetags_form" class="form-inline">' +
                         '<p class="description"></p><p class="options"></p>' +
-                        '<p class="mdl-align"><input type="submit" id="combinetags_submit"/>' +
-                        '<input type="button" id="combinetags_cancel"/></p>' +
+                        '<p class="mdl-align"><input type="submit" class="btn btn-primary" id="combinetags_submit"/>' +
+                        '<input type="button" class="btn btn-secondary" id="combinetags_cancel"/></p>' +
                         '</form></div>');
                     el.find('.description').html(s[1]);
                     el.find('#combinetags_submit').attr('value', s[2]);
@@ -223,8 +223,8 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                         '<input type="hidden" name="sesskey" value="' + M.cfg.sesskey + '"/>' +
                         '<p><label for="id_tagslist">' + s[1] + '</label>' +
                         '<input type="text" id="id_tagslist" name="tagslist"/></p>' +
-                        '<p class="mdl-align"><input type="submit" id="addtags_submit"/>' +
-                        '<input type="button" id="addtags_cancel"/></p>' +
+                        '<p class="mdl-align"><input type="submit" class="btn btn-primary" id="addtags_submit"/>' +
+                        '<input type="button" class="btn btn-secondary" id="addtags_cancel"/></p>' +
                         '</form></div>');
                     el.find('#addtags_form').attr('action', window.location.href);
                     el.find('#addtags_submit').attr('value', s[2]);
@@ -295,8 +295,8 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                             '<input id="addtagcoll_name" type="text"/></p>' +
                             '<p><label for="addtagcoll_searchable"></label>: ' +
                             '<input id="addtagcoll_searchable" type="checkbox" value="1" checked/></p>' +
-                            '<p class="mdl-align"><input type="submit" id="addtagcoll_submit"/>' +
-                            '<input type="button" id="addtagcoll_cancel"/></p>' +
+                            '<p class="mdl-align"><input type="submit" class="btn btn-primary" id="addtagcoll_submit"/>' +
+                            '<input type="button" class="btn btn-secondary" id="addtagcoll_cancel"/></p>' +
                             '</form></div>');
                         el.find('label[for="addtagcoll_name"]').html(s[1]);
                         el.find('label[for="addtagcoll_searchable"]').html(s[2]);