Skip to content

Commit

Permalink
fix layout of core html editor #54
Browse files Browse the repository at this point in the history
  • Loading branch information
skamansam committed Apr 2, 2016
1 parent 9d88e3f commit cbe41d2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions plugins/core_editor/css/html-editor.css
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/core_editor/html/_html_editor.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit cbe41d2

Please sign in to comment.