Merge pull request #63 from LikeLionHGU/김예지-style/#60

충돌 해결

src/account/LogIn.js

@@ -12,8 +12,8 @@ import emailicon from "./img/emailicon.png";
 import pwicon from "./img/pwicon.png";
 import kakaologo from "./img/kakaologo.png";
 
+import styles from "./Login.module.css";
 
-import styles from "./LogIn.module.css";
 // import login from "./img/login.png";
 
 const LogIn = () => {

src/banner/Banner.jsx

@@ -1,7 +1,11 @@
+import styles from "./Banner.module.css";
+
 export default function Banner() {
   return (
-    <div>
-      <h2>배너입니다ㅠㅠ</h2>
+    <div className={styles.banner}>
+      <div className={styles.rect}>
+        <h1>슬라이드 1</h1>
+      </div>
     </div>
   );
 }

src/banner/Banner.module.css

@@ -0,0 +1,7 @@
+.rect {
+  width: 100%;
+  height: 550px;
+  border: 1px solid black;
+  margin-top: 90px;
+  margin-bottom: 352px;
+}