From 1f0d102115f2619689ee5ac03975e80003cb5a63 Mon Sep 17 00:00:00 2001
From: Belen Curcio
Date: Fri, 3 Mar 2017 15:53:53 -0500
Subject: [PATCH] new components!! textarea stuff and configure bugs
---
.../src/containers/Configure/Configure.css | 11 ++++++++++
.../containers/Configure/StreamSettings.js | 20 +++++++++----------
client/coral-ui/components/TextArea.css | 15 ++++++++++++++
client/coral-ui/components/TextArea.js | 14 +++++++++++++
client/coral-ui/index.js | 2 ++
5 files changed, 51 insertions(+), 11 deletions(-)
create mode 100644 client/coral-ui/components/TextArea.css
create mode 100644 client/coral-ui/components/TextArea.js
diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index 54deadccf..c262b01d3 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -78,6 +78,8 @@
border-color: #ccc;
border-style: solid;
border-width: 0px 0px 1px 0px;
+ font-size: 14px;
+ text-align: center;
}
.charCountTexfieldEnabled {
@@ -174,4 +176,13 @@
line-height: 1.2;
max-width: 600px;
}
+
+ .descriptionBox {
+ margin-top: 15px;
+ max-width: 550px;
+
+ input {
+ height: 150px;
+ }
+ }
}
diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js
index bd4111006..c4f01f4bc 100644
--- a/client/coral-admin/src/containers/Configure/StreamSettings.js
+++ b/client/coral-admin/src/containers/Configure/StreamSettings.js
@@ -3,8 +3,8 @@ import {SelectField, Option} from 'react-mdl-selectfield';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../../translations.json';
import styles from './Configure.css';
-import {Textfield, Checkbox} from 'react-mdl';
-import {Card, Icon} from 'coral-ui';
+import {Checkbox} from 'react-mdl';
+import {Card, Icon, TextArea, Textfield} from 'coral-ui';
const TIMESTAMPS = {
weeks: 60 * 60 * 24 * 7,
@@ -108,12 +108,11 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
{lang.t('configure.include-comment-stream-desc')}
@@ -123,11 +122,10 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
{lang.t('configure.closed-comments-desc')}
-
+
diff --git a/client/coral-ui/components/TextArea.css b/client/coral-ui/components/TextArea.css
new file mode 100644
index 000000000..794064cf1
--- /dev/null
+++ b/client/coral-ui/components/TextArea.css
@@ -0,0 +1,15 @@
+.textArea {
+ textarea {
+ width: 100%;
+ display: block;
+ outline: none;
+ border: 1px solid rgba(0,0,0,.12);
+ padding: 6px;
+ box-sizing: border-box;
+ border-radius: 2px;
+ margin: 5px auto;
+ min-height: 175px;
+ font-size: 14px;
+ resize: none;
+ }
+}
diff --git a/client/coral-ui/components/TextArea.js b/client/coral-ui/components/TextArea.js
new file mode 100644
index 000000000..519ef6b19
--- /dev/null
+++ b/client/coral-ui/components/TextArea.js
@@ -0,0 +1,14 @@
+import React, {PropTypes} from 'react';
+import styles from './TextArea.css';
+
+const TextArea = ({className, value = '', ...props}) => (
+
+
+
+);
+
+TextArea.propTypes = {
+ onChange: PropTypes.func,
+};
+
+export default TextArea;
diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js
index b3498c3e0..2f84ceac8 100644
--- a/client/coral-ui/index.js
+++ b/client/coral-ui/index.js
@@ -22,3 +22,5 @@ export {default as WizardNav} from './components/WizardNav';
export {default as Select} from './components/Select';
export {default as Option} from './components/Option';
export {default as SnackBar} from './components/SnackBar';
+export {default as Textfield} from './components/Textfield';
+export {default as TextArea} from './components/TextArea';