diff --git a/modules/restserver/src/main/templates/index.html b/modules/restserver/src/main/templates/index.html index 48f46736..2270acef 100644 --- a/modules/restserver/src/main/templates/index.html +++ b/modules/restserver/src/main/templates/index.html @@ -3,6 +3,7 @@ + diff --git a/modules/webapp/src/main/elm/Page/CollectiveSettings/View.elm b/modules/webapp/src/main/elm/Page/CollectiveSettings/View.elm index 7e12dec4..c2c6287a 100644 --- a/modules/webapp/src/main/elm/Page/CollectiveSettings/View.elm +++ b/modules/webapp/src/main/elm/Page/CollectiveSettings/View.elm @@ -17,7 +17,7 @@ import Util.Size view : Flags -> Model -> Html Msg view flags model = div [ class "collectivesetting-page ui padded grid" ] - [ div [ class "four wide column" ] + [ div [ class "sixteen wide mobile four wide tablet four wide computer column" ] [ h4 [ class "ui top attached ablue-comp header" ] [ text "Collective" ] @@ -54,7 +54,7 @@ view flags model = ] ] ] - , div [ class "twelve wide column" ] + , div [ class "sixteen wide mobile twelve wide tablet twelve wide computer column" ] [ div [ class "" ] (case model.currentTab of Just SourceTab -> diff --git a/modules/webapp/src/main/elm/Page/Login/View.elm b/modules/webapp/src/main/elm/Page/Login/View.elm index 55c73a2b..d5f9bc0e 100644 --- a/modules/webapp/src/main/elm/Page/Login/View.elm +++ b/modules/webapp/src/main/elm/Page/Login/View.elm @@ -13,64 +13,66 @@ view flags model = div [ class "login-page" ] [ div [ class "ui centered grid" ] [ div [ class "row" ] - [ div [ class "six wide column ui segment login-view" ] - [ h1 [ class "ui center aligned icon header" ] - [ img - [ class "ui image" - , src (flags.config.docspellAssetPath ++ "/img/logo-96.png") - ] - [] - , div [ class "content" ] - [ text "Sign in to Docspell" - ] - ] - , Html.form - [ class "ui large error raised form segment" - , onSubmit Authenticate - , autocomplete False - ] - [ div [ class "field" ] - [ label [] [ text "Username" ] - , div [ class "ui left icon input" ] - [ input - [ type_ "text" - , autocomplete False - , onInput SetUsername - , value model.username - , placeholder "Collective / Login" - , autofocus True - ] - [] - , i [ class "user icon" ] [] + [ div [ class "sixteen wide mobile twelve wide tablet six wide computer column" ] + [ div [ class "ui segment login-view" ] + [ h1 [ class "ui center aligned icon header" ] + [ img + [ class "ui image" + , src (flags.config.docspellAssetPath ++ "/img/logo-96.png") + ] + [] + , div [ class "content" ] + [ text "Sign in to Docspell" ] ] - , div [ class "field" ] - [ label [] [ text "Password" ] - , div [ class "ui left icon input" ] - [ input - [ type_ "password" - , autocomplete False - , onInput SetPassword - , value model.password - , placeholder "Password" + , Html.form + [ class "ui large error raised form segment" + , onSubmit Authenticate + , autocomplete False + ] + [ div [ class "field" ] + [ label [] [ text "Username" ] + , div [ class "ui left icon input" ] + [ input + [ type_ "text" + , autocomplete False + , onInput SetUsername + , value model.username + , placeholder "Collective / Login" + , autofocus True + ] + [] + , i [ class "user icon" ] [] ] - [] - , i [ class "lock icon" ] [] + ] + , div [ class "field" ] + [ label [] [ text "Password" ] + , div [ class "ui left icon input" ] + [ input + [ type_ "password" + , autocomplete False + , onInput SetPassword + , value model.password + , placeholder "Password" + ] + [] + , i [ class "lock icon" ] [] + ] + ] + , button + [ class "ui primary fluid button" + , type_ "submit" + ] + [ text "Login" ] ] - , button - [ class "ui primary fluid button" - , type_ "submit" - ] - [ text "Login" - ] - ] - , resultMessage model - , div [ class "ui very basic right aligned segment" ] - [ text "No account? " - , a [ class "ui icon link", Page.href RegisterPage ] - [ i [ class "edit icon" ] [] - , text "Sign up!" + , resultMessage model + , div [ class "ui very basic right aligned segment" ] + [ text "No account? " + , a [ class "ui icon link", Page.href RegisterPage ] + [ i [ class "edit icon" ] [] + , text "Sign up!" + ] ] ] ] diff --git a/modules/webapp/src/main/elm/Page/ManageData/View.elm b/modules/webapp/src/main/elm/Page/ManageData/View.elm index 2b2c94ad..9b5c49a0 100644 --- a/modules/webapp/src/main/elm/Page/ManageData/View.elm +++ b/modules/webapp/src/main/elm/Page/ManageData/View.elm @@ -14,7 +14,7 @@ import Util.Html exposing (classActive) view : Model -> Html Msg view model = div [ class "managedata-page ui padded grid" ] - [ div [ class "four wide column" ] + [ div [ class "sixteen wide mobile four wide tablet four wide computer column" ] [ h4 [ class "ui top attached ablue-comp header" ] [ text "Manage Data" ] @@ -51,7 +51,7 @@ view model = ] ] ] - , div [ class "twelve wide column" ] + , div [ class "sixteen wide mobile twelve wide tablet twelve wide computer column" ] [ div [ class "" ] (case model.currentTab of Just TagTab -> diff --git a/modules/webapp/src/main/elm/Page/NewInvite/View.elm b/modules/webapp/src/main/elm/Page/NewInvite/View.elm index de645310..7e6f8b50 100644 --- a/modules/webapp/src/main/elm/Page/NewInvite/View.elm +++ b/modules/webapp/src/main/elm/Page/NewInvite/View.elm @@ -12,7 +12,7 @@ view flags model = div [ class "newinvite-page" ] [ div [ class "ui centered grid" ] [ div [ class "row" ] - [ div [ class "eight wide column ui segment newinvite-view" ] + [ div [ class "sixteen wide mobile fourteen wide tablet eight wide computer column" ] [ h1 [ class "ui cener aligned icon header" ] [ img [ class "ui image" diff --git a/modules/webapp/src/main/elm/Page/Register/View.elm b/modules/webapp/src/main/elm/Page/Register/View.elm index fc287ec0..e91b466c 100644 --- a/modules/webapp/src/main/elm/Page/Register/View.elm +++ b/modules/webapp/src/main/elm/Page/Register/View.elm @@ -13,7 +13,7 @@ view flags model = div [ class "register-page" ] [ div [ class "ui centered grid" ] [ div [ class "row" ] - [ div [ class "six wide column ui segment register-view" ] + [ div [ class "sixteen wide mobile twelve wide tablet six wide computer column" ] [ h1 [ class "ui cener aligned icon header" ] [ img [ class "ui image" diff --git a/modules/webapp/src/main/elm/Page/UserSettings/View.elm b/modules/webapp/src/main/elm/Page/UserSettings/View.elm index 9bb99c0b..662dc425 100644 --- a/modules/webapp/src/main/elm/Page/UserSettings/View.elm +++ b/modules/webapp/src/main/elm/Page/UserSettings/View.elm @@ -13,7 +13,7 @@ import Util.Html exposing (classActive) view : Model -> Html Msg view model = div [ class "usersetting-page ui padded grid" ] - [ div [ class "four wide column" ] + [ div [ class "sixteen wide mobile four wide tablet four wide computer column" ] [ h4 [ class "ui top attached ablue-comp header" ] [ text "User" ] @@ -25,7 +25,7 @@ view model = ] ] ] - , div [ class "twelve wide column" ] + , div [ class "sixteen wide mobile twelve wide tablet twelve wide computer column" ] [ div [ class "" ] (case model.currentTab of Just ChangePassTab ->