From 4e0be6e807104d8498a0a271a10b9d417b367287 Mon Sep 17 00:00:00 2001 From: ksbin1025 <ksbin1025@naver.com> Date: Fri, 29 Oct 2021 22:39:59 +0900 Subject: [PATCH] scheduleList --- client/src/components/Schedule/ScheduleItem.js | 4 ++-- client/src/components/Schedule/ScheduleList.js | 14 ++++++-------- .../src/components/Schedule/schedule.module.scss | 4 ++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/client/src/components/Schedule/ScheduleItem.js b/client/src/components/Schedule/ScheduleItem.js index 6a16507..55c02fe 100644 --- a/client/src/components/Schedule/ScheduleItem.js +++ b/client/src/components/Schedule/ScheduleItem.js @@ -26,7 +26,7 @@ const ScheduleItem = () => { <p className={`mb-0 ${styles.period}`}>2021.01.151 ~ 2021.09.35</p> </button> <div id="flush-collapseOne" className="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#scheduleList"> - <div className={`accordion-body px-0 pt-2 ${styles.textBox}`}> + <div className={`accordion-body px-0 pt-2 pb-0 mb-3 ${styles.textBox}`}> <div className="d-flex align-items-start"> <i className="col bi bi-geo-alt fs-5"></i> <div className="col-11"> @@ -35,7 +35,7 @@ const ScheduleItem = () => { </div> dlkasjflsajflasjflsakfjlsajflalsafjsask<br />fjlakdjflajflaksj lksajdlksajs dslkafjlsakflksjflasjflksjslakjflsakjflsajflsakjlasjflksajlfsja <div className="d-flex justify-content-end mt-3"> - <Link className="btn btn-white btn-sm border-dark" to="/schedule/edit">�섏젙</Link> + <Link className="btn btn-light btn-sm border-dark" to="/schedule/edit">�섏젙</Link> <button type="button" className="btn btn-crimson btn-sm ms-2" onClick={delSchedule}>��젣</button> </div> </div> diff --git a/client/src/components/Schedule/ScheduleList.js b/client/src/components/Schedule/ScheduleList.js index d0542a0..a9ed5f3 100644 --- a/client/src/components/Schedule/ScheduleList.js +++ b/client/src/components/Schedule/ScheduleList.js @@ -3,14 +3,12 @@ import styles from "./schedule.module.scss"; const ScheduleList = () => { return ( - <div className={`accordion accordion-flush ${styles.list}`} id="scheduleList"> - <Item /> - <Item /> - <Item /> - <Item /> - <Item /> - <Item /> - <Item /> + <div className={styles.list}> + <div className={`accordion accordion-flush`} id="scheduleList"> + <Item /> + <Item /> + <Item /> + </div> </div> ) } diff --git a/client/src/components/Schedule/schedule.module.scss b/client/src/components/Schedule/schedule.module.scss index 278f48b..c741254 100644 --- a/client/src/components/Schedule/schedule.module.scss +++ b/client/src/components/Schedule/schedule.module.scss @@ -1,5 +1,7 @@ .list { + height: 60vh; overflow-y: auto; + margin-bottom: 10vh; } .activeBtn { @@ -33,6 +35,7 @@ // �④꺼議뚯쓣 �� &[class~="collapsed"] { border-bottom: 0; + & .title { white-space: nowrap; overflow: hidden; @@ -56,6 +59,7 @@ .textBox { white-space: pre-wrap; word-break: break-all; + background-color: #fff5f7; } .header { -- GitLab