Skip to content

Commit 5fd6dbc

Browse files
mattvaguegregbell
authored andcommitted
Lower bourbon required version, fix issue with alignment when no table tools exist
1 parent 3e87f0a commit 5fd6dbc

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require File.expand_path('../spec/support/detect_rails_version', __FILE__)
66

77
rails_version = ENV['RAILS'] || detect_rails_version || "3.1.0"
88
gem 'rails', rails_version
9-
gem 'bourbon', '1.0.4'
9+
gem 'bourbon', '~> 1.0.0'
1010

1111
case rails_version
1212
when /^3\.0/

activeadmin.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
1919

2020
s.add_dependency("rails", ">= 3.0.0")
2121
s.add_dependency("jquery-rails", ">= 1.0.0")
22-
s.add_dependency("bourbon", "1.0.4")
22+
s.add_dependency("bourbon", "~> 1.0.0")
2323
s.add_dependency("meta_search", ">= 0.9.2")
2424
s.add_dependency("devise", ">= 1.1.2")
2525
s.add_dependency("formtastic", ">= 2.0.0")

lib/active_admin/views/pages/index.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ def config
1515
# Render's the index configuration that was set in the
1616
# controller. Defaults to rendering the ActiveAdmin::Pages::Index::Table
1717
def main_content
18-
div :class => "table_tools" do
19-
build_scopes
20-
end
21-
18+
build_scopes
2219

2320
if collection.any?
2421
render_index
@@ -42,10 +39,11 @@ def build_download_format_links(formats = [:csv, :xml, :json])
4239
text_node [I18n.t('active_admin.download'), links].flatten.join(" ").html_safe
4340
end
4441

45-
4642
def build_scopes
4743
if active_admin_config.scopes.any?
48-
scopes_renderer active_admin_config.scopes
44+
div :class => "table_tools" do
45+
scopes_renderer active_admin_config.scopes
46+
end
4947
end
5048
end
5149

0 commit comments

Comments
 (0)