From e1bd767f61157c556ba3a983a57b05a1c6ce6577 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 27 Nov 2010 22:11:12 +0000 Subject: [PATCH] web: refactor: begin layout cleanup --- hledger-web/Hledger/Web/App.hs | 10 +++++----- hledger-web/data/static/style.css | 16 +++++++++------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/hledger-web/Hledger/Web/App.hs b/hledger-web/Hledger/Web/App.hs index fedfd4f4f..f22d677f4 100644 --- a/hledger-web/Hledger/Web/App.hs +++ b/hledger-web/Hledger/Web/App.hs @@ -512,8 +512,8 @@ getJournalR = do td = mktd{here=here, title="hledger journal", msg=msg, a=a, p=p, j=j, today=today} editform' = editform td hamletToRepHtml $ pageLayout td [$hamlet| -%div.ledger - %div.accounts!style=float:left; ^br^ +%div#ledger + %div#accounts ^br^ ^navlinks.td^ ^addform.td^ ^editform'^ @@ -543,8 +543,8 @@ getRegisterR = do td = mktd{here=here, title="hledger register", msg=msg, a=a, p=p, j=j, today=today} editform' = editform td hamletToRepHtml $ pageLayout td [$hamlet| -%div.ledger - %div.accounts!style=float:left; ^br^ +%div#ledger + %div#accounts ^br^ ^navlinks.td^ ^addform.td^ ^editform'^ @@ -645,7 +645,7 @@ getJournalOnlyR = do editform' = editform td txns = journalReportAsHtml opts td $ journalReport opts fspec j hamletToRepHtml $ pageLayout td [$hamlet| -%div.journal +%div#journal %div.nav2 %a#addformlink!href!onclick="return addformToggle()" add one transaction \ | $ diff --git a/hledger-web/data/static/style.css b/hledger-web/data/static/style.css index 36b778483..884fa9d41 100644 --- a/hledger-web/data/static/style.css +++ b/hledger-web/data/static/style.css @@ -42,8 +42,15 @@ body { margin:0; } #stopfilterlink { font-weight:bold; } .filtering { background-color:#ddd; } +div#floatcontainer { white-space:nowrap; } +div#accounts { float:left; padding-right:1em; border-right:thin solid #eee; margin-right:1em; margin-bottom:5em; } +div#transactions { } + +div.journal { } +div.register { } + .current { font-weight:bold; background-color:#ddd; } -.description { padding-left:1em; } +.description { padding-left:1em; white-space:normal; } .account { white-space:nowrap; padding-left:1em; } .amount { white-space:nowrap; padding-left:1em; } .balance { white-space:nowrap; padding-left:1em; } @@ -58,14 +65,9 @@ table.journalreport { border-spacing: 0; } .journalreport td { border-top:thin solid #eee; } .journalreport pre { margin-top:0; } -.ledger .accounts {padding-right:1em; margin-right:1em; border-right:thin solid #eee; } -.ledger .register { } - -div.accounts { margin-bottom:5em; } - .balancereport tr { vertical-align:top; } table.balancereport { border-spacing:0; } -.ledger .balancereport td { padding:0; } +.balancereport td { padding:0; } .totalrule td { border-top:thin solid black; } table.registerreport { border-spacing:0; }