Browse Source

fix menu logout dropdown

pull/1/head
Claudius Nicolae 12 years ago
parent
commit
f61942b073
  1. 4
      Gemfile
  2. 4
      Gemfile.lock
  3. 9
      app/assets/javascripts/components/behaviors.js.coffee
  4. 2
      app/assets/stylesheets/bootstrap-custom.css.scss

4
Gemfile

@ -39,9 +39,9 @@ gem 'audited-activerecord', '~> 3.0'
# Gems used only for assets and not required # Gems used only for assets and not required
# in production environments by default. # in production environments by default.
group :assets do group :assets do
gem 'sass-rails', " ~> 3.2.3" gem 'sass-rails', '~> 3.2.3'
gem 'compass-rails', '~> 1.0.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 'font-awesome-sass-rails', '~> 3.0.0'
gem 'webshims-rails', '~> 0.4.7' gem 'webshims-rails', '~> 0.4.7'
gem 'detect_timezone_rails', '~> 0.0.3' gem 'detect_timezone_rails', '~> 0.0.3'

4
Gemfile.lock

@ -70,7 +70,7 @@ GEM
activerecord (~> 3.0) activerecord (~> 3.0)
audited (= 3.0.0) audited (= 3.0.0)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
bootstrap-sass (2.2.2.0) bootstrap-sass (2.3.0.1)
sass (~> 3.2) sass (~> 3.2)
builder (3.0.4) builder (3.0.4)
cancan (1.6.7) cancan (1.6.7)
@ -373,7 +373,7 @@ DEPENDENCIES
active_scaffold (~> 3.2.19) active_scaffold (~> 3.2.19)
acts_as_nested_interval (~> 0.0.7) acts_as_nested_interval (~> 0.0.7)
audited-activerecord (~> 3.0) audited-activerecord (~> 3.0)
bootstrap-sass (~> 2.2.0) bootstrap-sass (~> 2.3.0.1)
cancan (= 1.6.7) cancan (= 1.6.7)
capistrano (~> 2.9.0) capistrano (~> 2.9.0)
capistrano-ext (~> 1.2.1) capistrano-ext (~> 1.2.1)

9
app/assets/javascripts/components/behaviors.js.coffee

@ -1,12 +1,3 @@
$ -> $ ->
$(document).tooltip(selector: '[rel=tooltip]') $(document).tooltip(selector: '[rel=tooltip]')
$(document).popover(selector: '[rel=popover]', trigger: 'hover') $(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)

2
app/assets/stylesheets/bootstrap-custom.css.scss

@ -2,7 +2,7 @@
// Remove icons since we use font-awesome // Remove icons since we use font-awesome
// //
// //
// Bootstrap v2.1.0 // Bootstrap v2.3.0
// //
// Copyright 2012 Twitter, Inc // Copyright 2012 Twitter, Inc
// Licensed under the Apache License v2.0 // Licensed under the Apache License v2.0

Loading…
Cancel
Save