From fb5629d7f705b7e80dcf1852da58d2864c2b0d25 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 19 Jun 2016 01:00:53 +0200 Subject: Show payment count and sum right after search --- src/server/Design/LoggedIn/Home.hs | 20 +++++++++---------- src/server/Design/LoggedIn/Home/Add.hs | 1 - src/server/Design/LoggedIn/Home/Expandables.hs | 27 -------------------------- src/server/Design/LoggedIn/Home/Monthly.hs | 23 ++++++++++++++++++++++ src/server/Design/LoggedIn/Home/Search.hs | 11 +++++++---- src/server/Design/LoggedIn/Stat.hs | 2 ++ 6 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 src/server/Design/LoggedIn/Home/Expandables.hs create mode 100644 src/server/Design/LoggedIn/Home/Monthly.hs (limited to 'src/server/Design/LoggedIn') diff --git a/src/server/Design/LoggedIn/Home.hs b/src/server/Design/LoggedIn/Home.hs index c0a8566..47bfc84 100644 --- a/src/server/Design/LoggedIn/Home.hs +++ b/src/server/Design/LoggedIn/Home.hs @@ -6,16 +6,16 @@ module Design.LoggedIn.Home import Clay -import qualified Design.LoggedIn.Home.Add as AddDesign -import qualified Design.LoggedIn.Home.Expandables as ExpandablesDesign -import qualified Design.LoggedIn.Home.Search as SearchDesign -import qualified Design.LoggedIn.Home.Table as TableDesign -import qualified Design.LoggedIn.Home.Pages as PagesDesign +import qualified Design.LoggedIn.Home.Add as Add +import qualified Design.LoggedIn.Home.Monthly as Monthly +import qualified Design.LoggedIn.Home.Search as Search +import qualified Design.LoggedIn.Home.Table as Table +import qualified Design.LoggedIn.Home.Pages as Pages design :: Css design = do - form # ".addPayment" ? AddDesign.design - ".expandables" ? ExpandablesDesign.design - ".search" ? SearchDesign.design - ".table" ? TableDesign.design - ".pages" ? PagesDesign.design + form # ".addPayment" ? Add.design + ".monthly" ? Monthly.design + ".search" ? Search.design + ".table" ? Table.design + ".pages" ? Pages.design diff --git a/src/server/Design/LoggedIn/Home/Add.hs b/src/server/Design/LoggedIn/Home/Add.hs index 6856af9..ce64077 100644 --- a/src/server/Design/LoggedIn/Home/Add.hs +++ b/src/server/Design/LoggedIn/Home/Add.hs @@ -15,7 +15,6 @@ import Design.Constants design :: Css design = do centeredWithMargin - marginBottom blockMarginBottom display flex "justify-content" -: "center" diff --git a/src/server/Design/LoggedIn/Home/Expandables.hs b/src/server/Design/LoggedIn/Home/Expandables.hs deleted file mode 100644 index 36ba67d..0000000 --- a/src/server/Design/LoggedIn/Home/Expandables.hs +++ /dev/null @@ -1,27 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} - -module Design.LoggedIn.Home.Expandables - ( design - ) where - -import Clay - -import Design.Color as Color -import Design.Helper -import Design.Constants - -design :: Css -design = do - - ".expand" ? do - position absolute - right blockPadding - bottom (px 0) - - ".monthlyPayments" ? expandBlock Color.gothic Color.white (px inputHeight) - - ".account" ? do - expandBlock Color.mossGreen Color.white (px inputHeight) - ".userName" ? marginRight (px 10) - - ".detail" |> ".header" ? borderRadius radius radius 0 0 diff --git a/src/server/Design/LoggedIn/Home/Monthly.hs b/src/server/Design/LoggedIn/Home/Monthly.hs new file mode 100644 index 0000000..5e976ef --- /dev/null +++ b/src/server/Design/LoggedIn/Home/Monthly.hs @@ -0,0 +1,23 @@ +{-# LANGUAGE OverloadedStrings #-} + +module Design.LoggedIn.Home.Monthly + ( design + ) where + +import Clay + +import Design.Color as Color +import Design.Helper +import Design.Constants + +design :: Css +design = do + + expandBlock Color.gothic Color.white (px inputHeight) + + ".expand" ? do + position absolute + right blockPadding + bottom (px 0) + + ".detail" |> ".header" ? borderRadius radius radius 0 0 diff --git a/src/server/Design/LoggedIn/Home/Search.hs b/src/server/Design/LoggedIn/Home/Search.hs index 0292eaa..1bc91ef 100644 --- a/src/server/Design/LoggedIn/Home/Search.hs +++ b/src/server/Design/LoggedIn/Home/Search.hs @@ -6,11 +6,14 @@ module Design.LoggedIn.Home.Search import Clay -import Design.Color as Color import Design.Constants -import Design.Helper design :: Css design = do - expandBlock Color.gothic Color.white (px inputHeight) - ".label" ? marginRight (px 10) + marginBottom blockMarginBottom + marginLeft (pct blockPercentMargin) + marginRight (pct blockPercentMargin) + + ".textInput" ? do + display inlineBlock + marginRight (px 30) diff --git a/src/server/Design/LoggedIn/Stat.hs b/src/server/Design/LoggedIn/Stat.hs index ff44a9d..62028cb 100644 --- a/src/server/Design/LoggedIn/Stat.hs +++ b/src/server/Design/LoggedIn/Stat.hs @@ -10,4 +10,6 @@ design :: Css design = do h1 ? paddingBottom (px 0) + ".exceedingPayers" ? ".userName" ? marginRight (px 5) + ".mean" ? marginBottom (em 1.5) -- cgit v1.2.3