From 607bfb81f663a51f0ad515fb1cc38769faace0e5 Mon Sep 17 00:00:00 2001 From: Lee Naeun Date: Wed, 1 Sep 2021 11:54:33 +0900 Subject: [PATCH 1/2] :lipstick: [Client] SearchMore.js : fix css --- client/src/comp/Modal.js | 22 ++------ client/src/comp/SearchResult.js | 1 - client/src/pages/SearchMore.js | 91 ++++++++++++--------------------- 3 files changed, 37 insertions(+), 77 deletions(-) diff --git a/client/src/comp/Modal.js b/client/src/comp/Modal.js index 09f2e3c..5dbc7b7 100644 --- a/client/src/comp/Modal.js +++ b/client/src/comp/Modal.js @@ -4,10 +4,7 @@ import logo from "../jurimma_logo.png"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faChevronDown, faComment } from "@fortawesome/free-solid-svg-icons"; import { useHistory } from "react-router"; -import KaKaoLogin from "react-kakao-login"; import axios from "axios"; -import { KAKAO_AUTH_URL } from "./oauth"; -const { Kakao } = window; const checkModule = require("../checkModule"); axios.defaults.withCredentials = true; @@ -485,21 +482,10 @@ function Modal({ setOnModal, setisLogin, setUserInfo, setAccToken, accToken }) { - kakaoLoginHandler(res)} - onFailure={(res) => console.log(res)} - getProfile={true} - onLogout={console.info} - style={{ - width: "100%", - }} - > - - -

카카오 로그인

-
-
+ + +

카카오 로그인

+
diff --git a/client/src/comp/SearchResult.js b/client/src/comp/SearchResult.js index 3daa532..a6d1a8b 100644 --- a/client/src/comp/SearchResult.js +++ b/client/src/comp/SearchResult.js @@ -2,7 +2,6 @@ import React, { useEffect } from "react"; import styled from "styled-components"; import thumbs_up_icon from "../thumbs_up_icon.png"; import { Link, Redirect } from "react-router-dom"; -import thumbs_up_icon from "../thumbs_up_icon.png"; import empty from "../empty.png"; function SearchResult({ diff --git a/client/src/pages/SearchMore.js b/client/src/pages/SearchMore.js index 42461b7..fc14763 100644 --- a/client/src/pages/SearchMore.js +++ b/client/src/pages/SearchMore.js @@ -49,74 +49,49 @@ const ResultList = styled.ul` height: 8vh; margin: 2vh auto 0; border: 2px solid #000; - border-radius: 5vh; - margin: 0 auto 2vw; - font-size: max(12px, 0.8vw); - color: #fff; - transition: 0.3s; + border-radius: 40px; + text-align: center; + line-height: 8vh; + background-color: rgba(210, 248, 224, 0.9); cursor: pointer; - :hover { - background-color: #fff; - color: #000; - background-color: rgba(255, 255, 255, 0.5); - color: black; + transition: 0.3s; + p:first-child { font-weight: bold; - border: 2px solid black; + font-size: max(16px, 1vw); } - `; - const ResultList = styled.ul` - margin-top: 20px; - width: 100%; - margin: 0 auto; - li { - display: flex; - width: 75%; - height: 8vh; - margin: 2vh auto 0; - border: 2px solid #000; - border-radius: 40px; - text-align: center; - line-height: 8vh; - background-color: rgba(210, 248, 224, 0.9); - cursor: pointer; - transition: 0.3s; - p:first-child { - font-weight: bold; - font-size: max(16px, 1vw); - } - p { - flex: 1 1 auto; - font-size: max(14px, 1vw); - } - p:nth-child(2) { - flex: 3 1 auto; - } - .imgWrap { - position: relative; - right: 0.5vw; - padding: 0.35vw; - background-color: rgba(210, 248, 224, 0.9); - border-radius: 50px; - } - .imgWrap img { - position: relative; - top: 0.2vw; - width: max(1.1vw, 18px); - height: max(1.1vw, 18px); - } + p { + flex: 1 1 auto; + font-size: max(14px, 1vw); + } + p:nth-child(2) { + flex: 3 1 auto; } .imgWrap { position: relative; right: 0.5vw; + padding: 0.35vw; + background-color: rgba(210, 248, 224, 0.9); + border-radius: 50px; } - li:hover { - background-color: rgba(0, 0, 0, 0.8); - color: #fff; - p { - font-weight: bold; - } + .imgWrap img { + position: relative; + top: 0.2vw; + width: max(1.1vw, 18px); + height: max(1.1vw, 18px); } } + .imgWrap { + position: relative; + right: 0.5vw; + } + li:hover { + background-color: rgba(0, 0, 0, 0.8); + color: #fff; + p { + font-weight: bold; + } + } + li:nth-child(1) { margin-top: 0px; } From 710fbe669198c7675d050619acf08e1b8a2550c9 Mon Sep 17 00:00:00 2001 From: Lee Naeun Date: Wed, 1 Sep 2021 11:58:39 +0900 Subject: [PATCH 2/2] :lipstick: [Client] SearchMore.js : remove css --- client/src/pages/SearchMore.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/client/src/pages/SearchMore.js b/client/src/pages/SearchMore.js index fc14763..826d83b 100644 --- a/client/src/pages/SearchMore.js +++ b/client/src/pages/SearchMore.js @@ -80,10 +80,6 @@ const ResultList = styled.ul` height: max(1.1vw, 18px); } } - .imgWrap { - position: relative; - right: 0.5vw; - } li:hover { background-color: rgba(0, 0, 0, 0.8); color: #fff;