From 75c958281e4d4eb9467c2b65e9768dc7a3d70b82 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 8 Aug 2020 16:38:52 +0200 Subject: [PATCH] Redesign search/landing page --- .../webapp/src/main/elm/Comp/ItemCardList.elm | 26 ++++++++----------- .../webapp/src/main/elm/Page/Home/View.elm | 6 ++--- modules/webapp/src/main/webjar/docspell.css | 22 ++++++++++++---- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/modules/webapp/src/main/elm/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Comp/ItemCardList.elm index 6f11d8a4..d7a018fc 100644 --- a/modules/webapp/src/main/elm/Comp/ItemCardList.elm +++ b/modules/webapp/src/main/elm/Comp/ItemCardList.elm @@ -191,22 +191,18 @@ viewItem settings item = , Util.String.underscoreToSpace item.name |> text ] + , div + [ classList + [ ( "ui right corner label", True ) + , ( newColor, True ) + , ( "invisible", isConfirmed ) + ] + , title "New" + ] + [ i [ class "exclamation icon" ] [] + ] , div [ class "meta" ] - [ div - [ classList - [ ( "ui ribbon label", True ) - , ( newColor, True ) - , ( "invisible", isConfirmed ) - ] - ] - [ i [ class "exclamation icon" ] [] - , text " New" - ] - , span - [ classList - [ ( "right floated", not isConfirmed ) - ] - ] + [ span [] [ Util.Time.formatDate item.date |> text ] ] diff --git a/modules/webapp/src/main/elm/Page/Home/View.elm b/modules/webapp/src/main/elm/Page/Home/View.elm index 25365f45..e7083f57 100644 --- a/modules/webapp/src/main/elm/Page/Home/View.elm +++ b/modules/webapp/src/main/elm/Page/Home/View.elm @@ -19,14 +19,14 @@ view flags settings model = div [ class "home-page ui padded grid" ] [ div [ classList - [ ( "sixteen wide mobile six wide tablet four wide computer column" + [ ( "sixteen wide mobile six wide tablet four wide computer search-menu column" , True ) , ( "invisible hidden", model.menuCollapsed ) ] ] [ div - [ class "ui top attached ablue-comp icon menu" + [ class "ui ablue-comp icon menu" ] [ a [ class "borderless item" @@ -62,7 +62,7 @@ view flags settings model = ] ] ] - , div [ class "ui attached fluid segment" ] + , div [ class "" ] [ Html.map SearchMenuMsg (Comp.SearchMenu.viewDrop model.dragDropData flags diff --git a/modules/webapp/src/main/webjar/docspell.css b/modules/webapp/src/main/webjar/docspell.css index 8ae37e61..98cce2e3 100644 --- a/modules/webapp/src/main/webjar/docspell.css +++ b/modules/webapp/src/main/webjar/docspell.css @@ -41,12 +41,12 @@ } .default-layout .main-content { - margin-top: 45px; + margin-top: 44px; padding-bottom: 2em; } .default-layout .top-menu { - background: aliceblue; + background: aliceblue; box-shadow: 1px 1px 0px 0px black; } @@ -170,6 +170,11 @@ textarea.markdown-editor { background: rgba(0,0,0,0.2); } +.default-layout .search-menu { + border-bottom: 2px solid #d8dfe5; + border-right: 2px solid #d8dfe5; + background-color: aliceblue; +} .ui.dimmer.keep-small { justify-content: start; @@ -198,14 +203,21 @@ label span.muted { } .ui.ablue-comp.menu, .ui.menu .ablue-comp.item { - background-color: #fff7f0; + background-color: rgba(255, 247, 240, 1); } .ui.ablue-comp.header { - background-color: #fff7f0; + background-color: rgba(255, 247, 240, 1); } .ui.ablue-shade.menu, .ui.menu .ablue-shade.item { - background-color: #d8dfe5; + background-color: rgba(216, 223, 229, 1); +} + +.ablue-bg { + background-color: aliceblue; +} +.ablue-shade-bg { + background-color: rgba(216, 223, 229, 1); } .ui.selectable.pointer.table tr {