From d7b4f5735012b393a94314e6025e2d80fb127faa Mon Sep 17 00:00:00 2001 From: okbel Date: Wed, 21 Feb 2018 10:27:01 -0300 Subject: [PATCH] styles, renaming, func --- client/coral-embed-stream/style/default.css | 1 - .../components/{RTEtextArea.css => Editor.css} | 12 ++++++++++++ .../components/{RTEtextArea.js => Editor.js} | 17 ++++++++++++++--- plugins/talk-plugin-rte/client/index.js | 4 ++-- 4 files changed, 28 insertions(+), 6 deletions(-) rename plugins/talk-plugin-rte/client/components/{RTEtextArea.css => Editor.css} (75%) rename plugins/talk-plugin-rte/client/components/{RTEtextArea.js => Editor.js} (79%) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 04797211e..d6e223724 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -5,7 +5,6 @@ * { font-family: inherit; - font-style: inherit; } html, body { diff --git a/plugins/talk-plugin-rte/client/components/RTEtextArea.css b/plugins/talk-plugin-rte/client/components/Editor.css similarity index 75% rename from plugins/talk-plugin-rte/client/components/RTEtextArea.css rename to plugins/talk-plugin-rte/client/components/Editor.css index 56fe7d9ed..1bc7f9cd9 100644 --- a/plugins/talk-plugin-rte/client/components/RTEtextArea.css +++ b/plugins/talk-plugin-rte/client/components/Editor.css @@ -2,6 +2,12 @@ background: #fff; border: solid 1px #bbb; min-height: 120px; + box-sizing: border-box; + outline: 0; + overflow-y: auto; + width: 100%; + padding: 4px; + font-style: unset; } .button { @@ -17,6 +23,8 @@ margin-right: 2px; font-size: 1em; width: 25px; + background-color: transparent; + outline: 0; } .button:hover{ @@ -33,3 +41,7 @@ border-top-left-radius: 4px; border-top-right-radius: 4px; } + +.container { + box-sizing: border-box; +} \ No newline at end of file diff --git a/plugins/talk-plugin-rte/client/components/RTEtextArea.js b/plugins/talk-plugin-rte/client/components/Editor.js similarity index 79% rename from plugins/talk-plugin-rte/client/components/RTEtextArea.js rename to plugins/talk-plugin-rte/client/components/Editor.js index b2d4bc39f..4167bc3c3 100644 --- a/plugins/talk-plugin-rte/client/components/RTEtextArea.js +++ b/plugins/talk-plugin-rte/client/components/Editor.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { init } from 'pell'; -import styles from './RTEtextArea.css'; +import styles from './Editor.css'; import cn from 'classnames'; const pluginName = 'talk-plugin-rte'; @@ -35,8 +35,18 @@ class Editor extends React.Component { } render() { - const { id, containerClass } = this.props; - return
; + const { id, classNames } = this.props; + return ( +
+ ); } } @@ -48,6 +58,7 @@ Editor.defaultProps = { button: '', content: '', actionbar: '', + container: '', }, }; diff --git a/plugins/talk-plugin-rte/client/index.js b/plugins/talk-plugin-rte/client/index.js index 920dd2a2c..dc7f35803 100644 --- a/plugins/talk-plugin-rte/client/index.js +++ b/plugins/talk-plugin-rte/client/index.js @@ -1,7 +1,7 @@ -import RTEtextArea from './components/RTEtextArea'; +import Editor from './components/Editor'; export default { slots: { - textArea: [RTEtextArea], + textArea: [Editor], }, };