Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIXED: Sprockets wysihtml5 and textarea proportions for bootstrap-wysihtml5-rails #2650

Merged
merged 21 commits into from
Jun 7, 2016
Merged

FIXED: Sprockets wysihtml5 and textarea proportions for bootstrap-wysihtml5-rails #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
19af9bc
Fixing sprockets wysihtml5 problem
AlexEscalante May 22, 2015
5ddd7d2
fixed a typo
AlexEscalante May 23, 2015
bbbc7d0
Merge branch 'master' of github.com:AlexEscalante/rails_admin
luizpicolo Jun 3, 2015
840eb7a
Fixed#2313
luizpicolo Jun 3, 2015
2b805d7
Merge pull request 2313
luizpicolo Jun 3, 2015
301be96
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Jun 5, 2015
fe3e824
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Jun 17, 2015
a57ace6
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Jun 20, 2015
6a8bf7a
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Jun 24, 2015
e1aec20
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Jun 24, 2015
b403ebb
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Jun 24, 2015
7c7c5c7
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Jun 26, 2015
e3403a6
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Jun 30, 2015
2ad2a75
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Aug 3, 2015
55c6cc9
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Aug 4, 2015
40f6c25
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Sep 8, 2015
b20a914
Update theming.scss
luizpicolo Apr 5, 2016
a89d1f3
Update theming.scss
luizpicolo Apr 5, 2016
6123919
FIXED: Textarea Bootstrap wysihtml5
luizpicolo Apr 5, 2016
c6268ba
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo Apr 11, 2016
2620e0f
Merge branch 'master' of github.com:sferik/rails_admin
luizpicolo May 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/assets/stylesheets/rails_admin/ra.widgets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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{
Expand Down
4 changes: 2 additions & 2 deletions lib/rails_admin/config/fields/types/wysihtml5.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down