From 7b06628bacff15d724ae1fc4d7a2dc1e3c9b12fb Mon Sep 17 00:00:00 2001 From: minjoo0729 Date: Wed, 1 Nov 2023 20:24:49 +0900 Subject: [PATCH 1/5] fix(agendaSection): scroll display none --- packages/web/src/components/organisms/AgendaSection.tsx | 2 +- packages/web/src/styles/scroll.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/web/src/components/organisms/AgendaSection.tsx b/packages/web/src/components/organisms/AgendaSection.tsx index f3c2f4e5..57f4b066 100644 --- a/packages/web/src/components/organisms/AgendaSection.tsx +++ b/packages/web/src/components/organisms/AgendaSection.tsx @@ -73,7 +73,7 @@ export const AgendaSection: React.FC = () => { ); return ( -
+
{getAgendaCards("ongoing")} diff --git a/packages/web/src/styles/scroll.ts b/packages/web/src/styles/scroll.ts index 0ad44386..f1ad1b93 100644 --- a/packages/web/src/styles/scroll.ts +++ b/packages/web/src/styles/scroll.ts @@ -26,7 +26,14 @@ const applyDirection = (direction: "x" | "y") => css` } `; +export const hiddenScroll = css` + ::-webkit-scrollbar { + display: none; + } +`; + export const scroll = { x: applyDirection("x"), y: applyDirection("y"), + hidden: hiddenScroll, } as const; From 7b5e0689b8fd642352092c90e3ced923fffca924 Mon Sep 17 00:00:00 2001 From: minjoo0729 Date: Wed, 1 Nov 2023 21:06:26 +0900 Subject: [PATCH 2/5] fix(agendaSection): scroll display --- packages/web/src/styles/scroll.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/web/src/styles/scroll.ts b/packages/web/src/styles/scroll.ts index f1ad1b93..79ed83b6 100644 --- a/packages/web/src/styles/scroll.ts +++ b/packages/web/src/styles/scroll.ts @@ -26,14 +26,12 @@ const applyDirection = (direction: "x" | "y") => css` } `; -export const hiddenScroll = css` - ::-webkit-scrollbar { - display: none; - } -`; - export const scroll = { x: applyDirection("x"), y: applyDirection("y"), - hidden: hiddenScroll, + hidden: css` + ::-webkit-scrollbar { + display: none; + } + `, } as const; From 37af34df3e6d40e0d98f6e372bd8d629cb2196a6 Mon Sep 17 00:00:00 2001 From: minjoo0729 Date: Wed, 8 Nov 2023 20:20:57 +0900 Subject: [PATCH 3/5] fix(scroll): separate scroll and hideScrollBar --- packages/web/src/styles/scroll.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/web/src/styles/scroll.ts b/packages/web/src/styles/scroll.ts index 79ed83b6..fa6cdd6c 100644 --- a/packages/web/src/styles/scroll.ts +++ b/packages/web/src/styles/scroll.ts @@ -1,9 +1,9 @@ import { css } from "@emotion/react"; import { colors } from "@biseo/web/styles/color"; -export const scrollBar = css` - ::-webkit-scrollbar-thumb { - background-color: ${colors.gray400}; +export const hideScrollBar = css` + ::-webkit-scrollbar { + display: none; } `; @@ -17,7 +17,7 @@ const applyDirection = (direction: "x" | "y") => css` ::-webkit-scrollbar-thumb { border: 4px solid transparent; background-clip: padding-box; - + background-color: ${colors.gray400}; border-radius: 100px; } @@ -29,9 +29,4 @@ const applyDirection = (direction: "x" | "y") => css` export const scroll = { x: applyDirection("x"), y: applyDirection("y"), - hidden: css` - ::-webkit-scrollbar { - display: none; - } - `, } as const; From f94658bf1a67b5938557066f592fdc95b5d6f960 Mon Sep 17 00:00:00 2001 From: minjoo0729 Date: Wed, 22 Nov 2023 20:07:22 +0900 Subject: [PATCH 4/5] fix(scroll): change to hideScrollBar --- packages/web/src/components/organisms/AgendaSection.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/src/components/organisms/AgendaSection.tsx b/packages/web/src/components/organisms/AgendaSection.tsx index 57f4b066..686772ac 100644 --- a/packages/web/src/components/organisms/AgendaSection.tsx +++ b/packages/web/src/components/organisms/AgendaSection.tsx @@ -8,7 +8,7 @@ import { isPreparingAgenda, } from "@biseo/web/utils/agenda"; -import { scroll } from "@biseo/web/styles"; +import { hideScrollBar, scroll } from "@biseo/web/styles"; import { css } from "@emotion/react"; const gridLayout = css` @@ -73,7 +73,7 @@ export const AgendaSection: React.FC = () => { ); return ( -
+
{getAgendaCards("ongoing")} From 1b26c3ee73f6e3d57075f114f4c3b7a1b4ed79b6 Mon Sep 17 00:00:00 2001 From: minjoo0729 Date: Thu, 18 Jan 2024 21:50:27 +0900 Subject: [PATCH 5/5] fix(hideScrollBar): update other codes to hideScrollBar --- packages/web/src/components/molecules/ChatInput.tsx | 4 ++-- packages/web/src/components/molecules/ModalInnerTextBox.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/web/src/components/molecules/ChatInput.tsx b/packages/web/src/components/molecules/ChatInput.tsx index 1ef141cf..2512c299 100644 --- a/packages/web/src/components/molecules/ChatInput.tsx +++ b/packages/web/src/components/molecules/ChatInput.tsx @@ -9,7 +9,7 @@ import { h, padding, scroll, - scrollBar, + hideScrollBar, bg, justify, align, @@ -42,7 +42,7 @@ const formStyle = css` const textAreaScrollStyle = css` ${scroll.y} - ${scrollBar} + ${hideScrollBar} overflow-y: scroll; `; diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx index ea4e2b41..eb4cef8c 100644 --- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx +++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx @@ -14,7 +14,7 @@ import { import "@biseo/web/components/atoms/placeholder.css"; import { TrashIcon } from "@biseo/web/assets"; import { css } from "@emotion/react"; -import { scroll, scrollBar } from "@biseo/web/styles"; +import { scroll, hideScrollBar } from "@biseo/web/styles"; interface ModalInnerProps extends PropsWithChildren { title: string; @@ -219,7 +219,7 @@ ModalInner.TextButton = TextButton; const VoteOptions: React.FC = ({ children = null }) => { const scrollTyle = css` ${scroll.y} - ${scrollBar} + ${hideScrollBar} overflow-y: scroll; `; return (