Skip to content

Commit 7a79b27

Browse files
author
Rob Florence
committed
add border mixins and remove deprecated activeadmin methods
1 parent 8ac8dee commit 7a79b27

File tree

3 files changed

+34
-8
lines changed

3 files changed

+34
-8
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ As soon as ActiveAdmin 1.x is released to rubygems, I'll release the gem with no
1818

1919
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)
2020

21+
## Require Assets
22+
23+
- active_admin.js: `//= require active_admin/active_admin_globalize.js`
24+
- active_admin.scss: `@import "active_admin/active_admin_globalize.css";`
25+
2126
## Your model
2227

2328
```ruby
@@ -68,7 +73,7 @@ form do |f|
6873
end
6974

7075
# You can also set locales to show in tabs
71-
# For example we want to show English translation fields without tab, and want to show other languages within tabs
76+
# For example we want to show English translation fields without tab, and want to show other languages within tabs
7277
form do |f|
7378
# ...
7479
f.inputs do

app/assets/stylesheets/active_admin/active_admin_globalize.sass

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,34 @@
22

33
@import "active_admin_globalize_flags"
44

5+
@mixin border-top-radius($radius)
6+
-webkit-border-top-right-radius: $radius
7+
border-top-right-radius: $radius
8+
-webkit-border-top-left-radius: $radius
9+
border-top-left-radius: $radius
10+
background-clip: padding-box
11+
12+
@mixin border-right-radius($radius)
13+
-webkit-border-bottom-right-radius: $radius
14+
border-bottom-right-radius: $radius
15+
-webkit-border-top-right-radius: $radius
16+
border-top-right-radius: $radius
17+
background-clip: padding-box
18+
19+
@mixin border-bottom-radius($radius)
20+
-webkit-border-bottom-right-radius: $radius
21+
border-bottom-right-radius: $radius
22+
-webkit-border-bottom-left-radius: $radius
23+
border-bottom-left-radius: $radius
24+
background-clip: padding-box
25+
26+
@mixin border-left-radius($radius)
27+
-webkit-border-bottom-left-radius: $radius
28+
border-bottom-left-radius: $radius
29+
-webkit-border-top-left-radius: $radius
30+
border-top-left-radius: $radius
31+
background-clip: padding-box
32+
533
.active_admin
634
.activeadmin-translations
735
margin-bottom: 20px

lib/active_admin/globalize/engine.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ class Engine < ::Rails::Engine
77
"active_admin/active_admin_globalize.js"
88
]
99
end
10-
11-
initializer "add assets" do
12-
ActiveAdmin.application.register_stylesheet "active_admin/active_admin_globalize.css", :media => :screen
13-
ActiveAdmin.application.register_javascript "active_admin/active_admin_globalize.js"
14-
end
15-
1610
end
1711
end
1812
end
19-

0 commit comments

Comments
 (0)