From 6ca60e32f0cbde913d171cd84ed7009ab4281284 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 13 Sep 2015 14:38:08 +0200 Subject: Adding UI to modify the income --- src/server/Design/LoggedIn/Add.hs | 4 ++-- src/server/Design/LoggedIn/Expandables.hs | 27 ++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) (limited to 'src/server/Design/LoggedIn') diff --git a/src/server/Design/LoggedIn/Add.hs b/src/server/Design/LoggedIn/Add.hs index 6d4de69..579cead 100644 --- a/src/server/Design/LoggedIn/Add.hs +++ b/src/server/Design/LoggedIn/Add.hs @@ -15,7 +15,7 @@ import Design.Constants addDesign :: Css addDesign = - form ? do + form # ".addPayment" ? do centeredWithMargin marginBottom blockMarginBottom display flex @@ -28,7 +28,7 @@ addDesign = label ? do fontWeight bold display inlineBlock - width (px 40) + width (px 50) textAlign (alignSide sideCenter) backgroundColor C.darkGrey color C.white diff --git a/src/server/Design/LoggedIn/Expandables.hs b/src/server/Design/LoggedIn/Expandables.hs index 3807da4..66a9b06 100644 --- a/src/server/Design/LoggedIn/Expandables.hs +++ b/src/server/Design/LoggedIn/Expandables.hs @@ -4,6 +4,8 @@ module Design.LoggedIn.Expandables ( expandablesDesign ) where +import Data.Monoid ((<>)) + import Clay import Design.Color as C @@ -31,7 +33,30 @@ expandablesDesign = ".income" ? do backgroundColor C.lightGrey - lineHeight rowHeight padding (px 0) (px 20) (px 0) (px 20) + position relative + lineHeight rowHeight + + input ? do + defaultInput inputHeight + marginLeft (px 20) + marginTop (px (-5)) + width (px 100) + + button ? do + marginLeft (px 20) + paddingLeft (px 15) + paddingRight (px 15) + marginTop (px (-5)) + + ".validateIncomeEdition" <> ".editIncomeEdition" ? + defaultButton C.red C.white (px inputHeight) + + ".undoIncomeEdition" ? + defaultButton C.blue C.white (px inputHeight) + + ".error" ? do + color C.redError + lineHeight (px 30) ".detail" |> ".header" ? borderRadius radius radius 0 0 -- cgit v1.2.3