From 0d25afc31914c4d31a3129b1b1bc3d8fc254824b Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Mon, 21 Apr 2014 23:29:53 +0200 Subject: rake convert --- lib/bootstrap-sass/version.rb | 2 +- vendor/assets/javascripts/bootstrap/button.js | 2 +- vendor/assets/javascripts/bootstrap/collapse.js | 2 +- vendor/assets/javascripts/bootstrap/dropdown.js | 1 + vendor/assets/javascripts/bootstrap/modal.js | 10 +++++++--- vendor/assets/stylesheets/bootstrap/_variables.scss | 16 ++++++++++------ 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index 0283a0f9..7dca849d 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '3.1.1.1' - BOOTSTRAP_SHA = '573ad10a9dba52e4a6f059e63b667f4034ad2b39' + BOOTSTRAP_SHA = '9c4afc577253ada54d3ff27965e380a5c9f4e60e' end diff --git a/vendor/assets/javascripts/bootstrap/button.js b/vendor/assets/javascripts/bootstrap/button.js index f4d8d8b3..be3b769c 100644 --- a/vendor/assets/javascripts/bootstrap/button.js +++ b/vendor/assets/javascripts/bootstrap/button.js @@ -97,7 +97,7 @@ // BUTTON DATA-API // =============== - $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { + $(document).on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) { var $btn = $(e.target) if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') $btn.button('toggle') diff --git a/vendor/assets/javascripts/bootstrap/collapse.js b/vendor/assets/javascripts/bootstrap/collapse.js index 42563c08..266f3580 100644 --- a/vendor/assets/javascripts/bootstrap/collapse.js +++ b/vendor/assets/javascripts/bootstrap/collapse.js @@ -63,7 +63,7 @@ } this.$element .removeClass('collapsing') - .addClass('collapse in')[dimension]('auto') + .addClass('collapse in')[dimension]('') this.transitioning = 0 this.$element.trigger('shown.bs.collapse') } diff --git a/vendor/assets/javascripts/bootstrap/dropdown.js b/vendor/assets/javascripts/bootstrap/dropdown.js index 905ee397..dc75248e 100644 --- a/vendor/assets/javascripts/bootstrap/dropdown.js +++ b/vendor/assets/javascripts/bootstrap/dropdown.js @@ -83,6 +83,7 @@ } function clearMenus(e) { + if (e && e.which === 3) return $(backdrop).remove() $(toggle).each(function () { var $parent = getParent($(this)) diff --git a/vendor/assets/javascripts/bootstrap/modal.js b/vendor/assets/javascripts/bootstrap/modal.js index a5536372..cbca61ee 100644 --- a/vendor/assets/javascripts/bootstrap/modal.js +++ b/vendor/assets/javascripts/bootstrap/modal.js @@ -145,7 +145,6 @@ var that = this this.$element.hide() this.backdrop(function () { - that.removeBackdrop() that.$element.trigger('hidden.bs.modal') }) } @@ -156,6 +155,7 @@ } Modal.prototype.backdrop = function (callback) { + var that = this var animate = this.$element.hasClass('fade') ? 'fade' : '' if (this.isShown && this.options.backdrop) { @@ -186,11 +186,15 @@ } else if (!this.isShown && this.$backdrop) { this.$backdrop.removeClass('in') + var callbackRemove = function() { + that.removeBackdrop() + callback && callback() + } $.support.transition && this.$element.hasClass('fade') ? this.$backdrop - .one($.support.transition.end, callback) + .one($.support.transition.end, callbackRemove) .emulateTransitionEnd(150) : - callback() + callbackRemove() } else if (callback) { callback() diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss index 98af6798..4f4f3ac5 100644 --- a/vendor/assets/stylesheets/bootstrap/_variables.scss +++ b/vendor/assets/stylesheets/bootstrap/_variables.scss @@ -240,7 +240,7 @@ $dropdown-link-disabled-color: $gray-light !default; //** Text color for headers within dropdown menus. $dropdown-header-color: $gray-light !default; -// Note: Deprecated $dropdown-caret-color as of v3.1.0 +//** Deprecated `$dropdown-caret-color` as of v3.1.0 $dropdown-caret-color: #000 !default; @@ -265,28 +265,32 @@ $zindex-modal: 1050 !default; //## Define the breakpoints at which your layout will change, adapting to different screen sizes. // Extra small screen / phone -// Note: Deprecated $screen-xs and $screen-phone as of v3.0.1 -// Note: Deprecated $screen-xs-min as of v3.2.0 +//** Deprecated `$screen-xs` as of v3.0.1 $screen-xs: 480px !default; +//** Deprecated `$screen-xs-min` as of v3.2.0 $screen-xs-min: $screen-xs !default; +//** Deprecated `$screen-phone` as of v3.0.1 $screen-phone: $screen-xs-min !default; // Small screen / tablet -// Note: Deprecated $screen-sm and $screen-tablet as of v3.0.1 +//** Deprecated `$screen-sm` as of v3.0.1 $screen-sm: 768px !default; $screen-sm-min: $screen-sm !default; +//** Deprecated `$screen-tablet` as of v3.0.1 $screen-tablet: $screen-sm-min !default; // Medium screen / desktop -// Note: Deprecated $screen-md and $screen-desktop as of v3.0.1 +//** Deprecated `$screen-md` as of v3.0.1 $screen-md: 992px !default; $screen-md-min: $screen-md !default; +//** Deprecated `$screen-desktop` as of v3.0.1 $screen-desktop: $screen-md-min !default; // Large screen / wide desktop -// Note: Deprecated $screen-lg and $screen-lg-desktop as of v3.0.1 +//** Deprecated `$screen-lg` as of v3.0.1 $screen-lg: 1200px !default; $screen-lg-min: $screen-lg !default; +//** Deprecated `$screen-lg-desktop` as of v3.0.1 $screen-lg-desktop: $screen-lg-min !default; // So media queries don't overlap when required, provide a maximum -- cgit v1.2.3