Merge pull request #149 from boostcamp-2020/hotfix

Hotfix 내용 master 브랜치에 반영
boostcamp-2020 · Dec 20, 2020 · 9fc27ac · 9fc27ac
2 parents c5e099b + 5425b15
commit 9fc27ac
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 35 deletions.
diff --git a/src/constants/mathquillLatex.js b/src/constants/mathquillLatex.js
@@ -1,20 +1,19 @@
 const mathquillLatex = [
-	// "\\Downarrow",
-	// "\\Im",
-	// "\\Leftarrow",
-	// "\\Leftrightarrow",
-	// "\\Longleftarrow",
-	// "\\Longleftrightarrow",
-	// "\\Longrightarrow",
-	// "\\Re",
-	// "\\Rightarrow",
-	// "\\Sigma",
-	// "\\Uparrow",
-	// "\\Updownarrow",
-	// "\\Upsilon",
+	"\\Downarrow",
+	"\\Im",
+	"\\Leftarrow",
+	"\\Leftrightarrow",
+	"\\Longleftarrow",
+	"\\Longleftrightarrow",
+	"\\Longrightarrow",
+	"\\Re",
+	"\\Rightarrow",
+	"\\Sigma",
+	"\\Uparrow",
+	"\\Updownarrow",
+	"\\Upsilon",
 	"\\aleph",
 	"\\alpha",
-	"\\amalg",
 	"\\angle",
 	"\\approx",
 	"\\ast",
@@ -107,10 +106,6 @@ const mathquillLatex = [
 	"\\ngtr",
 	"\\ni",
 	"\\nless",
-	"\\nsubset",
-	"\\nsubseteq",
-	"\\nsupset",
-	"\\nsupseteq",
 	"\\nparallel",
 	"\\nu",
 	"\\nwarrow",
@@ -119,9 +114,7 @@ const mathquillLatex = [
 	"\\oint_{ }^{ }",
 	"\\omega",
 	"\\omikron",
-	"\\ominus",
 	"\\parallel",
-	"\\parallelogram",
 	"\\partial",
 	"\\perp",
 	"\\phi",
@@ -141,7 +134,6 @@ const mathquillLatex = [
 	"\\rightharpoondown",
 	"\\rightharpoonup",
 	"\\searrow",
-	"\\setminus",
 	"\\sharp",
 	"\\sigma",
 	"\\simeq",
@@ -150,18 +142,12 @@ const mathquillLatex = [
 	"\\sqcap",
 	"\\sqcup",
 	"\\sqrt{ }",
-	"\\sqsubset",
-	"\\sqsubseteq",
-	"\\sqsupset",
-	"\\sqsupseteq",
 	"\\square",
 	"\\subset",
 	"\\subseteq",
 	"\\succ",
 	"\\succeq",
 	"\\sum",
-	"\\supset",
-	"\\supseteq",
 	"\\surd",
 	"\\swarrow",
 	"\\tau",

diff --git a/src/containers/BookmarkContainer.jsx b/src/containers/BookmarkContainer.jsx
@@ -74,7 +74,7 @@ export default function BookmarkContainer({ theme, setTabState }) {
 	const handleEditButton = ({ id, description }) => async () => {
 		const answer = await popup({
 			mode: "prompt",
-			message: "해당 북마크의 변경할 이름을 적어주세요!",
+			message: "해당 북마크의 변경할 키워드를 작성해주세요.",
 			placeholder: description,
 		});
 

diff --git a/src/popupStyle.js b/src/popupStyle.js
@@ -12,7 +12,7 @@ const popupStyle = theme => `
     left: 50%;
     transform: translateX(-50%);
     transition: 1s;
-    z-index: 3;
+    z-index: 1000;
     box-shadow: 0 0 15px 1px ${color.grey};
     font-weight: bold;
     display: flex;

diff --git a/src/presentationals/AutoComplete.jsx b/src/presentationals/AutoComplete.jsx
@@ -7,12 +7,14 @@ import color from "../constants/color";
 const AutoKeywordLayout = styled.div`
 	position: fixed;
 	left: ${({ x }) => x}px;
-	top: ${({ y, fontSize }) => y + fontSize}px;
+	top: ${({ top }) => top}px;
 	width: fit-content;
 	height: fit-content;
-	background: ${({ theme }) => color.mainTheme4[theme]};
-	color: ${({ theme }) => color.mainTheme0[theme]};
-	box-shadow: 0 0 7px 3px black;
+	${({ theme }) => `
+		background: ${color.mainTheme4[theme]};
+		color: ${color.mainTheme0[theme]};
+		box-shadow: 0 0 5px 2px ${color.mainTheme1[theme]};
+	`}
 	visibility: ${({ isOpen }) => (isOpen ? "visible" : "hidden")};
   z-index: 500;
 `;
@@ -53,7 +55,11 @@ function AutoComplete({
 	theme,
 }) {
 	return (
-		<AutoKeywordLayout x={x} y={y} isOpen={isOpen} fontSize={fontSize} theme={theme}>
+		<AutoKeywordLayout
+			x={x}
+			top={y + fontSize}
+			isOpen={isOpen && recommandationList.length}
+			theme={theme}>
 			{ isOpen && recommandationList.map((item, index) => (
 				<HightLight data-id={index} onClick={onClick} onMouseEnter={onMouseEnter}
 					key={index} isFocused={index === parseInt(targetIndex, 10)}>

diff --git a/src/presentationals/CustomForm.jsx b/src/presentationals/CustomForm.jsx
@@ -16,7 +16,7 @@ const Form = styled.form`
 		border: none;
 		outline: none;
 		background-color: ${({ theme }) => color.mainTheme4[theme]};
-		color: white;
+		color: ${({ theme }) => color.mainTheme0[theme]};
 		text-align: center;
 		padding: 3px;
 		margin: 3px;