Skip to content

Commit 969d649

Browse files
author
David Monllao
committed
Merge branch 'MDL-62160-master' of git://github.com/bmbrands/moodle
2 parents e06a28b + e58362e commit 969d649

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

lib/yui/build/moodle-core-notification-confirm/moodle-core-notification-confirm-debug.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ Y.extend(CONFIRM, M.core.notification.info, {
9393
this.publish('complete');
9494
this.publish('complete-yes');
9595
this.publish('complete-no');
96-
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary m-r-1" id="id_yuiconfirmyes-' +
96+
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary" id="id_yuiconfirmyes-' +
9797
this.get('COUNT') + '" value="' + this.get(CONFIRMYES) + '" />');
98-
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary m-r-1" id="id_yuiconfirmno-' +
98+
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary" id="id_yuiconfirmno-' +
9999
this.get('COUNT') + '" value="' + this.get(CONFIRMNO) + '" />');
100100
this._question = Y.Node.create('<div class="confirmation-message">' + this.get(QUESTION) + '</div>');
101101
var content = Y.Node.create('<div class="confirmation-dialogue"></div>')
102102
.append(this._question)
103-
.append(Y.Node.create('<div class="confirmation-buttons form-inline"></div>')
103+
.append(Y.Node.create('<div class="confirmation-buttons form-inline justify-content-around"></div>')
104104
.append(this._yesButton)
105105
.append(this._noButton));
106106
this.get(BASE).addClass('moodle-dialogue-confirm');

lib/yui/build/moodle-core-notification-confirm/moodle-core-notification-confirm-min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/yui/build/moodle-core-notification-confirm/moodle-core-notification-confirm.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ Y.extend(CONFIRM, M.core.notification.info, {
9393
this.publish('complete');
9494
this.publish('complete-yes');
9595
this.publish('complete-no');
96-
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary m-r-1" id="id_yuiconfirmyes-' +
96+
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary" id="id_yuiconfirmyes-' +
9797
this.get('COUNT') + '" value="' + this.get(CONFIRMYES) + '" />');
98-
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary m-r-1" id="id_yuiconfirmno-' +
98+
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary" id="id_yuiconfirmno-' +
9999
this.get('COUNT') + '" value="' + this.get(CONFIRMNO) + '" />');
100100
this._question = Y.Node.create('<div class="confirmation-message">' + this.get(QUESTION) + '</div>');
101101
var content = Y.Node.create('<div class="confirmation-dialogue"></div>')
102102
.append(this._question)
103-
.append(Y.Node.create('<div class="confirmation-buttons form-inline"></div>')
103+
.append(Y.Node.create('<div class="confirmation-buttons form-inline justify-content-around"></div>')
104104
.append(this._yesButton)
105105
.append(this._noButton));
106106
this.get(BASE).addClass('moodle-dialogue-confirm');

lib/yui/src/notification/js/confirm.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ Y.extend(CONFIRM, M.core.notification.info, {
6363
this.publish('complete');
6464
this.publish('complete-yes');
6565
this.publish('complete-no');
66-
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary m-r-1" id="id_yuiconfirmyes-' +
66+
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary" id="id_yuiconfirmyes-' +
6767
this.get('COUNT') + '" value="' + this.get(CONFIRMYES) + '" />');
68-
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary m-r-1" id="id_yuiconfirmno-' +
68+
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary" id="id_yuiconfirmno-' +
6969
this.get('COUNT') + '" value="' + this.get(CONFIRMNO) + '" />');
7070
this._question = Y.Node.create('<div class="confirmation-message">' + this.get(QUESTION) + '</div>');
7171
var content = Y.Node.create('<div class="confirmation-dialogue"></div>')
7272
.append(this._question)
73-
.append(Y.Node.create('<div class="confirmation-buttons form-inline"></div>')
73+
.append(Y.Node.create('<div class="confirmation-buttons form-inline justify-content-around"></div>')
7474
.append(this._yesButton)
7575
.append(this._noButton));
7676
this.get(BASE).addClass('moodle-dialogue-confirm');

theme/boost/scss/moodle/core.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,9 +1241,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
12411241
.moodle-dialogue-confirm .confirmation-message {
12421242
margin: 0.5rem 0;
12431243
}
1244-
.moodle-dialogue-confirm .confirmation-buttons {
1245-
text-align: right;
1246-
}
12471244

12481245
.moodle-dialogue-confirm .confirmation-dialogue input {
12491246
min-width: 80px;

0 commit comments

Comments
 (0)