From c03456374a1f6f710ae4c9ef650479b688292617 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 22 May 2020 13:02:23 +0800 Subject: [PATCH] Allow scroll --- web/src/main/frontend/components/sidebar.cljs | 8 ++------ web/src/main/frontend/handler.cljs | 5 ++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/src/main/frontend/components/sidebar.cljs b/web/src/main/frontend/components/sidebar.cljs index e2e3dc90f..d353196f8 100644 --- a/web/src/main/frontend/components/sidebar.cljs +++ b/web/src/main/frontend/components/sidebar.cljs @@ -298,15 +298,11 @@ (handler/hide-right-sidebar) (handler/show-right-sidebar))))} (svg/menu)]]]] - [:main#main.flex-1.relative.z-0.focus:outline-none.overflow-hidden - {:tabIndex "0" - :style {:width "100%" - :height "100%"}} + [:main#main.flex-1.relative.z-0.focus:outline-none.overflow-y-auto + {:tabIndex "0"} [:div#main-content {:style {:width "100%" :height "100%" - :overflow-y "scroll" - :padding-right 17 :box-sizing "content-box"}} [:div.flex.justify-center [:div.flex-1.m-6#main-content-container diff --git a/web/src/main/frontend/handler.cljs b/web/src/main/frontend/handler.cljs index b1349177f..7a02520c7 100644 --- a/web/src/main/frontend/handler.cljs +++ b/web/src/main/frontend/handler.cljs @@ -1086,11 +1086,14 @@ (let [sidebar (dom/by-id "right-sidebar")] (dom/remove-class! (dom/by-id "main-content-container") "right-sidebar-open") - (dom/remove-class! sidebar "enter"))) + (dom/remove-class! sidebar "enter") + (dom/remove-class! (dom/by-id "main") "overflow-hidden") + (dom/add-class! (dom/by-id "main") "overflow-y-auto"))) (defn show-right-sidebar [] (let [sidebar (dom/by-id "right-sidebar")] + (dom/add-class! (dom/by-id "main") "overflow-hidden") (dom/add-class! sidebar "enter") (dom/add-class! (dom/by-id "main-content-container") "right-sidebar-open")))