diff --git a/client/coral-admin/src/routes/Configure/components/ModerationSettings.css b/client/coral-admin/src/routes/Configure/components/ConfigureCard.css similarity index 87% rename from client/coral-admin/src/routes/Configure/components/ModerationSettings.css rename to client/coral-admin/src/routes/Configure/components/ConfigureCard.css index 54e46db9b..0aafcf7f4 100644 --- a/client/coral-admin/src/routes/Configure/components/ModerationSettings.css +++ b/client/coral-admin/src/routes/Configure/components/ConfigureCard.css @@ -1,9 +1,3 @@ -.title { - color: black; - font-size: 1.26em; - font-weight: 500; -} - .card { margin-bottom: 20px; align-items: flex-start; @@ -20,6 +14,8 @@ .wrapper { width: 100%; + font-size: 14px; + letter-spacing: 0; } .action { @@ -34,7 +30,6 @@ display: inline-block; padding: 0px 30px; box-sizing: border-box; - width: 100%; } .enabledSetting { @@ -49,5 +44,6 @@ .disabledSettingText { color: #ccc; + pointer-events: none; } diff --git a/client/coral-admin/src/routes/Configure/components/ConfigureCard.js b/client/coral-admin/src/routes/Configure/components/ConfigureCard.js new file mode 100644 index 000000000..b7198a480 --- /dev/null +++ b/client/coral-admin/src/routes/Configure/components/ConfigureCard.js @@ -0,0 +1,45 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import styles from './ConfigureCard.css'; +import {Card} from 'coral-ui'; +import {Checkbox} from 'react-mdl'; +import cn from 'classnames'; + +const ConfigureCard = ({title, children, className, onCheckbox, checked, ...rest}) => ( + + {checked !== undefined && +
+ +
+ } +
+
{title}
+
+ {children} +
+
+
+); + +ConfigureCard.propTypes = { + title: PropTypes.string.isRequired, + className: PropTypes.string, + onCheckbox: PropTypes.func, + checked: PropTypes.bool, + children: PropTypes.node, +}; + +export default ConfigureCard; diff --git a/client/coral-admin/src/routes/Configure/components/ConfigurePage.css b/client/coral-admin/src/routes/Configure/components/ConfigurePage.css new file mode 100644 index 000000000..f592f0383 --- /dev/null +++ b/client/coral-admin/src/routes/Configure/components/ConfigurePage.css @@ -0,0 +1,5 @@ +.title { + color: black; + font-size: 1.26em; + font-weight: 500; +} diff --git a/client/coral-admin/src/routes/Configure/components/ConfigurePage.js b/client/coral-admin/src/routes/Configure/components/ConfigurePage.js new file mode 100644 index 000000000..dc1182fc2 --- /dev/null +++ b/client/coral-admin/src/routes/Configure/components/ConfigurePage.js @@ -0,0 +1,17 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import styles from './ConfigurePage.css'; + +const ConfigurePage = ({title, children, ...rest}) => ( +
+

{title}

+ {children} +
+); + +ConfigurePage.propTypes = { + title: PropTypes.string.isRequired, + children: PropTypes.node, +}; + +export default ConfigurePage; diff --git a/client/coral-admin/src/routes/Configure/components/Domainlist.css b/client/coral-admin/src/routes/Configure/components/Domainlist.css deleted file mode 100644 index a1667e5ce..000000000 --- a/client/coral-admin/src/routes/Configure/components/Domainlist.css +++ /dev/null @@ -1,17 +0,0 @@ -.card { - margin-bottom: 20px; - align-items: flex-start; - min-height: 100px; - max-width: 600px; -} - -.header { - margin-top: 3px; - margin-bottom: 7px; - font-size: 18px; - font-weight: 500; -} - -.wrapper { - width: 100%; -} diff --git a/client/coral-admin/src/routes/Configure/components/Domainlist.js b/client/coral-admin/src/routes/Configure/components/Domainlist.js index 78f4e2b28..fcb501800 100644 --- a/client/coral-admin/src/routes/Configure/components/Domainlist.js +++ b/client/coral-admin/src/routes/Configure/components/Domainlist.js @@ -1,25 +1,19 @@ import React from 'react'; import PropTypes from 'prop-types'; -import {Card} from 'coral-ui'; -import styles from './Domainlist.css'; import TagsInput from 'coral-admin/src/components/TagsInput'; import t from 'coral-framework/services/i18n'; +import ConfigureCard from './ConfigureCard'; const Domainlist = ({domains, onChangeDomainlist}) => { return ( - -
-
{t('configure.domain_list_title')}
-

{t('configure.domain_list_text')}

-
- onChangeDomainlist('whitelist', tags)} - /> -
-
-
+ +

{t('configure.domain_list_text')}

+ onChangeDomainlist('whitelist', tags)} + /> +
); }; diff --git a/client/coral-admin/src/routes/Configure/components/EmbedLink.css b/client/coral-admin/src/routes/Configure/components/EmbedLink.css index 3054bd6c5..07987df02 100644 --- a/client/coral-admin/src/routes/Configure/components/EmbedLink.css +++ b/client/coral-admin/src/routes/Configure/components/EmbedLink.css @@ -1,21 +1,3 @@ -.card { - margin-bottom: 20px; - align-items: flex-start; - min-height: 100px; - max-width: 600px; -} - -.header { - margin-top: 3px; - margin-bottom: 7px; - font-size: 18px; - font-weight: 500; -} - -.wrapper { - width: 100%; -} - .embedInput { width: 100%; display: block; diff --git a/client/coral-admin/src/routes/Configure/components/EmbedLink.js b/client/coral-admin/src/routes/Configure/components/EmbedLink.js index 694ac14c9..fbb5c6a89 100644 --- a/client/coral-admin/src/routes/Configure/components/EmbedLink.js +++ b/client/coral-admin/src/routes/Configure/components/EmbedLink.js @@ -2,8 +2,9 @@ import React, {Component} from 'react'; import t from 'coral-framework/services/i18n'; import join from 'url-join'; import styles from './EmbedLink.css'; -import {Button, Card} from 'coral-ui'; +import {Button} from 'coral-ui'; import {BASE_URL} from 'coral-framework/constants/url'; +import ConfigureCard from './ConfigureCard'; class EmbedLink extends Component { @@ -34,21 +35,18 @@ class EmbedLink extends Component { "> `.trim(); return ( - -
-
Embed Comment Stream
-

{t('configure.copy_and_paste')}

-