From a8e5ef2b2d912f73b3d5f4727dca6d1f954abe19 Mon Sep 17 00:00:00 2001 From: JitHoon Date: Thu, 18 Jan 2024 16:30:08 +0900 Subject: [PATCH 01/14] =?UTF-8?q?remove:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/fonts/.gitkeep | 0 public/images/.gitkeep | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/fonts/.gitkeep delete mode 100644 public/images/.gitkeep 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 From 1c383e173e0e74e62dd8f330473baa8bbdd25d26 Mon Sep 17 00:00:00 2001 From: JitHoon Date: Thu, 18 Jan 2024 16:31:11 +0900 Subject: [PATCH 02/14] =?UTF-8?q?design:=20=EB=8C=80=EC=8B=9C=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=ED=97=A4=EB=8D=94=20=EB=93=B1=EB=A1=9D=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20hover=20=ED=9A=A8=EA=B3=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/DashboardHeader/index.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/common/DashboardHeader/index.tsx b/src/components/common/DashboardHeader/index.tsx index bdc21a4e..db7692ca 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,14 @@ 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; - cursor: pointer; + transition: all 0.5s; + + &:hover { + color: black; + background: #e9eef6; + } `; From d1b93c22a1c9e43e940924dea203744cd8a4bcd5 Mon Sep 17 00:00:00 2001 From: JitHoon Date: Thu, 18 Jan 2024 16:32:11 +0900 Subject: [PATCH 03/14] =?UTF-8?q?design:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20?= =?UTF-8?q?=EB=B0=98=EC=9D=91=ED=98=95=20Layout=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Layout/index.tsx | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/components/common/Layout/index.tsx b/src/components/common/Layout/index.tsx index 89cb5926..834e64db 100644 --- a/src/components/common/Layout/index.tsx +++ b/src/components/common/Layout/index.tsx @@ -41,6 +41,7 @@ const Container = styled.div` const Section = styled.section` width: 100%; + min-width: calc(100vh - 100px); height: 100vh; margin-left: 100px; @@ -48,9 +49,15 @@ const Section = styled.section` display: flex; flex-direction: column; + + @media screen and (max-width: 1200px) { + min-width: 0; + + margin-left: 0; + padding: 0; + } `; -//HACK: 타입 분리 예정! const OutletLayout = styled.div` width: 100%; height: 100vh; @@ -70,4 +77,14 @@ const OutletLayout = styled.div` }}; overflow: scroll; + + @media screen and (max-width: 1200px) { + width: 100vw; + + margin-top: 0; + border-radius: 0; + + overflow-x: hidden; + overflow-y: scroll; + } `; From 6737d22aa940ae4d8be8abb7246ebc351bca26b6 Mon Sep 17 00:00:00 2001 From: JitHoon Date: Thu, 18 Jan 2024 16:34:41 +0900 Subject: [PATCH 04/14] =?UTF-8?q?design:=20=ED=97=A4=EB=8D=94=20=EB=AA=A8?= =?UTF-8?q?=EB=B0=94=EC=9D=BC=20=EB=B0=98=EC=9D=91=ED=98=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Layout/Header/index.tsx | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/components/common/Layout/Header/index.tsx b/src/components/common/Layout/Header/index.tsx index 22ef7b1c..241258a7 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 = () => { /> +