From a1a45a7969d7ea7f3c9b547c962d939d78253fe6 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Fri, 3 Mar 2017 15:10:15 -0500 Subject: [PATCH 1/6] Styles and disable and enable things --- .../src/containers/Configure/Configure.css | 17 +++++++++++------ .../src/containers/Configure/StreamSettings.js | 15 ++++++++++----- client/coral-admin/src/translations.json | 4 ++-- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css index 058ff7a64..54deadccf 100644 --- a/client/coral-admin/src/containers/Configure/Configure.css +++ b/client/coral-admin/src/containers/Configure/Configure.css @@ -41,7 +41,9 @@ .settingsHeader { margin-top: 3px; - margin-bottom: 10px; + margin-bottom: 7px; + font-size: 18px; + font-weight: 500; } .disabledSettingText { @@ -58,11 +60,6 @@ overflow: visible; } -.configSettingInfoBox p { - font-size: 12px; - bottom: 0; -} - .configSettingEmbed { border: 1px solid #ccc; border-radius: 4px; @@ -170,3 +167,11 @@ padding-left: 30px; } } + + +.Configure { + p { + line-height: 1.2; + max-width: 600px; + } +} diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js index 568e0a075..bd4111006 100644 --- a/client/coral-admin/src/containers/Configure/StreamSettings.js +++ b/client/coral-admin/src/containers/Configure/StreamSettings.js @@ -64,7 +64,7 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => { const off = styles.disabledSetting; return ( -
+
{ className={`${styles.charCountTexfield} ${settings.charCountEnable && styles.charCountTexfieldEnabled}`} htmlFor='charCount' onChange={updateCharCount(updateSettings, settingsError)} - value={settings.charCount}/> + value={settings.charCount} + disabled={settings.charCountEnable ? '' : 'disabled'} + /> {lang.t('configure.comment-count-text-post')} { errors.charCount && @@ -99,8 +101,10 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => { checked={settings.infoBoxEnable} />
- {lang.t('configure.include-comment-stream')} -

+

+ {lang.t('configure.include-comment-stream')} +
+

{lang.t('configure.include-comment-stream-desc')}

@@ -109,7 +113,8 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => { onChange={updateInfoBoxContent(updateSettings)} value={settings.infoBoxContent} label={lang.t('configure.include-text')} - rows={3}/> + rows={3} + />
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index cebc499ca..686001f6a 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -63,7 +63,7 @@ "enable-pre-moderation-text": "Moderators must approve any comment before it is published.", "require-email-verification": "Require Email Verification", "require-email-verification-text": "New Users must verify their email before commenting", - "include-comment-stream": "Include Comment Stream Description for Readers.", + "include-comment-stream": "Include Comment Stream Description for Readers", "include-comment-stream-desc": "Write a message to be added to the top of your comment stream. Pose a topic, include community guidelines, etc.", "include-text": "Include your text here.", "comment-settings": "Settings", @@ -87,7 +87,7 @@ "close-after": "Close comments after", "comment-count-header": "Limit Comment Length", "comment-count-text-pre": "Comments will be limited to ", - "comment-count-text-post": " characters.", + "comment-count-text-post": " characters", "comment-count-error": "Please enter a valid number.", "domain-list-title": "Permitted Domains", "domain-list-text": "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com)." From 1f0d102115f2619689ee5ac03975e80003cb5a63 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Fri, 3 Mar 2017 15:53:53 -0500 Subject: [PATCH 2/6] 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')}

-
- +