Skip to content

Commit

Permalink
Merge branch 'MDL-62160-master' of git://github.com/bmbrands/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
David Monllao committed Apr 25, 2018
2 parents e06a28b + e58362e commit 969d649
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
6 changes: 3 additions & 3 deletions lib/yui/build/moodle-core-notification-confirm/moodle-core-notification-confirm-debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ Y.extend(CONFIRM, M.core.notification.info, {
this.publish('complete');
this.publish('complete-yes');
this.publish('complete-no');
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary m-r-1" id="id_yuiconfirmyes-' +
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary" id="id_yuiconfirmyes-' +
this.get('COUNT') + '" value="' + this.get(CONFIRMYES) + '" />');
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary m-r-1" id="id_yuiconfirmno-' +
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary" id="id_yuiconfirmno-' +
this.get('COUNT') + '" value="' + this.get(CONFIRMNO) + '" />');
this._question = Y.Node.create('<div class="confirmation-message">' + this.get(QUESTION) + '</div>');
var content = Y.Node.create('<div class="confirmation-dialogue"></div>')
.append(this._question)
.append(Y.Node.create('<div class="confirmation-buttons form-inline"></div>')
.append(Y.Node.create('<div class="confirmation-buttons form-inline justify-content-around"></div>')
.append(this._yesButton)
.append(this._noButton));
this.get(BASE).addClass('moodle-dialogue-confirm');
Expand Down
2 changes: 1 addition & 1 deletion lib/yui/build/moodle-core-notification-confirm/moodle-core-notification-confirm-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/yui/build/moodle-core-notification-confirm/moodle-core-notification-confirm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ Y.extend(CONFIRM, M.core.notification.info, {
this.publish('complete');
this.publish('complete-yes');
this.publish('complete-no');
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary m-r-1" id="id_yuiconfirmyes-' +
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary" id="id_yuiconfirmyes-' +
this.get('COUNT') + '" value="' + this.get(CONFIRMYES) + '" />');
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary m-r-1" id="id_yuiconfirmno-' +
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary" id="id_yuiconfirmno-' +
this.get('COUNT') + '" value="' + this.get(CONFIRMNO) + '" />');
this._question = Y.Node.create('<div class="confirmation-message">' + this.get(QUESTION) + '</div>');
var content = Y.Node.create('<div class="confirmation-dialogue"></div>')
.append(this._question)
.append(Y.Node.create('<div class="confirmation-buttons form-inline"></div>')
.append(Y.Node.create('<div class="confirmation-buttons form-inline justify-content-around"></div>')
.append(this._yesButton)
.append(this._noButton));
this.get(BASE).addClass('moodle-dialogue-confirm');
Expand Down
6 changes: 3 additions & 3 deletions lib/yui/src/notification/js/confirm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ Y.extend(CONFIRM, M.core.notification.info, {
this.publish('complete');
this.publish('complete-yes');
this.publish('complete-no');
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary m-r-1" id="id_yuiconfirmyes-' +
this._yesButton = Y.Node.create('<input type="button" class="btn btn-primary" id="id_yuiconfirmyes-' +
this.get('COUNT') + '" value="' + this.get(CONFIRMYES) + '" />');
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary m-r-1" id="id_yuiconfirmno-' +
this._noButton = Y.Node.create('<input type="button" class="btn btn-secondary" id="id_yuiconfirmno-' +
this.get('COUNT') + '" value="' + this.get(CONFIRMNO) + '" />');
this._question = Y.Node.create('<div class="confirmation-message">' + this.get(QUESTION) + '</div>');
var content = Y.Node.create('<div class="confirmation-dialogue"></div>')
.append(this._question)
.append(Y.Node.create('<div class="confirmation-buttons form-inline"></div>')
.append(Y.Node.create('<div class="confirmation-buttons form-inline justify-content-around"></div>')
.append(this._yesButton)
.append(this._noButton));
this.get(BASE).addClass('moodle-dialogue-confirm');
Expand Down
3 changes: 0 additions & 3 deletions theme/boost/scss/moodle/core.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1241,9 +1241,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
.moodle-dialogue-confirm .confirmation-message {
margin: 0.5rem 0;
}
.moodle-dialogue-confirm .confirmation-buttons {
text-align: right;
}

.moodle-dialogue-confirm .confirmation-dialogue input {
min-width: 80px;
Expand Down

0 comments on commit 969d649

Please sign in to comment.