Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/gregbell/active_admin into …

…edge
  • Loading branch information...
commit a335338d0a7f19434667b8aeaaac45e46d7801ee 2 parents 28822d4 + b1dc4f2
@macfanatic authored
View
1  .gitignore
@@ -34,3 +34,4 @@ public
.rvmrc
.rspec
.rails-version
+.rbenv-version
View
1  docs/0-installation.md
@@ -12,7 +12,6 @@ MetaSearch and sass-rails:
# Gemfile in Rails >= 3.1
gem 'activeadmin'
gem 'sass-rails'
- gem "meta_search", '>= 1.1.0.pre'
## Running the Generator
View
2  lib/active_admin/application.rb
@@ -225,7 +225,7 @@ def dashboard_section(name, options = {}, &block)
def register_default_assets
register_stylesheet 'active_admin.css', :media => 'screen'
- register_stylesheet 'print.css', :media => 'print'
+ register_stylesheet 'active_admin/print.css', :media => 'print'
if !ActiveAdmin.use_asset_pipeline?
register_javascript 'jquery.min.js'
View
2  lib/active_admin/engine.rb
@@ -2,7 +2,7 @@ module ActiveAdmin
class Engine < Rails::Engine
if Rails.version > "3.1"
initializer "ActiveAdmin precompile hook" do |app|
- app.config.assets.precompile += ['active_admin.js', 'active_admin.css']
+ app.config.assets.precompile += ['active_admin.js', 'active_admin.css', 'active_admin/print.css']
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.