From c24d3c1eb72b3a0aefd8d814031908b3409068b7 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 14 Oct 2021 19:21:28 +0300
Subject: [PATCH] add icons
---
.../CreateGapService/CreateGap.js | 2 +-
.../FillTheGapQuestion.js | 2 +-
.../components/EditorComponent.js | 6 ++++--
editors/demo/src/HHMI/layout/HhmiLayout.js | 10 ++++------
wax-prosemirror-components/src/icons/icons.js | 20 +++++++++++++++++++
.../MultipleChoiceQuestion.js | 2 +-
6 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/editors/demo/src/HHMI/FillTheGapQuestionService/CreateGapService/CreateGap.js b/editors/demo/src/HHMI/FillTheGapQuestionService/CreateGapService/CreateGap.js
index 74b6d44a9..5c45bfd0f 100644
--- a/editors/demo/src/HHMI/FillTheGapQuestionService/CreateGapService/CreateGap.js
+++ b/editors/demo/src/HHMI/FillTheGapQuestionService/CreateGapService/CreateGap.js
@@ -6,7 +6,7 @@ import { Tools } from 'wax-prosemirror-services';
@injectable()
class CreateGap extends Tools {
title = 'Create Gap Option';
- label = 'Create Gap';
+ icon = 'insertGap';
name = 'Create Gap';
get run() {
diff --git a/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestion.js b/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestion.js
index d8be5076e..185e01012 100644
--- a/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestion.js
+++ b/editors/demo/src/HHMI/FillTheGapQuestionService/FillTheGapQuestion.js
@@ -5,7 +5,7 @@ import { Tools } from 'wax-prosemirror-services';
@injectable()
class FillTheGapQuestion extends Tools {
title = 'Add Fill The Gap Question';
- label = 'Fill The Gap';
+ icon = 'gapQuestion';
name = 'Fill The Gap';
get run() {
diff --git a/editors/demo/src/HHMI/FillTheGapQuestionService/components/EditorComponent.js b/editors/demo/src/HHMI/FillTheGapQuestionService/components/EditorComponent.js
index b2998b1ef..e20129df2 100644
--- a/editors/demo/src/HHMI/FillTheGapQuestionService/components/EditorComponent.js
+++ b/editors/demo/src/HHMI/FillTheGapQuestionService/components/EditorComponent.js
@@ -15,9 +15,11 @@ const EditorWrapper = styled.span`
display: inline-flex;
.ProseMirror {
- border-bottom: 1px solid #145dbf;
+ background: #a6a6a6;
+ border: 1px solid #a6a6a6;
+ border-radius: 4px;
box-shadow: none;
- color: #145dbf;
+ color: #fff;
display: inline;
min-width: 50px;
padding: 0px 2px 0px 2px;
diff --git a/editors/demo/src/HHMI/layout/HhmiLayout.js b/editors/demo/src/HHMI/layout/HhmiLayout.js
index e56b32578..d01b2740b 100644
--- a/editors/demo/src/HHMI/layout/HhmiLayout.js
+++ b/editors/demo/src/HHMI/layout/HhmiLayout.js
@@ -44,16 +44,14 @@ const TopMenu = styled.div`
${th('colorFurniture')};
}
- > div:nth-last-of-type(-n + 2) {
- margin-left: auto;
- }
-
> div:last-child {
- margin-left: 0;
+ border-left: ${th('borderWidth')} ${th('borderStyle')}
+ ${th('colorFurniture')};
+ margin-left: auto;
margin-right: ${grid(5)};
}
- > div[data-name='Tables'] {
+ > div[data-name='FillTheGap'] {
border-right: none;
}
`;
diff --git a/wax-prosemirror-components/src/icons/icons.js b/wax-prosemirror-components/src/icons/icons.js
index 73859b955..203152a11 100644
--- a/wax-prosemirror-components/src/icons/icons.js
+++ b/wax-prosemirror-components/src/icons/icons.js
@@ -418,4 +418,24 @@ export default {
/>
</Svg>
),
+ multipleChoice: ({ className }) => (
+ <Svg className={className} fill="none" viewBox="0 0 24 24">
+ <title> Add Multiple Choice </title>
+ <path d="M16.54,11L13,7.46l1.41-1.41l2.12,2.12l4.24-4.24l1.41,1.41L16.54,11z M11,7H2v2h9V7z M21,13.41L19.59,12L17,14.59 L14.41,12L13,13.41L15.59,16L13,18.59L14.41,20L17,17.41L19.59,20L21,18.59L18.41,16L21,13.41z M11,15H2v2h9V15z" />
+ </Svg>
+ ),
+ gapQuestion: ({ className }) => (
+ <Svg className={className} fill="none" viewBox="0 0 24 24">
+ <title> Add Fill The Gap Question </title>
+ <path d="M0 0h24v24H0V0z" fill="none" />
+ <path d="M21 3H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H3V5h18v14zM5 15h14v3H5z" />
+ </Svg>
+ ),
+ insertGap: ({ className }) => (
+ <Svg className={className} fill="none" viewBox="0 0 24 24">
+ <title> Add Gap </title>
+ <path d="M0 0h24v24H0V0z" fill="none" />
+ <path d="M18 9v4H6V9H4v6h16V9h-2z" />
+ </Svg>
+ ),
};
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index 95b466c3a..a66cf1fcd 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -17,7 +17,7 @@ const checkifEmpty = view => {
@injectable()
class MultipleChoiceQuestion extends Tools {
title = 'Add Multiple Choice Question';
- label = 'Multiple Choice';
+ icon = 'multipleChoice';
name = 'Multiple Choice';
get run() {
--
GitLab