From 93f184a772d2c0394d0f1e5fdb90b96f00460b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=87=E1=85=A1=E1=86=A8=E1=84=8C=E1=85=A5=E1=86=BC?= =?UTF-8?q?=E1=84=89=E1=85=A5=E1=86=A8?= Date: Sun, 10 Sep 2023 18:42:24 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Design:=20=EC=B1=84=EB=84=90=EB=B0=94=20hei?= =?UTF-8?q?ght=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/ChannelBar/ChannelBar.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Sidebar/ChannelBar/ChannelBar.tsx b/src/components/Sidebar/ChannelBar/ChannelBar.tsx index 6a7c6aa..5679619 100644 --- a/src/components/Sidebar/ChannelBar/ChannelBar.tsx +++ b/src/components/Sidebar/ChannelBar/ChannelBar.tsx @@ -88,7 +88,9 @@ const ChannelbarContainer = styled.div` padding: 2rem 0; width: 10rem; - height: 100vh; + + min-height: 100vh; + height: 100%; background-color: #141c24; float: left; From 328be230920a3b35c83001494a524c5066f349a1 Mon Sep 17 00:00:00 2001 From: navyjeongs Date: Thu, 14 Sep 2023 23:38:01 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Style:=20=EC=B1=84=EB=84=90=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B5=9C=EB=8C=80=20?= =?UTF-8?q?height=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/make-channel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/make-channel.tsx b/src/pages/make-channel.tsx index 4623cd1..385de4e 100644 --- a/src/pages/make-channel.tsx +++ b/src/pages/make-channel.tsx @@ -97,7 +97,7 @@ export const fadeIn = keyframes` const Container = styled.div` width: 100%; - min-height: calc(100vh - 5.5rem); + height: calc(100vh - 5.5rem); position: relative; `; From 02f01279c4b51072593337bd41181fca90b49f49 Mon Sep 17 00:00:00 2001 From: navyjeongs Date: Thu, 14 Sep 2023 23:38:47 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Style:=20vh=EB=A5=BC=20=EB=84=98=EC=96=B4?= =?UTF-8?q?=EA=B0=80=EB=A9=B4=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EB=B0=8F=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout.tsx | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/components/layout.tsx b/src/components/layout.tsx index 16b7cb6..0d054cb 100644 --- a/src/components/layout.tsx +++ b/src/components/layout.tsx @@ -39,7 +39,7 @@ const Layout = ({ children }: PropsWithChildren) => {
-
{children}
+
{children}
@@ -52,10 +52,27 @@ const CommonLayout = styled.div` const Wrapper = styled.div` width: 100%; + height: 100vh; `; const SidebarWrapper = styled.div` flex: 0 0; `; +const Main = styled.main` + overflow-y: auto; + + ::-webkit-scrollbar { + width: 1rem; + } + ::-webkit-scrollbar-thumb { + background-color: #202b37; + border-radius: 1rem; + } + ::-webkit-scrollbar-track { + background-color: #344051; + border-radius: 1rem; + } +`; + export default Layout; From 24a2b08971deb1dc3be06d6ab9eeed59838c7172 Mon Sep 17 00:00:00 2001 From: navyjeongs Date: Thu, 14 Sep 2023 23:40:02 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Style:=20height=EB=A5=BC=20=EB=8B=A4?= =?UTF-8?q?=EC=8B=9C=20100vh=EB=A1=9C=20=EB=90=98=EB=8F=8C=EB=A6=AC?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/ChannelBar/ChannelBar.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Sidebar/ChannelBar/ChannelBar.tsx b/src/components/Sidebar/ChannelBar/ChannelBar.tsx index 5679619..7fa29da 100644 --- a/src/components/Sidebar/ChannelBar/ChannelBar.tsx +++ b/src/components/Sidebar/ChannelBar/ChannelBar.tsx @@ -89,8 +89,7 @@ const ChannelbarContainer = styled.div` padding: 2rem 0; width: 10rem; - min-height: 100vh; - height: 100%; + height: 100vh; background-color: #141c24; float: left;