From c1f7feca973aa8b4cd19cef30f4b895d66b80f09 Mon Sep 17 00:00:00 2001 From: SamGodwin2 Date: Wed, 30 Oct 2019 09:49:52 +0000 Subject: [PATCH] Reconfigured the RTE boxes --- .../page/Design/QuestionPageEditor/AdditionalInfo.js | 1 - .../App/page/Design/QuestionPageEditor/MetaEditor.js | 10 ++++++---- .../__snapshots__/AdditionalInfo.test.js.snap | 1 - .../__snapshots__/MetaEditor.test.js.snap | 5 +---- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/AdditionalInfo.js b/eq-author/src/App/page/Design/QuestionPageEditor/AdditionalInfo.js index 7aae0fcbdc..af5eb2ed9d 100644 --- a/eq-author/src/App/page/Design/QuestionPageEditor/AdditionalInfo.js +++ b/eq-author/src/App/page/Design/QuestionPageEditor/AdditionalInfo.js @@ -19,7 +19,6 @@ import pageFragment from "graphql/fragments/page.graphql"; const contentControls = { bold: true, emphasis: true, - piping: true, list: true, }; diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js b/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js index 62aa4af940..8b46694586 100644 --- a/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js +++ b/eq-author/src/App/page/Design/QuestionPageEditor/MetaEditor.js @@ -27,16 +27,18 @@ const titleControls = { }; const descriptionControls = { - bold: true, emphasis: true, piping: true, }; +const definitionControls = { + list: true, + emphasis: true, + bold: true, +}; const guidanceControls = { - heading: true, bold: true, list: true, - piping: true, }; const Paragraph = styled.p` @@ -130,7 +132,7 @@ export class StatelessMetaEditor extends React.Component { label="Content" value={page.definitionContent} onUpdate={onChangeUpdate} - controls={descriptionControls} + controls={definitionControls} multiline fetchAnswers={fetchAnswers} metadata={page.section.questionnaire.metadata} diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/AdditionalInfo.test.js.snap b/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/AdditionalInfo.test.js.snap index d5ccd6d0d7..73b2adb6ab 100644 --- a/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/AdditionalInfo.test.js.snap +++ b/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/AdditionalInfo.test.js.snap @@ -41,7 +41,6 @@ exports[`AdditionalInfo should render 1`] = ` "bold": true, "emphasis": true, "list": true, - "piping": true, } } disabled={false} diff --git a/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/MetaEditor.test.js.snap b/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/MetaEditor.test.js.snap index 778460cabc..ec16b21c5c 100644 --- a/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/MetaEditor.test.js.snap +++ b/eq-author/src/App/page/Design/QuestionPageEditor/__snapshots__/MetaEditor.test.js.snap @@ -37,7 +37,6 @@ exports[`MetaEditor should render 1`] = ` autoFocus={false} controls={ Object { - "bold": true, "emphasis": true, "piping": true, } @@ -94,7 +93,7 @@ exports[`MetaEditor should render 1`] = ` Object { "bold": true, "emphasis": true, - "piping": true, + "list": true, } } disabled={false} @@ -122,9 +121,7 @@ exports[`MetaEditor should render 1`] = ` controls={ Object { "bold": true, - "heading": true, "list": true, - "piping": true, } } disabled={false}