diff --git a/public/fonts/.gitkeep b/public/fonts/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/public/images/.gitkeep b/public/images/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/components/Report/LeftSection/Graph/index.tsx b/src/components/Report/LeftSection/Graph/index.tsx index f1815232..af6a9998 100644 --- a/src/components/Report/LeftSection/Graph/index.tsx +++ b/src/components/Report/LeftSection/Graph/index.tsx @@ -13,15 +13,15 @@ const Graph = ({ graphData }: { graphData: ReportGraphProps }) => { { label: '전체 매출', data: graphData.map(data => parseInt(data.total_sales)), - backgroundColor: '#022c79e0', - borderColor: '#022c79', + backgroundColor: '#3182F6', + borderColor: '#3182F6', borderWidth: 1, borderRadius: 5 }, { label: '쿠폰 적용 매출', data: graphData.map(data => parseInt(data.coupon_total_sales)), - backgroundColor: '#ff3478e0', + backgroundColor: '#FF3478', borderColor: '#FF3478', borderWidth: 1, borderRadius: 5 diff --git a/src/components/Report/RightSection/Catchphrase/index.tsx b/src/components/Report/RightSection/Catchphrase/index.tsx index 6aad6d99..304922d1 100644 --- a/src/components/Report/RightSection/Catchphrase/index.tsx +++ b/src/components/Report/RightSection/Catchphrase/index.tsx @@ -1,3 +1,4 @@ +import { keyframes } from '@emotion/react'; import styled from '@emotion/styled'; import rocket from '@assets/icons/ic-catchphrase-rocket.svg'; @@ -14,7 +15,8 @@ const Catchphrase = () => { {'연도별 쿠폰 사용 현황을'}
- {'빠르게 확인해보세요!'} + 빠르게 + {' 확인해보세요!'}
{ export default Catchphrase; +const rocketRising = keyframes` + 0% { + opacity: 0; + transform: translateX(-300px) translateY(50px) rotate(90deg); + } + 100% { + opacity: 1; + transform: translateX(0) translateY(0) rotate(0deg); + } +`; + const Container = styled.div` position: relative; @@ -49,7 +62,7 @@ const Content = styled.div` gap: 16px; `; -const Title = styled.span` +const Title = styled.p` font-size: 17px; font-weight: 700; @@ -60,8 +73,12 @@ const Text = styled.span` color: #415574; font-size: 13px; font-weight: 700; - line-height: 145%; + + & > span { + display: inline; + box-shadow: inset 0 -7px 0 #ffddf9; + } `; const RocketIcon = styled.img` @@ -72,4 +89,6 @@ const RocketIcon = styled.img` width: 120px; max-height: 120px; + + animation: ${rocketRising} 1s; `; diff --git a/src/components/common/DashboardHeader/index.tsx b/src/components/common/DashboardHeader/index.tsx index bdc21a4e..9a582bed 100644 --- a/src/components/common/DashboardHeader/index.tsx +++ b/src/components/common/DashboardHeader/index.tsx @@ -41,6 +41,7 @@ const Container = styled.div` display: flex; justify-content: space-between; + align-items: flex-end; `; const MenuContainer = styled.div` @@ -49,7 +50,7 @@ const MenuContainer = styled.div` const DashboardNavigation = styled.div` margin-right: 45px; - padding: 16px 0; + padding: 10px 0; border-bottom: ${props => props.$pathname === '/' ? '3px solid #001d6c' : 'none'}; @@ -81,9 +82,13 @@ const Button = styled.button` justify-content: center; align-items: center; - background: linear-gradient(273deg, #ff0a5c 43.78%, #ff4281 99.72%); + background: linear-gradient(91deg, #ff3478 1.39%, #ff83ad 98.63%); color: white; font-size: 17px; - + font-weight: 700; cursor: pointer; + + &:hover { + background: #b22655; + } `; diff --git a/src/components/common/Layout/Header/Select/index.tsx b/src/components/common/Layout/Header/Select/index.tsx index 757ca45e..8572d2b7 100644 --- a/src/components/common/Layout/Header/Select/index.tsx +++ b/src/components/common/Layout/Header/Select/index.tsx @@ -81,8 +81,6 @@ const Accommodations = styled.select` border-radius: 12px; padding: 10px 20px; - display: inline-block; - font-weight: 500; color: rgba(60, 60, 67, 0.6); @@ -94,6 +92,16 @@ const Accommodations = styled.select` &::-ms-expand { display: none; } + + ${theme.response.tablet} { + width: 150px; + height: 30px; + + margin-right: 0; + padding: 0 20px; + + font-size: 12px; + } `; const Accommodation = styled.option` diff --git a/src/components/common/Layout/Header/User/UserModal/index.tsx b/src/components/common/Layout/Header/User/UserModal/index.tsx index f4a1d540..42e53a22 100644 --- a/src/components/common/Layout/Header/User/UserModal/index.tsx +++ b/src/components/common/Layout/Header/User/UserModal/index.tsx @@ -1,6 +1,7 @@ import styled from '@emotion/styled'; import { UserModal, UserModalStyleProps } from '@/types/layout'; +import theme from '@styles/theme'; const UserModal = ({ isOpen }: UserModal) => { // HACK: cookie에서 사용자 정보 가져오기 @@ -33,6 +34,13 @@ const Modal = styled.div` background-color: #e3e5e5; transition: all 0.5s; + + ${theme.response.tablet} { + right: 35px; + top: 45px; + + width: ${props => (props.$isOpen ? '300px' : 0)}; + } `; const UserInformation = styled.div` diff --git a/src/components/common/Layout/Header/User/index.tsx b/src/components/common/Layout/Header/User/index.tsx index 11a55bfe..2b565f74 100644 --- a/src/components/common/Layout/Header/User/index.tsx +++ b/src/components/common/Layout/Header/User/index.tsx @@ -3,6 +3,7 @@ import styled from '@emotion/styled'; import user from '@assets/icons/ic-header-user.svg'; import UserModal from './UserModal'; +import theme from '@styles/theme'; const User = () => { const [isUserModalOpen, setIsUserModalOpen] = useState(false); @@ -29,4 +30,9 @@ const UserIcon = styled.img` border-radius: 50%; cursor: pointer; + + ${theme.response.tablet} { + width: 24px; + height: 24px; + } `; diff --git a/src/components/common/Layout/Header/index.tsx b/src/components/common/Layout/Header/index.tsx index 22ef7b1c..8df75d97 100644 --- a/src/components/common/Layout/Header/index.tsx +++ b/src/components/common/Layout/Header/index.tsx @@ -3,8 +3,8 @@ import styled from '@emotion/styled'; import logo from '@assets/icons/ic-logo.svg'; import Select from './Select'; -import theme from '@styles/theme'; import User from './User'; +import theme from '@styles/theme'; const Header = () => { return ( @@ -19,6 +19,7 @@ const Header = () => { /> +