slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled Sidebar animations and fixed overflow

Browse Source
This commit is contained in:
Dominik Süß 2016-10-24 21:02:24 +02:00 committed by Simon Michael
parent 9b7dc72e5c
commit f8f75cec52
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hledger-web/Handler/Common.hs
View File

@ -62,9 +62,11 @@ sidebar :: ViewData -> HtmlUrl AppRoute
sidebar vd@VD{..} = sidebar vd@VD{..} =
[hamlet| [hamlet|
<div #sidebar-menu .#{showmd} .#{showsm} .sidebar-offcanvas> <div #sidebar-menu .#{showmd} .#{showsm} .sidebar-offcanvas>
<ul .main-menu .nav .nav-stacked .affix-top> <table .main-menu .table>
<li .top> <tr>
<a href=@{JournalR} .#{journalcurrent} title="Show general journal entries, most recent first">Journal <td .top>
<a href=@{JournalR} .#{journalcurrent} title="Show general journal entries, most recent first">Journal
<td .top>
^{accounts} ^{accounts}
|] |]
where where
@ -176,7 +178,9 @@ balanceReportAsHtml _ vd@VD{..} (items',total) =
[hamlet| [hamlet|
$forall i <- items $forall i <- items
^{itemAsHtml vd i} ^{itemAsHtml vd i}
<li .total> <tr .total>
<td>
<td>
#{mixedAmountAsHtml total} #{mixedAmountAsHtml total}
|] |]
where where
@ -185,12 +189,15 @@ balanceReportAsHtml _ vd@VD{..} (items',total) =
items = items' -- maybe items' (\m -> filter (matchesAccount m . \(a,_,_,_)->a) items') showacctmatcher items = items' -- maybe items' (\m -> filter (matchesAccount m . \(a,_,_,_)->a) items') showacctmatcher
itemAsHtml :: ViewData -> BalanceReportItem -> HtmlUrl AppRoute itemAsHtml :: ViewData -> BalanceReportItem -> HtmlUrl AppRoute
itemAsHtml _ (acct, adisplay, aindent, abal) = [hamlet| itemAsHtml _ (acct, adisplay, aindent, abal) = [hamlet|
<li> <tr>
\#{indent} <td>
<a href="@?{acctquery}" .#{inacctclass} title="Show transactions affecting this account and subaccounts">#{adisplay} <div .ff-wrapper>
$if hassubs \#{indent}
<a href="@?{acctonlyquery}" .only .hidden-sm .hidden-xs title="Show transactions affecting this account but not subaccounts">only <a href="@?{acctquery}" .#{inacctclass} title="Show transactions affecting this account and subaccounts">#{adisplay}
#{mixedAmountAsHtml abal} $if hassubs
<a href="@?{acctonlyquery}" .only .hidden-sm .hidden-xs title="Show transactions affecting this account but not subaccounts">only
<td>
#{mixedAmountAsHtml abal}
|] |]
where where
hassubs = not $ maybe False (null.asubs) $ ledgerAccount l acct hassubs = not $ maybe False (null.asubs) $ ledgerAccount l acct

33
hledger-web/static/hledger.css
View File

@ -102,9 +102,22 @@ ul {
padding: 0; padding: 0;
} }
#sidebar-menu .main-menu li { #sidebar-menu {
border-top: 1px solid #ebebeb; overflow:hidden;
} }
#sidebar-menu .main-menu td {
border-top: 1px solid #ebebeb;
overflow-x:auto;
white-space:nowrap;
/* text-overflow:ellipsis;*/
max-width:200px;
}
#sidebar-menu .main-menu .ff-wrapper { /* This wrapper is needed because firefox won't apply overflow to a td-tag */
overflow-x:auto;
}
#sidebar-menu .main-menu .top { #sidebar-menu .main-menu .top {
border: none !important; border: none !important;
} }
@ -127,7 +140,7 @@ ul {
visibility: hidden; visibility: hidden;
} }
#sidebar-menu .main-menu li:hover > .only { #sidebar-menu .main-menu tr:hover > td > .only {
visibility: visible; visibility: visible;
} }
@ -163,22 +176,26 @@ ul {
} }
#main-content { #main-content {
/*
-webkit-transition: width 0.3s ease, margin 0.3s ease; -webkit-transition: width 0.3s ease, margin 0.3s ease;
-moz-transition: width 0.3s ease, margin 0.3s ease; -moz-transition: width 0.3s ease, margin 0.3s ease;
-o-transition: width 0.3s ease, margin 0.3s ease; -o-transition: width 0.3s ease, margin 0.3s ease;
transition: width 0.3s ease, margin 0.3s ease; transition: width 0.3s ease, margin 0.3s ease;
*/
} }
#sidebar-menu { #sidebar-menu {
-webkit-transition: width 0.3s ease, margin 0.3s ease,opacity 0.3s ease; /*
-moz-transition: width 0.3s ease, margin 0.3s ease,opacity 0.3s ease; -webkit-transition: width 0.3s ease, margin 0.3s ease,opacity 0.3s ease,height 1s ease 1s;
-o-transition: width 0.3s ease, margin 0.3s ease,opacity 0.3s ease; -moz-transition: width 0.3s ease, margin 0.3s ease,opacity 0.3s ease,height 1s ease 1s;
transition: width 0.3s ease, margin 0.3s ease,opacity 0.3s ease; -o-transition: width 0.3s ease, margin 0.3s ease,opacity 0.3s ease,height 1s ease 1s;
overflow:hidden; transition: width 0.3s ease, margin 0.3s ease,opacity 0.3s ease,height 1s ease 1s;
*/
} }
.col-any-0 { .col-any-0 {
width:0 !important; width:0 !important;
height:0 !important;
float: left; float: left;
opacity:0; opacity:0;
} }