From f61942b0734bd4ab7b0cad755836b1b37fdafbb0 Mon Sep 17 00:00:00 2001 From: Claudius Nicolae Date: Thu, 14 Mar 2013 23:23:42 +0200 Subject: [PATCH] fix menu logout dropdown --- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- app/assets/javascripts/components/behaviors.js.coffee | 9 --------- app/assets/stylesheets/bootstrap-custom.css.scss | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 83f819d..a71fa46 100644 --- a/Gemfile +++ b/Gemfile @@ -39,9 +39,9 @@ gem 'audited-activerecord', '~> 3.0' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', " ~> 3.2.3" + gem 'sass-rails', '~> 3.2.3' gem 'compass-rails', '~> 1.0.3' - gem 'bootstrap-sass', '~> 2.2.0' + gem 'bootstrap-sass', '~> 2.3.0.1' gem 'font-awesome-sass-rails', '~> 3.0.0' gem 'webshims-rails', '~> 0.4.7' gem 'detect_timezone_rails', '~> 0.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index 94bf16c..5fd7918 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM activerecord (~> 3.0) audited (= 3.0.0) bcrypt-ruby (3.0.1) - bootstrap-sass (2.2.2.0) + bootstrap-sass (2.3.0.1) sass (~> 3.2) builder (3.0.4) cancan (1.6.7) @@ -373,7 +373,7 @@ DEPENDENCIES active_scaffold (~> 3.2.19) acts_as_nested_interval (~> 0.0.7) audited-activerecord (~> 3.0) - bootstrap-sass (~> 2.2.0) + bootstrap-sass (~> 2.3.0.1) cancan (= 1.6.7) capistrano (~> 2.9.0) capistrano-ext (~> 1.2.1) diff --git a/app/assets/javascripts/components/behaviors.js.coffee b/app/assets/javascripts/components/behaviors.js.coffee index f38b87e..56a1b18 100644 --- a/app/assets/javascripts/components/behaviors.js.coffee +++ b/app/assets/javascripts/components/behaviors.js.coffee @@ -1,12 +1,3 @@ $ -> $(document).tooltip(selector: '[rel=tooltip]') $(document).popover(selector: '[rel=popover]', trigger: 'hover') - - # fix for Turbolinks with Bootstrap - # https://github.com/rails/turbolinks/issues/16 - proto = $.fn.dropdown.Constructor.prototype - toggle = '[data-toggle=dropdown]' - $(document) - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', (e) -> e.stopPropagation()) - .on('click.dropdown.data-api touchstart.dropdown.data-api', toggle, proto.toggle) - .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]', proto.keydown) diff --git a/app/assets/stylesheets/bootstrap-custom.css.scss b/app/assets/stylesheets/bootstrap-custom.css.scss index 809f073..424f9db 100644 --- a/app/assets/stylesheets/bootstrap-custom.css.scss +++ b/app/assets/stylesheets/bootstrap-custom.css.scss @@ -2,7 +2,7 @@ // Remove icons since we use font-awesome // // -// Bootstrap v2.1.0 +// Bootstrap v2.3.0 // // Copyright 2012 Twitter, Inc // Licensed under the Apache License v2.0