From ff0b70abfe7cb16d47c5a9553db43ffca368552f Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 27 Mar 2021 22:04:44 +0100 Subject: [PATCH] Fix scrollbar position --- .../webapp/src/main/elm/Page/Upload/View2.elm | 50 ++++++++++--------- modules/webapp/src/main/elm/Styles.elm | 2 +- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/modules/webapp/src/main/elm/Page/Upload/View2.elm b/modules/webapp/src/main/elm/Page/Upload/View2.elm index 3d510083..a685c50b 100644 --- a/modules/webapp/src/main/elm/Page/Upload/View2.elm +++ b/modules/webapp/src/main/elm/Page/Upload/View2.elm @@ -34,35 +34,37 @@ viewContent mid _ _ model = [ id "content" , class S.content ] - [ div [ class "px-0 flex flex-col" ] - [ div [ class "py-4" ] - [ renderForm model - ] - , div [ class "py-0" ] - [ Html.map DropzoneMsg - (Comp.Dropzone.view2 model.dropzone) - ] - , div [ class "py-4" ] - [ a - [ class S.primaryButton - , href "#" - , onClick SubmitUpload + [ div [ class "container mx-auto" ] + [ div [ class "px-0 flex flex-col" ] + [ div [ class "py-4" ] + [ renderForm model ] - [ text "Submit" + , div [ class "py-0" ] + [ Html.map DropzoneMsg + (Comp.Dropzone.view2 model.dropzone) ] - , a - [ class S.secondaryButton - , class "ml-2" - , href "#" - , onClick Clear - ] - [ text "Reset" + , div [ class "py-4" ] + [ a + [ class S.primaryButton + , href "#" + , onClick SubmitUpload + ] + [ text "Submit" + ] + , a + [ class S.secondaryButton + , class "ml-2" + , href "#" + , onClick Clear + ] + [ text "Reset" + ] ] ] + , renderErrorMsg model + , renderSuccessMsg (Util.Maybe.nonEmpty mid) model + , renderUploads model ] - , renderErrorMsg model - , renderSuccessMsg (Util.Maybe.nonEmpty mid) model - , renderUploads model ] diff --git a/modules/webapp/src/main/elm/Styles.elm b/modules/webapp/src/main/elm/Styles.elm index 0be1a211..93cb4dd0 100644 --- a/modules/webapp/src/main/elm/Styles.elm +++ b/modules/webapp/src/main/elm/Styles.elm @@ -18,7 +18,7 @@ sidebarMenuItemActive = content : String content = - "container mx-auto px-2 h-screen-12 overflow-y-auto scrollbar-main scrollbar-thin" + "w-full mx-auto px-2 h-screen-12 overflow-y-auto scrollbar-main scrollbar-thin" sidebarLink : String