Merge remote-tracking branch 'Skookum/develop' into aa-110

README.md

@@ -18,6 +18,11 @@ As soon as ActiveAdmin 1.x is released to rubygems, I'll release the gem with no
 
 Previous version with support for Rails 3 is maintained in branch [support/0.6.x](https://github.com/fabn/activeadmin-globalize/tree/support/0.6.x)
 
+## Require Assets
+
+- active_admin.js: `//= require active_admin/active_admin_globalize.js`
+- active_admin.css: `*= require active_admin/active_admin_globalize`
+
 ## Your model
 
 ```ruby
@@ -68,7 +73,7 @@ form do |f|
 end
 
 # You can also set locales to show in tabs
-# For example we want to show English translation fields without tab, and want to show other languages within tabs 
+# For example we want to show English translation fields without tab, and want to show other languages within tabs
 form do |f|
   # ...
   f.inputs do

activeadmin-globalize.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md)
 
-  s.add_dependency 'activeadmin', '~> 1.0.0.pre'
+  s.add_dependency 'activeadmin'
   # Try to support rails from 3.2 up to 4.2.x
   s.add_dependency 'globalize', '>= 3.1.0', '< 6.0'
 
@@ -25,4 +25,3 @@ Gem::Specification.new do |s|
   # Other development dependencies moved into Gemfile
 
 end
-

app/assets/stylesheets/active_admin/active_admin_globalize.sass

@@ -1,5 +1,5 @@
 @import "active_admin/mixins"
-
+@import "active_admin_globalize_mixins"
 @import "active_admin_globalize_flags"
 
 .active_admin

app/assets/stylesheets/active_admin/active_admin_globalize_mixins.sass

@@ -0,0 +1,27 @@
+@mixin border-top-radius($radius)
+  -webkit-border-top-right-radius: $radius
+  border-top-right-radius: $radius
+  -webkit-border-top-left-radius: $radius
+  border-top-left-radius: $radius
+  background-clip: padding-box
+
+@mixin border-right-radius($radius)
+  -webkit-border-bottom-right-radius: $radius
+  border-bottom-right-radius: $radius
+  -webkit-border-top-right-radius: $radius
+  border-top-right-radius: $radius
+  background-clip: padding-box
+
+@mixin border-bottom-radius($radius)
+  -webkit-border-bottom-right-radius: $radius
+  border-bottom-right-radius: $radius
+  -webkit-border-bottom-left-radius: $radius
+  border-bottom-left-radius: $radius
+  background-clip: padding-box
+
+@mixin border-left-radius($radius)
+  -webkit-border-bottom-left-radius: $radius
+  border-bottom-left-radius: $radius
+  -webkit-border-top-left-radius: $radius
+  border-top-left-radius: $radius
+  background-clip: padding-box

lib/active_admin/globalize/engine.rb

@@ -7,13 +7,6 @@ class Engine < ::Rails::Engine
           "active_admin/active_admin_globalize.js"
         ]
       end
-
-      initializer "add assets" do
-        ActiveAdmin.application.register_stylesheet "active_admin/active_admin_globalize.css", :media => :screen
-        ActiveAdmin.application.register_javascript "active_admin/active_admin_globalize.js"
-      end
-
     end
   end
 end
-

lib/active_admin/globalize/version.rb

@@ -1,6 +1,5 @@
 module ActiveAdmin
   module Globalize
-    VERSION = '1.0.0.pre'
+    VERSION = '1.1.0'
   end
 end
-