From cbe41d27689a7a5356139be89a282949b76f73da Mon Sep 17 00:00:00 2001 From: "Samuel C. Tyler" Date: Fri, 1 Apr 2016 22:23:42 -0400 Subject: [PATCH] fix layout of core html editor #54 --- plugins/core_editor/css/html-editor.css | 11 ++++++----- plugins/core_editor/html/_html_editor.haml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/core_editor/css/html-editor.css b/plugins/core_editor/css/html-editor.css index d9719ab..f9b2116 100644 --- a/plugins/core_editor/css/html-editor.css +++ b/plugins/core_editor/css/html-editor.css @@ -1,6 +1,7 @@ - #editor { - max-height: 250px; - height: 250px; + #wysiwyg-editor { + min-height: 30em; + height: 100%; + width: 100%; background-color: white; border-collapse: separate; border: 1px solid rgb(204, 204, 204); @@ -12,8 +13,8 @@ border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; border-top-left-radius: 3px; - overflow: scroll; - outline: none; + resize: vertical; + overflow: auto; } #voiceBtn { width: 20px; diff --git a/plugins/core_editor/html/_html_editor.haml b/plugins/core_editor/html/_html_editor.haml index d547726..72755e0 100644 --- a/plugins/core_editor/html/_html_editor.haml +++ b/plugins/core_editor/html/_html_editor.haml @@ -124,7 +124,7 @@ %fieldset.control-group{:class => error ? 'has-error' : ''} =f.label :body, :class => 'control-label' .controls - #wysiwyg-editor{style: "width: 100%;height: 30em", class: 'form-control input-large input-with-feedback'} + #wysiwyg-editor{class: 'form-control input-large input-with-feedback'} = f.object.body.try(:html_safe) ~f.text_area :body, class: 'hidden' %span.help-inline=error ? f.error_message_on(:body, :class => 'text-error') : pat(:example)