diff --git a/src/components/BottomNavbar/styles.ts b/src/components/BottomNavbar/styles.ts index 06b24b4..60bf7a5 100644 --- a/src/components/BottomNavbar/styles.ts +++ b/src/components/BottomNavbar/styles.ts @@ -49,6 +49,7 @@ export const MobileNavbar = { font-family: var(--font-바른히피); font-size: ${(props: ActiveNav) => (props.active ? '2.3vh' : '2vh')}; opacity: ${(props: ActiveNav) => (props.active ? '1' : '.9')}; + background-color: ${(props: ActiveNav) => (props.active ? 'rgba(25, 118, 210, 0.04)' : 'none')}; font-weight: 600; min-width: 32px; width: 100%; diff --git a/src/components/PaperBox/styles.ts b/src/components/PaperBox/styles.ts index 0982bdd..d653b37 100644 --- a/src/components/PaperBox/styles.ts +++ b/src/components/PaperBox/styles.ts @@ -14,7 +14,7 @@ type Group = { const styles = { Icon: styled.span``, Group: styled(Paper)` - padding: 0.2em 0.5em 0 0.5em; + padding: 0.2em 0.5em; margin: 1vh 0; background-color: ${(props: Group) => props.color || '#e0e0e0'}; border-radius: 0.3em; diff --git a/src/components/PaperList/AlertList/styles.ts b/src/components/PaperList/AlertList/styles.ts index 7f602a4..1783156 100644 --- a/src/components/PaperList/AlertList/styles.ts +++ b/src/components/PaperList/AlertList/styles.ts @@ -1,5 +1,6 @@ import styled from '@emotion/styled'; import { Content as _Content } from '../styles'; +import { Button } from '@mui/material'; type GroupProps = { backgroundColor?: boolean; @@ -26,8 +27,9 @@ export const Time = styled.span` margin-right: 1rem; `; -export const AlertFullArrow = styled.div` +export const AlertFullArrow = styled(Button)` display: flex; justify-content: center; - margin-bottom: 0.6rem; + padding: 1vh 0; + width: 100%; `; diff --git a/src/main.tsx b/src/main.tsx index 0200489..73a80ea 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -17,7 +17,6 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( - , ); diff --git a/src/pages/MainPage/Calendar/Calendar.css b/src/pages/MainPage/Calendar/Calendar.css index e4f51b7..505ded7 100644 --- a/src/pages/MainPage/Calendar/Calendar.css +++ b/src/pages/MainPage/Calendar/Calendar.css @@ -5,6 +5,7 @@ background: white; font-family: Arial, Helvetica, sans-serif; line-height: 1.125em; + overflow: hidden; } /* 요일 칸에 abbr태그의 기본 속성인 밑줄 제거 */ diff --git a/src/pages/MainPage/Calendar/index.tsx b/src/pages/MainPage/Calendar/index.tsx index c9f530e..895da2d 100644 --- a/src/pages/MainPage/Calendar/index.tsx +++ b/src/pages/MainPage/Calendar/index.tsx @@ -5,7 +5,7 @@ import { TileArgs } from 'react-calendar/dist/cjs/shared/types'; import EventDetail from '../CalendarEventDetail'; import { CalendarStick, StickWrapper } from '../styles'; import './Calendar.css'; -// import { Image } from './styles'; +import s from './styles'; const RCalendar = memo(({ state }: { state: string }) => { const [currentDate, setCurrentMonth] = useState(new Date()); @@ -83,7 +83,7 @@ const RCalendar = memo(({ state }: { state: string }) => { /** TODO: 투명도 적용한 image로 교체, css에서 .react-calendar__month-view의 backImg로 설정 */ return ( -
+ {/* */} { setFullScreen={setFullScreen} /> )} -
+ ); }); diff --git a/src/pages/MainPage/Calendar/styles.ts b/src/pages/MainPage/Calendar/styles.ts index 2553713..82e6494 100644 --- a/src/pages/MainPage/Calendar/styles.ts +++ b/src/pages/MainPage/Calendar/styles.ts @@ -5,4 +5,9 @@ const Image = styled.img` opacity: 0.2; //투명도 28% pointer-events: none; // 마우스 이벤트 통과 `; -export default Image; + +const Wrapper = styled.div` + overflow: hidden; + height: ${(props: {isExpand: boolean}) => props.isExpand ? '100%' : 'auto'}; +` +export default { Image, Wrapper }; diff --git a/src/pages/MainPage/CalendarEventDetail/styles.ts b/src/pages/MainPage/CalendarEventDetail/styles.ts index bd07553..d780c64 100644 --- a/src/pages/MainPage/CalendarEventDetail/styles.ts +++ b/src/pages/MainPage/CalendarEventDetail/styles.ts @@ -45,7 +45,6 @@ const EventDetail = { overflow-y: auto; overflow-x: hidden; height: 100%; - width: 100%; padding-left: 5px; `, Content: styled.div` diff --git a/src/pages/MainPage/index.tsx b/src/pages/MainPage/index.tsx index caed648..1ecf05c 100644 --- a/src/pages/MainPage/index.tsx +++ b/src/pages/MainPage/index.tsx @@ -20,11 +20,10 @@ function MainPage() { {calendarState === 'expand' && ( - + setCalendarState('normal')}> setCalendarState('normal')} /> )} @@ -40,11 +39,10 @@ function MainPage() { {calendarState === 'normal' && ( - + setCalendarState('expand')}> setCalendarState('expand')} /> )} diff --git a/src/pages/MainPage/styles.ts b/src/pages/MainPage/styles.ts index 3f1743c..06129da 100644 --- a/src/pages/MainPage/styles.ts +++ b/src/pages/MainPage/styles.ts @@ -100,7 +100,6 @@ export const AlertList = styled.div` const AlertCard = { // 전체 카드 Group: styled.div` - margin-bottom: 5px; background-color: #e0e0e0; height: 5%; `, diff --git a/src/pages/NoticePage/index.tsx b/src/pages/NoticePage/index.tsx index 5a7a301..a52bbc1 100644 --- a/src/pages/NoticePage/index.tsx +++ b/src/pages/NoticePage/index.tsx @@ -75,8 +75,8 @@ function NoticePage() { {alerts?.map((data) => )} {alerts.length !== 1 && ( - - + + )} @@ -85,8 +85,8 @@ function NoticePage() { {alerts.length !== 1 && ( - - + + )}