From 752c8f9be2d295cbc7a9dd39acfea18a131fabf1 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Fri, 8 Jan 2021 01:33:55 +0100 Subject: [PATCH] Show new-invite as normal page --- modules/webapp/src/main/elm/App/View.elm | 11 ----------- modules/webapp/src/main/elm/Page/NewInvite/View.elm | 9 +-------- modules/webapp/src/main/webjar/docspell.css | 6 +++--- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/modules/webapp/src/main/elm/App/View.elm b/modules/webapp/src/main/elm/App/View.elm index 37b035db..e3bfa466 100644 --- a/modules/webapp/src/main/elm/App/View.elm +++ b/modules/webapp/src/main/elm/App/View.elm @@ -28,9 +28,6 @@ view model = RegisterPage -> registerLayout model - NewInvitePage -> - newInviteLayout model - _ -> defaultLayout model @@ -51,14 +48,6 @@ loginLayout model = ] -newInviteLayout : Model -> Html Msg -newInviteLayout model = - div [ class "newinvite-layout" ] - [ viewNewInvite model - , footer model - ] - - defaultLayout : Model -> Html Msg defaultLayout model = div [ class "default-layout" ] diff --git a/modules/webapp/src/main/elm/Page/NewInvite/View.elm b/modules/webapp/src/main/elm/Page/NewInvite/View.elm index 95ef0723..e7bac68e 100644 --- a/modules/webapp/src/main/elm/Page/NewInvite/View.elm +++ b/modules/webapp/src/main/elm/Page/NewInvite/View.elm @@ -14,14 +14,7 @@ view flags model = [ div [ class "row" ] [ div [ class "sixteen wide mobile fourteen wide tablet eight wide computer column" ] [ h1 [ class "ui cener aligned icon header" ] - [ img - [ class "ui image" - , src (flags.config.docspellAssetPath ++ "/img/logo-96.png") - ] - [] - , div [ class "content" ] - [ text "Create new invitations" - ] + [ text "Create new invitations" ] , inviteMessage flags , Html.form diff --git a/modules/webapp/src/main/webjar/docspell.css b/modules/webapp/src/main/webjar/docspell.css index ee1b63a3..fdf3cf4f 100644 --- a/modules/webapp/src/main/webjar/docspell.css +++ b/modules/webapp/src/main/webjar/docspell.css @@ -340,15 +340,15 @@ label span.muted { border: 0; } -.login-layout, .register-layout, .newinvite-layout { +.login-layout, .register-layout { background: #708090; height: 100vh; } -.login-layout > .ui.footer, .register-layout > .ui.footer, .newinvite-layout > .ui.footer { +.login-layout > .ui.footer, .register-layout > .ui.footer { background: #708090; } -.login-layout .login-view, .register-layout .register-view, .newinvite-view { +.login-layout .login-view, .register-layout .register-view { background: #fff; position: relative; top: 2vh;