Commit fed16420 authored by Maxime Chaillet's avatar Maxime Chaillet

Merge branch 'issue163' into 'master'

it fixes #163.

Closes #163

See merge request !146
parents 587b6b04 4a33ba79
...@@ -26,12 +26,11 @@ class NewOrEditEventPanel extends React.Component { ...@@ -26,12 +26,11 @@ class NewOrEditEventPanel extends React.Component {
} }
render() { render() {
let { event, user, context, investigationId, setEditEventVisibility } = this.props; let { event, user, context, investigationId, setEditEventVisibility } = this.props;
debugger;
return ( return (
<Panel bsStyle='primary' style={{ marginBottom: '0px', height: '100%', position: 'relative' }}> <Panel bsStyle='primary' style={{ marginBottom: '0px', height: '100%', position: 'relative' }}>
<EventHeader context={context} /> <EventHeader context={context} />
<div id='refForEditorHeightCalculation' style={{ position: 'absolute', top: '41px', bottom: '100px', width: '100%' }} > <div id='refForEditorHeightCalculation' style={{ position: 'absolute', top: '41px', bottom: '100px', width: '100%' }} >
<div style={{ padding: '1px', position: 'absolute', top: '0px', bottom: '34px', left: '0px', right: '2px' }}> <div id='editorContainer' style={{ padding: '1px', position: 'absolute', top: '0px', bottom: '34px', left: '0px', right: '2px' }}>
<EventContentPanel <EventContentPanel
context={context} context={context}
event={event} event={event}
......
...@@ -327,11 +327,11 @@ div.collapsedEventPanel-heading:hover { ...@@ -327,11 +327,11 @@ div.collapsedEventPanel-heading:hover {
/* TinyMCE editor */ /* TinyMCE editor */
.mce-tinymce, .mce-container-body, #code_ifr { #editorContainer .mce-tinymce, #editorContainer .mce-tinymce .mce-container-body {
min-height: 100% !important; min-height: 100% !important;
} }
.mce-container-body { #editorContainer .mce-tinymce .mce-container-body {
position: absolute!important; position: absolute!important;
bottom: 0; bottom: 0;
left: 0; left: 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment