diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-04-16 11:36:48 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-04-16 11:36:48 +0400 |
| commit | 1c725621a5a18cb1db0d1decea342d3ac09ccbb0 (patch) | |
| tree | 96810e50b630e2977740cef092666ad622fe9c9e | |
| parent | 328973b548f466e2106972fe910ce67d75de63cf (diff) | |
rake convert
| -rw-r--r-- | lib/bootstrap-sass/version.rb | 2 | ||||
| -rw-r--r-- | vendor/assets/javascripts/bootstrap/collapse.js | 12 | ||||
| -rw-r--r-- | vendor/assets/stylesheets/bootstrap/_variables.scss | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index e16bc3ef..b93b856d 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '3.1.1.0' - BOOTSTRAP_SHA = 'ee2df11e93c88dff946560d81fd5e2d8fbdd61d4' + BOOTSTRAP_SHA = 'd08f7dd80711f6096f9d2f413ed2933f9d6dd2bf' end diff --git a/vendor/assets/javascripts/bootstrap/collapse.js b/vendor/assets/javascripts/bootstrap/collapse.js index 6f2205b6..42563c08 100644 --- a/vendor/assets/javascripts/bootstrap/collapse.js +++ b/vendor/assets/javascripts/bootstrap/collapse.js @@ -56,7 +56,11 @@ this.transitioning = 1 var complete = function (e) { - if (e && e.target != this.$element[0]) return + if (e && e.target != this.$element[0]) { + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + return + } this.$element .removeClass('collapsing') .addClass('collapse in')[dimension]('auto') @@ -92,7 +96,11 @@ this.transitioning = 1 var complete = function (e) { - if (e && e.target != this.$element[0]) return + if (e && e.target != this.$element[0]) { + this.$element + .one($.support.transition.end, $.proxy(complete, this)) + return + } this.transitioning = 0 this.$element .trigger('hidden.bs.collapse') diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss index 435f1869..98af6798 100644 --- a/vendor/assets/stylesheets/bootstrap/_variables.scss +++ b/vendor/assets/stylesheets/bootstrap/_variables.scss @@ -253,8 +253,8 @@ $dropdown-caret-color: #000 !default; $zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; -$zindex-popover: 1060 !default; // $fix #13216 -$zindex-tooltip: 1070 !default; // $fix #13216 +$zindex-popover: 1060 !default; +$zindex-tooltip: 1070 !default; $zindex-navbar-fixed: 1030 !default; $zindex-modal-background: 1040 !default; $zindex-modal: 1050 !default; |