further beautification. looks a bit like NEAT1 now

This commit is contained in:
Nicole Dresselhaus 2015-08-09 03:17:36 +02:00
parent 44653b7504
commit fc3432b834
3 changed files with 50 additions and 12 deletions

View File

@ -66,6 +66,7 @@ instance Yesod App where
pc <- widgetToPageContent $ do pc <- widgetToPageContent $ do
addStylesheet $ StaticR css_bootstrap_css addStylesheet $ StaticR css_bootstrap_css
addStylesheet $ StaticR css_neat_css
addScript $ StaticR js_jquery_js addScript $ StaticR js_jquery_js
addScript $ StaticR js_bootstrap_js addScript $ StaticR js_bootstrap_js
$(widgetFile "default-layout") $(widgetFile "default-layout")

View File

@ -32,13 +32,13 @@ getWalletDetailsR hrs days = loginOrDo (\(uid,user) -> do
<a href="@{WalletDetailsR hrs' days}" .btn .active role="button">#{cap} <a href="@{WalletDetailsR hrs' days}" .btn .active role="button">#{cap}
$else $else
<a href="@{WalletDetailsR hrs' days}" .btn role="button">#{cap} <a href="@{WalletDetailsR hrs' days}" .btn role="button">#{cap}
<table .table .table-striped .table-condensed .small> <table .table .table-condensed .small>
<tr> <tr>
<th .text-center>Time <th .text-center>Time
<th .text-center>P/C <th .text-center>P/C
<th .text-center>B/S <th .text-center>B/S
<th .text-center>Item <th .text-center>Item
<th .text-center>Quantity <th .text-center>##
<th .text-center>ISK/Item <th .text-center>ISK/Item
<th .text-center>ISK total <th .text-center>ISK total
<th .text-center>ISK profit <th .text-center>ISK profit
@ -60,29 +60,29 @@ getWalletDetailsR hrs days = loginOrDo (\(uid,user) -> do
$else $else
<td .buyTransaction .text-center>B <td .buyTransaction .text-center>B
<td>#{transactionTypeName t} <td>#{transactionTypeName t}
<td .text-right>#{transactionQuantity t} <td .numeric>#{transactionQuantity t}
<td .text-right>#{prettyISK $ transactionPriceCents t} <td .numeric>#{prettyISK $ transactionPriceCents t}
<td .text-right>#{prettyISK $ transactionQuantity t * transactionPriceCents t} <td .numeric>#{prettyISK $ transactionQuantity t * transactionPriceCents t}
$maybe profit <- transRealProfit t $maybe profit <- transRealProfit t
$if (&&) (transactionTransIsSell t) (profit > 0) $if (&&) (transactionTransIsSell t) (profit > 0)
<td .text-right .profit> <td .numeric .profit>
#{prettyISK $ profit} #{prettyISK $ profit}
$elseif (&&) (transactionTransIsSell t) (profit < 0) $elseif (&&) (transactionTransIsSell t) (profit < 0)
<td .text-right .loss> <td .numeric .loss>
#{prettyISK $ profit} #{prettyISK $ profit}
$elseif (transactionTransIsSell t) $elseif not (transactionTransIsSell t)
<td .text-right .buyfee> <td .numeric .buyfee>
#{prettyISK $ profit} #{prettyISK $ profit}
$else $else
<td .text-right> <td ..numeric>
#{prettyISK $ profit} #{prettyISK $ profit}
<td .text-right> <td .numeric>
#{profitPercent profit t}% #{profitPercent profit t}%
$nothing $nothing
<td> <td>
- -
<td> <td>
<td> <td .duration>
$maybe secs <- transactionSecondsToSell t $maybe secs <- transactionSecondsToSell t
#{showSecsToSell secs} #{showSecsToSell secs}
$nothing $nothing

37
static/css/neat.css Normal file
View File

@ -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;
}