поправил шрифты для форм и остального

codEnjoyer · Dec 18, 2023 · 622c324 · 622c324
1 parent 251cedd
commit 622c324
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/frontend/src/UIComponents/CustomProgressBar/customProgressBar.scss b/frontend/src/UIComponents/CustomProgressBar/customProgressBar.scss
@@ -8,6 +8,7 @@
 }
 
 .progressPercent {
+  font-family: Montserrat, sans-serif;
   font-weight: 600;
   position: absolute;
   left: 50%;

diff --git a/frontend/src/components/mapMenu/UIMapMenu/Level/ModalLevelBody.tsx b/frontend/src/components/mapMenu/UIMapMenu/Level/ModalLevelBody.tsx
@@ -62,9 +62,15 @@ const ModalLevelBody: React.FC<IModalLevelProps> = ({level}) => {
         for (let i = 0; i < menuItems.length; i++) {
             for (let j = 0; j < menuItems[i].length; j++) {
                 index++
-                taskBlocks.push(<MenuItem indexType={i} index={index} key={index} indexSelectedItem={levelIndex}
-                                          setLevelIndex={setLevelIndex}/>)
-
+                taskBlocks.push(
+                    <MenuItem
+                        indexType={i}
+                        index={index}
+                        key={index}
+                        indexSelectedItem={levelIndex}
+                        setLevelIndex={setLevelIndex}
+                    />
+                )
             }
         }
         return taskBlocks
@@ -131,7 +137,6 @@ const ModalLevelBody: React.FC<IModalLevelProps> = ({level}) => {
                                         <div className="question" key={question.id}>
                                             <div className="question-title">{question.question}</div>
                                             <TaskOpenQuestionEditor
-                                                text={textOpenQuestion}
                                                 setText={setTextOpenQuestion}
                                             />
                                         </div>

diff --git a/frontend/src/components/mapMenu/UIMapMenu/Level/TaskOpenQuestionEditor.tsx b/frontend/src/components/mapMenu/UIMapMenu/Level/TaskOpenQuestionEditor.tsx
@@ -1,14 +1,13 @@
-import {convertToRaw, EditorState} from "draft-js";
+import {EditorState} from "draft-js";
 import React, {useState} from "react";
 import {Editor} from "react-draft-wysiwyg";
 import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css";
 
 interface ITaskOpenQuestionEditor {
-    text: string,
     setText: (text: string) => void
 }
 
-const TaskOpenQuestionEditor: React.FC<ITaskOpenQuestionEditor> = ({text, setText}) => {
+const TaskOpenQuestionEditor: React.FC<ITaskOpenQuestionEditor> = ({setText}) => {
     const [editorState, setEditorState] = useState(EditorState.createEmpty());
     const onEditorStateChange = function (editorState: EditorState) {
         setEditorState(editorState);

diff --git a/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.scss b/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.scss
@@ -30,7 +30,6 @@
 
 .level-title {
   color: #2B2A29;
-  font-family: Golos, sans-serif;
   font-size: 1.75rem;
   font-style: normal;
   font-weight: 700;
@@ -43,7 +42,6 @@
 .level-name {
   color: #F5F5F5;
   text-align: center;
-  font-family: Golos, sans-serif;
   font-size: 1.5rem;
   font-style: normal;
   font-weight: 700;
@@ -53,7 +51,6 @@
 
 .level-body {
   color: #000;
-  font-family: Golos, sans-serif;
   font-size: 1.125rem;
   font-style: normal;
   font-weight: 700;

diff --git a/frontend/src/index.css b/frontend/src/index.css
@@ -1,6 +1,6 @@
 :root {
     background-color: black;
-    font-family: Golos, serif;
+    font-family: Montserrat, sans-serif;
     font-size: 12px;
     font-weight: 400;
     line-height: 14px;
@@ -24,15 +24,13 @@ body {
 }
 
 h1 {
-    font-family: Golos, sans-serif;
     font-size: 26px;
     font-weight: 700;
     line-height: 31px;
     letter-spacing: 0.2em;
 }
 
 h2 {
-    font-family: Golos, sans-serif;
     font-size: 18px;
     font-weight: 600;
     line-height: 22px;

diff --git a/frontend/src/styles/mapMenu.scss b/frontend/src/styles/mapMenu.scss
@@ -46,7 +46,6 @@
   color: #F5F5F5;
   text-align: center;
   text-shadow: 0 4px 4px rgba(0, 0, 0, 0.25);
-  font-family: Golos, sans-serif;
   font-size: 1.125rem;
   font-style: normal;
   font-weight: 700;
@@ -186,3 +185,7 @@
   top: 5%;
 }
 
+.editorClassName {
+  border: 1px solid #F1F1F1;
+  letter-spacing: 0;
+}