From fc3432b834e255160bbf496af216961c66519875 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sun, 9 Aug 2015 03:17:36 +0200 Subject: [PATCH] further beautification. looks a bit like NEAT1 now --- Foundation.hs | 1 + Handler/Wallet.hs | 24 ++++++++++++------------ static/css/neat.css | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 static/css/neat.css diff --git a/Foundation.hs b/Foundation.hs index e9090fe..a48fe76 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -66,6 +66,7 @@ instance Yesod App where pc <- widgetToPageContent $ do addStylesheet $ StaticR css_bootstrap_css + addStylesheet $ StaticR css_neat_css addScript $ StaticR js_jquery_js addScript $ StaticR js_bootstrap_js $(widgetFile "default-layout") diff --git a/Handler/Wallet.hs b/Handler/Wallet.hs index 5146fbf..325aecd 100644 --- a/Handler/Wallet.hs +++ b/Handler/Wallet.hs @@ -32,13 +32,13 @@ getWalletDetailsR hrs days = loginOrDo (\(uid,user) -> do #{cap} $else #{cap} - +
Time P/C B/S Item - Quantity + ## ISK/Item ISK total ISK profit @@ -60,29 +60,29 @@ getWalletDetailsR hrs days = loginOrDo (\(uid,user) -> do $else B #{transactionTypeName t} - #{transactionQuantity t} - #{prettyISK $ transactionPriceCents t} - #{prettyISK $ transactionQuantity t * transactionPriceCents t} + #{transactionQuantity t} + #{prettyISK $ transactionPriceCents t} + #{prettyISK $ transactionQuantity t * transactionPriceCents t} $maybe profit <- transRealProfit t $if (&&) (transactionTransIsSell t) (profit > 0) - + #{prettyISK $ profit} $elseif (&&) (transactionTransIsSell t) (profit < 0) - + #{prettyISK $ profit} - $elseif (transactionTransIsSell t) - + $elseif not (transactionTransIsSell t) + #{prettyISK $ profit} $else - + #{prettyISK $ profit} - + #{profitPercent profit t}% $nothing - - + $maybe secs <- transactionSecondsToSell t #{showSecsToSell secs} $nothing diff --git a/static/css/neat.css b/static/css/neat.css new file mode 100644 index 0000000..f611d54 --- /dev/null +++ b/static/css/neat.css @@ -0,0 +1,37 @@ +.corpTransaction { + background-color: #3333cc; +} + +.personalTransaction { + background-color: #ffffcc; +} + +.sellTransaction { + background-color: #33cc33; +} + +.buyTransaction { + background-color: #ffcccc; +} + +.profit { + background-color: #88ff88; +} + +.loss { + background-color: #ff8888; +} + +.buyfee { + background-color: #ffe8e8; +} + +.numeric { + text-align: right; + font-family: monospace; +} + +.duration { + text-align: right; + font-family: monospace; +}