Merge pull request #2650 from luizpicolo/master

FIXED: Sprockets wysihtml5 and textarea proportions for bootstrap-wysihtml5-rails
railsadminteam · Jun 7, 2016 · 20be7f0 · 20be7f0
2 parents 9819122 + 2620e0f
commit 20be7f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/assets/stylesheets/rails_admin/ra.widgets.scss b/app/assets/stylesheets/rails_admin/ra.widgets.scss
@@ -1,6 +1,10 @@
 iframe.wysihtml5-sandbox{
   height: 250px !important;
-  width: 75% !important;
+  width: 99.7% !important;
+}
+
+iframe.wysihtml5-sandbox, .wysihtml5-editor{
+  border: 1px solid #ccc !important;
 }
 
 .controls img.preview{

diff --git a/lib/rails_admin/config/fields/types/wysihtml5.rb b/lib/rails_admin/config/fields/types/wysihtml5.rb
@@ -16,11 +16,11 @@ class Wysihtml5 < RailsAdmin::Config::Fields::Types::Text
           end
 
           register_instance_option :css_location do
-            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5.css')
+            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5/index.css')
           end
 
           register_instance_option :js_location do
-            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5.js')
+            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5/index.js')
           end
 
           register_instance_option :partial do