mirror of https://github.com/twbs/bootstrap.git
grunt dist
This commit is contained in:
parent
91607900c0
commit
cb2ef1eff4
|
@ -6565,10 +6565,10 @@ button.close {
|
||||||
-webkit-transition: -webkit-transform .3s ease-out;
|
-webkit-transition: -webkit-transform .3s ease-out;
|
||||||
-o-transition: -o-transform .3s ease-out;
|
-o-transition: -o-transform .3s ease-out;
|
||||||
transition: transform .3s ease-out;
|
transition: transform .3s ease-out;
|
||||||
-webkit-transform: translate(0, -25%);
|
-webkit-transform: translate(0, -25%);
|
||||||
-ms-transform: translate(0, -25%);
|
-ms-transform: translate(0, -25%);
|
||||||
-o-transform: translate(0, -25%);
|
-o-transform: translate(0, -25%);
|
||||||
transform: translate(0, -25%);
|
transform: translate(0, -25%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal.in .modal-dialog {
|
.modal.in .modal-dialog {
|
||||||
|
|
|
@ -5299,10 +5299,10 @@ button.close {
|
||||||
-webkit-transition: -webkit-transform .3s ease-out;
|
-webkit-transition: -webkit-transform .3s ease-out;
|
||||||
-o-transition: -o-transform .3s ease-out;
|
-o-transition: -o-transform .3s ease-out;
|
||||||
transition: transform .3s ease-out;
|
transition: transform .3s ease-out;
|
||||||
-webkit-transform: translate(0, -25%);
|
-webkit-transform: translate(0, -25%);
|
||||||
-ms-transform: translate(0, -25%);
|
-ms-transform: translate(0, -25%);
|
||||||
-o-transform: translate(0, -25%);
|
-o-transform: translate(0, -25%);
|
||||||
transform: translate(0, -25%);
|
transform: translate(0, -25%);
|
||||||
}
|
}
|
||||||
.modal.in .modal-dialog {
|
.modal.in .modal-dialog {
|
||||||
-webkit-transform: translate(0, 0);
|
-webkit-transform: translate(0, 0);
|
||||||
|
|
|
@ -99,7 +99,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
|
||||||
$parent.removeClass('in')
|
$parent.removeClass('in')
|
||||||
|
|
||||||
function removeElement() {
|
function removeElement() {
|
||||||
$parent.trigger('closed.bs.alert').remove()
|
// detach from parent, fire event then clean up data
|
||||||
|
$parent.detach().trigger('closed.bs.alert').remove()
|
||||||
}
|
}
|
||||||
|
|
||||||
$.support.transition && $parent.hasClass('fade') ?
|
$.support.transition && $parent.hasClass('fade') ?
|
||||||
|
@ -178,9 +179,9 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
|
||||||
|
|
||||||
state = state + 'Text'
|
state = state + 'Text'
|
||||||
|
|
||||||
if (!data.resetText) $el.data('resetText', $el[val]())
|
if (data.resetText == null) $el.data('resetText', $el[val]())
|
||||||
|
|
||||||
$el[val](data[state] || this.options[state])
|
$el[val](data[state] == null ? this.options[state] : data[state])
|
||||||
|
|
||||||
// push to event loop to allow forms to submit
|
// push to event loop to allow forms to submit
|
||||||
setTimeout($.proxy(function () {
|
setTimeout($.proxy(function () {
|
||||||
|
@ -1535,7 +1536,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
|
||||||
placement: 'right',
|
placement: 'right',
|
||||||
trigger: 'click',
|
trigger: 'click',
|
||||||
content: '',
|
content: '',
|
||||||
template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
|
template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue