Commit 510f4fe5 authored by Mark Otto's avatar Mark Otto
Browse files

Fixes #13478, reverts #10941

parent 91607900
Showing with 20 additions and 19 deletions
+20 -19
...@@ -6565,10 +6565,10 @@ button.close { ...@@ -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 { ...@@ -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);
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -99,7 +99,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -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 ...@@ -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 ...@@ -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>'
}) })
......
This diff is collapsed.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
// Import the fonts // Import the fonts
@font-face { @font-face {
font-family: 'Glyphicons Halflings'; font-family: 'Glyphicons Halflings';
src: ~"url('@{icon-font-path}@{icon-font-name}.eot')"; src: url('@{icon-font-path}@{icon-font-name}.eot');
src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')", src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')", url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')", url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
~"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')"; url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
} }
// Catchall baseclass // Catchall baseclass
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment