Adopted Bootstrap classes everywhere
This commit is contained in:
		
							parent
							
								
									aec7d2fa3c
								
							
						
					
					
						commit
						962ddb3c3a
					
				| @ -337,23 +337,20 @@ addform _ vd@VD{..} = [hamlet| | |||||||
| 
 | 
 | ||||||
|   }); |   }); | ||||||
| 
 | 
 | ||||||
| <form#addform method=POST style="position:relative;"> | <form#addform method=POST .form> | ||||||
|   <table.form style="width:100%; white-space:nowrap;"> |  <div .form-group> | ||||||
|    <tr> |   <div .row> | ||||||
|     <td colspan=4> |    <div .col-md-2 .col-xs-2 .col-sm-2> | ||||||
|      <table style="width:100%;"> |     <input #date        .typeahead .form-control .input-lg type=text size=15 name=date placeholder="Date" value="#{defdate}"> | ||||||
|       <tr#descriptionrow> |    <div .col-md-10 .col-xs-10 .col-sm-10> | ||||||
|        <td> |     <input #description .typeahead .form-control .input-lg type=text size=40 name=description placeholder="Description"> | ||||||
|         <input #date        .typeahead .form-control .input-lg type=text size=15 name=date placeholder="Date" value="#{defdate}"> |  $forall n <- postingnums | ||||||
|        <td> |    ^{postingfields vd n} | ||||||
|         <input #description .typeahead .form-control .input-lg type=text size=40 name=description placeholder="Description"> |  <span style="padding-left:2em;"> | ||||||
|    $forall n <- postingnums |   <span .small> | ||||||
|     ^{postingfields vd n} |     Tab in last field for | ||||||
|   <span style="padding-left:2em;"> |     <a href="#" onclick="addformAddPosting(); return false;">more | ||||||
|    <span .small> |     (or ctrl +, ctrl -) | ||||||
|      Tab in last field for |  | ||||||
|      <a href="#" onclick="addformAddPosting(); return false;">more |  | ||||||
|      (or ctrl +, ctrl -) |  | ||||||
| |] | |] | ||||||
|  where |  where | ||||||
|   defdate = "" :: String -- #322 don't set a default, typeahead(?) clears it on tab. See also hledger.js |   defdate = "" :: String -- #322 don't set a default, typeahead(?) clears it on tab. See also hledger.js | ||||||
| @ -366,10 +363,11 @@ addform _ vd@VD{..} = [hamlet| | |||||||
|   postingnums = [1..numpostings] |   postingnums = [1..numpostings] | ||||||
|   postingfields :: ViewData -> Int -> HtmlUrl AppRoute |   postingfields :: ViewData -> Int -> HtmlUrl AppRoute | ||||||
|   postingfields _ n = [hamlet| |   postingfields _ n = [hamlet| | ||||||
| <tr .posting> | <div .form-group .row> | ||||||
|  <td style="padding-left:2em;"> |  <div .col-md-8 .col-xs-8 .col-sm-8> | ||||||
|   <input ##{acctvar} .account-input .typeahead .form-control .input-lg style="width:100%;" type=text name=#{acctvar} placeholder="#{acctph}"> |   <input ##{acctvar} .account-input .typeahead .form-control .input-lg style="width:100%;" type=text name=#{acctvar} placeholder="#{acctph}"> | ||||||
|  ^{amtfieldorsubmitbtn} |  <div .col-md-4 .col-xs-4 .col-sm-4> | ||||||
|  |   ^{amtfieldorsubmitbtn} | ||||||
| |] | |] | ||||||
|    where |    where | ||||||
|     islast = n == numpostings |     islast = n == numpostings | ||||||
|  | |||||||
| @ -44,7 +44,6 @@ postAddForm = do | |||||||
|                     $forall e<-errs |                     $forall e<-errs | ||||||
|                      \#{e}<br> |                      \#{e}<br> | ||||||
|                    |] |                    |] | ||||||
|                                  |  | ||||||
|   -- 1. process the fixed fields with yesod-form |   -- 1. process the fixed fields with yesod-form | ||||||
| 
 | 
 | ||||||
|   VD{..} <- getViewData |   VD{..} <- getViewData | ||||||
|  | |||||||
| @ -34,29 +34,19 @@ hledgerLayout vd title content = do | |||||||
|   defaultLayout $ do |   defaultLayout $ do | ||||||
|       setTitle $ toHtml $ title ++ " - hledger-web" |       setTitle $ toHtml $ title ++ " - hledger-web" | ||||||
|       toWidget [hamlet| |       toWidget [hamlet| | ||||||
|         <div#content> |          ^{topbar vd} | ||||||
|          $if showsidebar vd |          ^{sidebar vd} | ||||||
|           <div#sidebar> |          <div .col-md-8 .col-xs-12 .col-sm-12> | ||||||
|            <div#sidebar-spacer> |           ^{searchform vd} | ||||||
|            <div#sidebar-body> |           ^{content} | ||||||
|             ^{sidebar vd} |  | ||||||
|          $else |  | ||||||
|           <div#sidebar style="display:none;"> |  | ||||||
|            <div#sidebar-spacer> |  | ||||||
|            <div#sidebar-body> |  | ||||||
|          <div#main> |  | ||||||
|           ^{topbar vd} |  | ||||||
|           <div#maincontent> |  | ||||||
|            ^{searchform vd} |  | ||||||
|            ^{content} |  | ||||||
|       |] |       |] | ||||||
| 
 | 
 | ||||||
| -- | Global toolbar/heading area. | -- | Global toolbar/heading area. | ||||||
| topbar :: ViewData -> HtmlUrl AppRoute | topbar :: ViewData -> HtmlUrl AppRoute | ||||||
| topbar VD{..} = [hamlet| | topbar VD{..} = [hamlet| | ||||||
| <nav class="navbar" role="navigation"> | <div#spacer .col-md-4 .hidden-xs .hidden-sm> | ||||||
|  <div#topbar> | <div#topbar .col-md-8 .col-sm-12 .col-xs-12> | ||||||
|   <h1>#{title} |  <h1>#{title} | ||||||
| |] | |] | ||||||
|   where |   where | ||||||
|     title = takeFileName $ journalFilePath j |     title = takeFileName $ journalFilePath j | ||||||
| @ -65,21 +55,14 @@ topbar VD{..} = [hamlet| | |||||||
| sidebar :: ViewData -> HtmlUrl AppRoute | sidebar :: ViewData -> HtmlUrl AppRoute | ||||||
| sidebar vd@VD{..} = | sidebar vd@VD{..} = | ||||||
|  [hamlet| |  [hamlet| | ||||||
|  <a href=@{JournalR} title="Go back to top"> |  <div #sidebar-menu .col-md-4 .hidden-xs .hidden-sm> | ||||||
|   hledger-web |   <ul .main-menu .nav .nav-stacked .affix-top> | ||||||
| 
 |    <li .top> | ||||||
|  <p> |     <a href=@{JournalR} title="Show general journal entries, most recent first">Journal | ||||||
|  <!-- |  | ||||||
|  <a#sidebartogglebtn role="button" style="cursor:pointer;" onclick="sidebarToggle()" title="Show/hide sidebar"> |  | ||||||
|   <span class="glyphicon glyphicon-expand"></span> |  | ||||||
|  --> |  | ||||||
|  <br> |  | ||||||
|  <div#sidebar-content> |  | ||||||
|   <p style="margin-top:1em;"> |  | ||||||
|    <a href=@{JournalR} .#{journalcurrent} title="Show general journal entries, most recent first" style="white-space:nowrap;">Journal |  | ||||||
|   <div#accounts style="margin-top:1em;"> |  | ||||||
|    ^{accounts} |    ^{accounts} | ||||||
| |] | |] | ||||||
|  | --   <a href=@{JournalR} .#{journalcurrent} title="Show general journal entries, most recent first" style="white-space:nowrap;">Journal | ||||||
|  | --  <p style="margin-top:1em;"> | ||||||
|  where |  where | ||||||
|   journalcurrent = if here == JournalR then "current" else "" :: String |   journalcurrent = if here == JournalR then "current" else "" :: String | ||||||
|   accounts = balanceReportAsHtml opts vd $ balanceReport (reportopts_ $ cliopts_ opts){empty_=True} am j |   accounts = balanceReportAsHtml opts vd $ balanceReport (reportopts_ $ cliopts_ opts){empty_=True} am j | ||||||
| @ -105,17 +88,12 @@ sidebar vd@VD{..} = | |||||||
| -- | Search form for entering custom queries to filter journal data. | -- | Search form for entering custom queries to filter journal data. | ||||||
| searchform :: ViewData -> HtmlUrl AppRoute | searchform :: ViewData -> HtmlUrl AppRoute | ||||||
| searchform VD{..} = [hamlet| | searchform VD{..} = [hamlet| | ||||||
| <div#searchformdiv> | <div#searchformdiv .row> | ||||||
|  <form#searchform.form method=GET> |  <form#searchform .form-inline method=GET> | ||||||
|   <table width="100%"> |   <div .form-group .col-md-12> | ||||||
|    <tr> |    <input .form-control name=q value=#{q} title="Enter hledger search patterns to filter the data below" placeholder="Search"> | ||||||
|     <td width="99%" style="position:relative;"> |    <button .btn .btn-default type=submit title="Apply search terms">Search | ||||||
|      $if filtering |    <button .btn .btn-default type=button data-toggle="modal" data-target="#helpmodal" title="Show search and general help">? | ||||||
|       <a role=button .btn .close style="position:absolute; right:0; padding-right:.1em; padding-left:.1em; margin-right:.1em; margin-left:.1em; font-size:24px;" href="@{here}" title="Clear search terms">× |  | ||||||
|      <input .form-control style="font-size:18px; padding-bottom:2px;" name=q value=#{q} title="Enter hledger search patterns to filter the data below"> |  | ||||||
|     <td width="1%" style="white-space:nowrap;"> |  | ||||||
|      <button .btn .btn-default style="font-size:18px;" type=submit title="Apply search terms">Search |  | ||||||
|      <button .btn .btn-default style="font-size:18px;" type=button data-toggle="modal" data-target="#helpmodal" title="Show search and general help">? |  | ||||||
| |] | |] | ||||||
|  where |  where | ||||||
|   filtering = not $ null q |   filtering = not $ null q | ||||||
| @ -184,17 +162,10 @@ nulltemplate = [hamlet||] | |||||||
| balanceReportAsHtml :: WebOpts -> ViewData -> BalanceReport -> HtmlUrl AppRoute | balanceReportAsHtml :: WebOpts -> ViewData -> BalanceReport -> HtmlUrl AppRoute | ||||||
| balanceReportAsHtml _ vd@VD{..} (items',total) = | balanceReportAsHtml _ vd@VD{..} (items',total) = | ||||||
|  [hamlet| |  [hamlet| | ||||||
|  <table.balancereport> |  | ||||||
|   <tr> |  | ||||||
|    <td>Account |  | ||||||
|    <td style="padding-left:1em; text-align:right;">Balance |  | ||||||
|   $forall i <- items |   $forall i <- items | ||||||
|    ^{itemAsHtml vd i} |    ^{itemAsHtml vd i} | ||||||
|   <tr.totalrule> |   <li .total> | ||||||
|    <td colspan=2> |     <span .balance>#{mixedAmountAsHtml total} | ||||||
|   <tr> |  | ||||||
|    <td> |  | ||||||
|    <td.balance>#{mixedAmountAsHtml total} |  | ||||||
| |] | |] | ||||||
|  where |  where | ||||||
|    l = ledgerFromJournal Any j |    l = ledgerFromJournal Any j | ||||||
| @ -202,16 +173,12 @@ 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| | ||||||
| <tr.item.#{inacctclass}> | <li> | ||||||
|  <td.account.#{depthclass}> |  \#{indent} | ||||||
|   \#{indent} |  <a href="@?{acctquery}" title="Show transactions affecting this account and subaccounts">#{adisplay} | ||||||
|    <a href="@?{acctquery}" title="Show transactions affecting this account and subaccounts">#{adisplay} |  $if hassubs | ||||||
|    <span.hoverlinks> |   <a href="@?{acctonlyquery}" .only title="Show transactions affecting this account but not subaccounts">only | ||||||
|     $if hassubs |  <span .balance>#{mixedAmountAsHtml abal} | ||||||
|        |  | ||||||
|      <a href="@?{acctonlyquery}" title="Show transactions affecting this account but not subaccounts">only |  | ||||||
| 
 |  | ||||||
|  <td.balance>#{mixedAmountAsHtml abal} |  | ||||||
| |] | |] | ||||||
|      where |      where | ||||||
|        hassubs = not $ maybe False (null.asubs) $ ledgerAccount l acct |        hassubs = not $ maybe False (null.asubs) $ ledgerAccount l acct | ||||||
|  | |||||||
| @ -34,10 +34,12 @@ getJournalR = do | |||||||
|                   s2 = if filtering then ", filtered" else "" |                   s2 = if filtering then ", filtered" else "" | ||||||
|       maincontent = journalTransactionsReportAsHtml opts vd $ journalTransactionsReport (reportopts_ $ cliopts_ opts) j m |       maincontent = journalTransactionsReportAsHtml opts vd $ journalTransactionsReport (reportopts_ $ cliopts_ opts) j m | ||||||
|   hledgerLayout vd "journal" [hamlet| |   hledgerLayout vd "journal" [hamlet| | ||||||
|        <h2#contenttitle>#{title} |        <div .row> | ||||||
|        <!-- p>Journal entries record movements of commodities between accounts. --> |         <h2#contenttitle>#{title} | ||||||
|        <a#addformlink role="button" style="cursor:pointer; margin-top:1em;" data-toggle="modal" data-target="#addmodal" title="Add a new transaction to the journal" >Add a transaction |         <!-- p>Journal entries record movements of commodities between accounts. --> | ||||||
|        ^{maincontent} |         <a#addformlink role="button" style="cursor:pointer; margin-top:1em;" data-toggle="modal" data-target="#addmodal" title="Add a new transaction to the journal" >Add a transaction | ||||||
|  |        <div .table-responsive> | ||||||
|  |         ^{maincontent} | ||||||
|      |] |      |] | ||||||
| 
 | 
 | ||||||
| postJournalR :: Handler Html | postJournalR :: Handler Html | ||||||
| @ -46,11 +48,10 @@ postJournalR = postAddForm | |||||||
| -- | Render a "TransactionsReport" as html for the formatted journal view. | -- | Render a "TransactionsReport" as html for the formatted journal view. | ||||||
| journalTransactionsReportAsHtml :: WebOpts -> ViewData -> TransactionsReport -> HtmlUrl AppRoute | journalTransactionsReportAsHtml :: WebOpts -> ViewData -> TransactionsReport -> HtmlUrl AppRoute | ||||||
| journalTransactionsReportAsHtml _ vd (_,items) = [hamlet| | journalTransactionsReportAsHtml _ vd (_,items) = [hamlet| | ||||||
| <table.transactionsreport> | <table .transactionsreport .table .table-condensed> | ||||||
|  <tr.headings> |  <thead> | ||||||
|   <th.date style="text-align:left;"> |   <th.date style="text-align:left;"> | ||||||
|    Date |    Date | ||||||
|    <span .glyphicon .glyphicon-chevron-up> |  | ||||||
|   <th.description style="text-align:left;">Description |   <th.description style="text-align:left;">Description | ||||||
|   <th.account style="text-align:left;">Account |   <th.account style="text-align:left;">Account | ||||||
|   <th.amount style="text-align:right;">Amount |   <th.amount style="text-align:right;">Amount | ||||||
| @ -61,26 +62,20 @@ journalTransactionsReportAsHtml _ vd (_,items) = [hamlet| | |||||||
| -- .#{datetransition} | -- .#{datetransition} | ||||||
|    itemAsHtml :: ViewData -> (Int, Bool, Bool, Bool, TransactionsReportItem) -> HtmlUrl AppRoute |    itemAsHtml :: ViewData -> (Int, Bool, Bool, Bool, TransactionsReportItem) -> HtmlUrl AppRoute | ||||||
|    itemAsHtml VD{..} (n, _, _, _, (torig, _, split, _, amt, _)) = [hamlet| |    itemAsHtml VD{..} (n, _, _, _, (torig, _, split, _, amt, _)) = [hamlet| | ||||||
| <tbody ##{tindex torig}> | <tr .title> | ||||||
|   <tr .item.#{evenodd}.#{firstposting} style="vertical-align:top;" title="#{show torig}"> |  <td .date>#{date} | ||||||
|    <td.date>#{date} |  <td .description colspan=2>#{textElideRight 60 desc} | ||||||
|    <td.description colspan=2>#{textElideRight 60 desc} |  <td .amount style="text-align:right;"> | ||||||
|    <td.amount style="text-align:right;"> |   $if showamt | ||||||
|     $if showamt |    \#{mixedAmountAsHtml amt} | ||||||
|      \#{mixedAmountAsHtml amt} | $forall p' <- tpostings torig | ||||||
|   $forall p' <- tpostings torig |  <tr .item.#{evenodd}.posting title="#{show torig}"> | ||||||
|    <tr .item.#{evenodd}.posting title="#{show torig}"> |   <td .nonhead> | ||||||
|     <td.date> |   <td .nonhead> | ||||||
|     <td.description> |   <td .nonhead> | ||||||
|     <td.account> |      | ||||||
|        |    <a href="@?{acctlink (paccount p')}##{tindex torig}" title="#{paccount p'}">#{elideAccountName 40 $ paccount p'} | ||||||
|      <a href="@?{acctlink (paccount p')}##{tindex torig}" title="#{paccount p'}">#{elideAccountName 40 $ paccount p'} |   <td.amount .nonhead style="text-align:right;">#{mixedAmountAsHtml $ pamount p'} | ||||||
|     <td.amount style="text-align:right;">#{mixedAmountAsHtml $ pamount p'} |  | ||||||
|   <tr.#{evenodd}> |  | ||||||
|    <td>  |  | ||||||
|    <td> |  | ||||||
|    <td> |  | ||||||
|    <td> |  | ||||||
| |] | |] | ||||||
|      where |      where | ||||||
|        acctlink a = (RegisterR, [("q", T.pack $ accountQuery a)]) |        acctlink a = (RegisterR, [("q", T.pack $ accountQuery a)]) | ||||||
|  | |||||||
| @ -48,24 +48,27 @@ postRegisterR = postAddForm | |||||||
| -- Generate html for an account register, including a balance chart and transaction list. | -- Generate html for an account register, including a balance chart and transaction list. | ||||||
| registerReportHtml :: WebOpts -> ViewData -> TransactionsReport -> HtmlUrl AppRoute | registerReportHtml :: WebOpts -> ViewData -> TransactionsReport -> HtmlUrl AppRoute | ||||||
| registerReportHtml opts vd r = [hamlet| | registerReportHtml opts vd r = [hamlet| | ||||||
|  ^{registerChartHtml $ transactionsReportByCommodity r} |  <div .hidden-xs> | ||||||
|  |   ^{registerChartHtml $ transactionsReportByCommodity r} | ||||||
|  ^{registerItemsHtml opts vd r} |  ^{registerItemsHtml opts vd r} | ||||||
| |] | |] | ||||||
| 
 | 
 | ||||||
| -- Generate html for a transaction list from an "TransactionsReport". | -- Generate html for a transaction list from an "TransactionsReport". | ||||||
| registerItemsHtml :: WebOpts -> ViewData -> TransactionsReport -> HtmlUrl AppRoute | registerItemsHtml :: WebOpts -> ViewData -> TransactionsReport -> HtmlUrl AppRoute | ||||||
| registerItemsHtml _ vd (balancelabel,items) = [hamlet| | registerItemsHtml _ vd (balancelabel,items) = [hamlet| | ||||||
| <table.registerreport> | <div .table-responsive> | ||||||
|  <tr.headings> |  <table.registerreport .table .table-striped .table-condensed> | ||||||
|   <th.date style="text-align:left;"> |   <thead> | ||||||
|    Date |    <tr> | ||||||
|    <span .glyphicon .glyphicon-chevron-up> |     <th style="text-align:left;"> | ||||||
|   <th.description style="text-align:left;">Description |      Date | ||||||
|   <th.account style="text-align:left;">To/From Account(s) |      <span .glyphicon .glyphicon-chevron-up> | ||||||
|   <th.amount style="text-align:right; white-space:normal;">Amount Out/In |     <th style="text-align:left;">Description | ||||||
|   <th.balance style="text-align:right; white-space:normal;">#{balancelabel'} |     <th style="text-align:left;">To/From Account(s) | ||||||
|  $forall i <- numberTransactionsReportItems items |     <th style="text-align:right; white-space:normal;">Amount Out/In | ||||||
|   ^{itemAsHtml vd i} |     <th style="text-align:right; white-space:normal;">#{balancelabel'} | ||||||
|  |   $forall i <- numberTransactionsReportItems items | ||||||
|  |    ^{itemAsHtml vd i} | ||||||
|  |] |  |] | ||||||
|  where |  where | ||||||
|    insomeacct = isJust $ inAccount $ qopts vd |    insomeacct = isJust $ inAccount $ qopts vd | ||||||
| @ -107,7 +110,7 @@ registerChartHtml percommoditytxnreports = | |||||||
|  -- is hidden, eg with add form toggled |  -- is hidden, eg with add form toggled | ||||||
|  [hamlet| |  [hamlet| | ||||||
| <label#register-chart-label style=""><br> | <label#register-chart-label style=""><br> | ||||||
| <div#register-chart style="width:85%; height:150px; margin-bottom:1em; display:block;"> | <div#register-chart style="height:150px; margin-bottom:1em; display:block;"> | ||||||
| <script type=text/javascript> | <script type=text/javascript> | ||||||
|  \$(document).ready(function() { |  \$(document).ready(function() { | ||||||
|    var $chartdiv = $('#register-chart'); |    var $chartdiv = $('#register-chart'); | ||||||
|  | |||||||
| @ -4,182 +4,6 @@ | |||||||
| /* 1. colours */ | /* 1. colours */ | ||||||
| 
 | 
 | ||||||
| /* green */ | /* green */ | ||||||
| body                                                                 { background-color:white; color:black; } |  | ||||||
| .registerreport .odd                                                 { background-color:#ded; } |  | ||||||
| /* .transactionsreport .odd                                             { background-color:#eee; } */ |  | ||||||
| .filtering                                                           { background-color:#e0e0e0; } |  | ||||||
| a:link, a:visited { color:#00e !important; } |  | ||||||
| /* a:link:hover, a:visited:hover { color:red; } */ |  | ||||||
| /* #main                                                                { border-color:#e0e0e0; } see below */ |  | ||||||
| /* .journalreport td                                                    { border-color:thin solid #e0e0e0; } see below */ |  | ||||||
| 
 |  | ||||||
| /* white */ |  | ||||||
| /* body                                                                 { background-color:#fff; } */ |  | ||||||
| /* .registerreport .odd                                                 { background-color:#eee; } */ |  | ||||||
| /* .filtering                                                           { background-color:#ddd; } */ |  | ||||||
| /* #main                                                                { border-color:#eee; } see below */ |  | ||||||
| /* .journalreport td                                                    { border-color:thin solid #eee; } see below */ |  | ||||||
| 
 |  | ||||||
| #message                                                             { color:red; background-color:#fee; } |  | ||||||
| /* #addform input.textinput, #addform .dhx_combo_input, .dhx_combo_list { /\*background-color:#eee;*\/ } */ |  | ||||||
| #editform textarea                                                   { background-color:#eee; } |  | ||||||
| .negative                                                            { color:#800; } |  | ||||||
| .help                                                                {  } |  | ||||||
| .highlighted { |  | ||||||
|   background-color: #F4F466 !important; |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| #sidebar .hoverlinks { visibility:hidden; } |  | ||||||
| /* #sidebar .mouseover { background-color:rgba(208,208,208,0.5); } */ |  | ||||||
| #sidebar .mouseover .hoverlinks { visibility:visible; } |  | ||||||
| 
 |  | ||||||
| #sidebar .balancereport .hoverlinks { margin-left:0em; font-weight:normal; /*font-size:smaller;*/ display:inline-block; text-align:right; } |  | ||||||
| #sidebar .balancereport .hoverlinks a { margin-left:0.5em; } |  | ||||||
| /* #sidebar .notinacct, .notinacct :link, .notinacct :visited { color:#888; } */ |  | ||||||
| #sidebar .notinacct .negative { color:#b77; } |  | ||||||
| #sidebar .balancereport .inacct { font-weight:bold; } |  | ||||||
| /* #sidebar .balancereport .inacct { background-color:#e0e0e0; } */ |  | ||||||
| #sidebar .balancereport .numpostings                                          { padding-left:1em; color:#aaa; } |  | ||||||
| #sidebar .current { font-weight:bold; } |  | ||||||
| 
 |  | ||||||
| /*------------------------------------------------------------------------------------------*/ |  | ||||||
| /* 2. font families & sizes */ |  | ||||||
| /* overspecified for cross-browser robustness */ |  | ||||||
| body { font-size:16px; } |  | ||||||
| /* |  | ||||||
| body                                               { font-family:helvetica,arial,sans-serif; } |  | ||||||
| pre                                                { font-family:courier,"courier new",monospace; } |  | ||||||
| .dhx_combo_input, .dhx_combo_list { font-size:small; } |  | ||||||
| #editform textarea                                 { font-family:courier,"courier new",monospace; font-size:small; } |  | ||||||
| .nav2                                              { font-size:small; } |  | ||||||
| #searchform                                        { font-size:small; } |  | ||||||
| .topleftlink                                       { font-size:small; } |  | ||||||
| .toprightlink                                      { font-size:small; } |  | ||||||
| #journaldesc                                       { font-size:small; } |  | ||||||
| .togglelink                                        { font-size:smaller; white-space:nowrap } |  | ||||||
| .help                                              { font-size:smaller; } |  | ||||||
| .form                                              { font-size:small; } |  | ||||||
| .transactionsreport                                { font-size:small; } |  | ||||||
| .entriesreport                                     { font-size:small; } |  | ||||||
| .balancereport                                     { font-size:small; } |  | ||||||
| .registerreport                                    { font-size:small; } |  | ||||||
| .showall                                           { font-size:small; } |  | ||||||
| */ |  | ||||||
| /* #addformlink                                    { font-size:small; } */ |  | ||||||
| /* #editformlink                                   { font-size:small; } */ |  | ||||||
| /* |  | ||||||
| #contenttitle                                    { font-size:1.2em; } |  | ||||||
| */ |  | ||||||
| 
 |  | ||||||
| /*------------------------------------------------------------------------------------------*/ |  | ||||||
| /* 3. layout */ |  | ||||||
| 
 |  | ||||||
| body                        { margin:0; } |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| #topbar                     { padding:2px; } |  | ||||||
| .topleftlink                { float:left; margin-right:1em; padding:2px; } |  | ||||||
| .toprightlink               { float:right; margin-left:1em; padding:2px; } |  | ||||||
| #topbar h1                  { display:inline-block; vertical-align:top; margin:0; } |  | ||||||
| #journalinfo                { vertical-align:middle; margin:0; } |  | ||||||
| /* #topbar                  { padding:4px; border-bottom:2px solid #ddd; } */ |  | ||||||
| 
 |  | ||||||
| #message                    { margin:0.5em;} |  | ||||||
| .help                       { font-style: italic; } |  | ||||||
| .helprow td                 { padding-bottom:8px; } |  | ||||||
| 
 |  | ||||||
| #outermain { overflow:auto; } |  | ||||||
| #main { overflow:auto; padding-left:1em; } |  | ||||||
| 
 |  | ||||||
| #sidebar { |  | ||||||
|   float:left; |  | ||||||
|   padding-right:1em;  |  | ||||||
|   border-right:thin solid #e0e0e0; |  | ||||||
|   margin-bottom:5em; |  | ||||||
| } |  | ||||||
| /* #sidebar.affix { */ |  | ||||||
| /*     position: fixed; */ |  | ||||||
| /*     top: 20px; */ |  | ||||||
| /* } */ |  | ||||||
| 
 |  | ||||||
| .balancereport .item { border-top:thin solid #e0e0e0; } |  | ||||||
| 
 |  | ||||||
| #navlinks                   { margin-bottom:1em; } |  | ||||||
| .navlink                    { } |  | ||||||
| .navlinkcurrent             { font-weight:bold; } |  | ||||||
| .form                       { margin:0em; } |  | ||||||
| 
 |  | ||||||
| #searchformdiv              { margin:0 0 1em 0; } |  | ||||||
| #searchform                 { margin:0; } |  | ||||||
| #searchform span            { padding:4px; } |  | ||||||
| #stopfilterlink             { font-weight:bold; } |  | ||||||
| .filtering                  { font-weight:bold; } |  | ||||||
| 
 |  | ||||||
| #main .journal { } |  | ||||||
| #main .register { } |  | ||||||
| .current                    { font-weight:bold; } |  | ||||||
| .date                       { padding-left:0em; } |  | ||||||
| .description                { padding-left:1em; white-space:normal; } |  | ||||||
| .account                    { padding-left:1em; white-space:normal; } |  | ||||||
| .amount                     { padding-left:1em; white-space:nowrap; } |  | ||||||
| .balance                    { padding-left:1em; white-space:nowrap; } |  | ||||||
| tr td:last-child { padding-right:0.3em; } |  | ||||||
| tr td:first-child { padding-left:0.3em; } |  | ||||||
| .amount, .balance { width:2em; }  /* minimise width */ |  | ||||||
| .positive                   { } |  | ||||||
| 
 |  | ||||||
| td.balance, td.numpostings { |  | ||||||
|   text-align: right; |  | ||||||
| } |  | ||||||
| /* table.transactionsreport         { border-spacing: 0; } */ |  | ||||||
| /* .transactionsreport td           {  } */ |  | ||||||
| /* .transactionsreport pre          { margin-top:0; } */ |  | ||||||
| 
 |  | ||||||
| /* table.entriesreport         { border-spacing: 0; } */ |  | ||||||
| /* .entriesreport td           {  } */ |  | ||||||
| /* .entriesreport pre          { margin-top:0; } */ |  | ||||||
| 
 |  | ||||||
| .balancereport              { border-spacing:0; } |  | ||||||
| .balancereport tr           { vertical-align:bottom; border-spacing:0; } |  | ||||||
| .balancereport .title       { white-space:nowrap; } |  | ||||||
| .balancereport .item        { } |  | ||||||
| /* .balancereport .depth0      { padding-top:1em; } */ |  | ||||||
| .balancereport td           { padding:0; } |  | ||||||
| .totalrule td               { border-top:thin solid black; } |  | ||||||
| .balancereport .account     { white-space:nowrap; } |  | ||||||
| 
 |  | ||||||
| .hidden { display:none; } |  | ||||||
| table.registerreport        { border-spacing:0; } |  | ||||||
| table.registerreport tr     { vertical-align:top; } |  | ||||||
| table.registerreport td     { padding-bottom:0.2em; } |  | ||||||
| table.registerreport .date  { white-space:nowrap; } |  | ||||||
| table.registerreport tr.posting { font-size:smaller; } |  | ||||||
| table.registerreport tr.posting .account  { padding-left:1.5em; } |  | ||||||
| table.registerreport tr.posting .amount  { padding-right:0.5em; } |  | ||||||
| tr.firstposting td          { } |  | ||||||
| /* tr.newday td                { border-top: 1px solid #797; } */ |  | ||||||
| /* tr.newday .date             { font-weight:bold; } */ |  | ||||||
| /* tr.newmonth td              { border-top: 2px solid #464; } */ |  | ||||||
| /* tr.newyear td               { border-top: 3px solid black; } */ |  | ||||||
| #accountsheading            { white-space:nowrap; } |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| #addform { |  | ||||||
|   /* margin:0 0 2em; */ |  | ||||||
|   /* padding:.5em 0; */ |  | ||||||
|   /* border-top:thin solid #e0e0e0; */ |  | ||||||
|   /* border-bottom:thin solid #e0e0e0; */ |  | ||||||
| } |  | ||||||
| #addform tr { |  | ||||||
|   vertical-align:top; |  | ||||||
| } |  | ||||||
| /* #addform input.textinput, #addform .dhx_combo_input, .dhx_combo_list   { padding:4px; } */ |  | ||||||
| /* #addform table              { } */ |  | ||||||
| /* #addform #addbuttonrow      { text-align:right; } */ |  | ||||||
| /* #editform                   { width:95%; } */ |  | ||||||
| #editform textarea          { width:100%; padding:4px; } |  | ||||||
| /* #searchform table           { border-spacing:0; padding-left:0em; } */ |  | ||||||
| 
 |  | ||||||
| ::-moz-placeholder { | ::-moz-placeholder { | ||||||
|   font-style:italic; |   font-style:italic; | ||||||
| } | } | ||||||
| @ -273,3 +97,58 @@ code { | |||||||
|   font-weight: bold; |   font-weight: bold; | ||||||
|   color: black; |   color: black; | ||||||
| } | } | ||||||
|  | ul { | ||||||
|  |     list-style-type: none; | ||||||
|  | 	  padding: 0; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #sidebar-menu .main-menu li { | ||||||
|  |     border-top: 1px solid #ebebeb; | ||||||
|  | } | ||||||
|  | #sidebar-menu .main-menu .top { | ||||||
|  |     border: none !important; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #sidebar-menu .main-menu a { | ||||||
|  |     display: inline; | ||||||
|  | 	  font-size: 13px; | ||||||
|  | 	  font-weight: 500; | ||||||
|  | 	  color: #999; | ||||||
|  | 	  padding: 4px 20px; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #sidebar-menu .main-menu a:hover { | ||||||
|  | 	  color: #11427D; | ||||||
|  | 	  text-decoration: none; | ||||||
|  | 	  background-color: transparent; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #sidebar-menu .main-menu .only{ | ||||||
|  |     visibility: hidden; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #sidebar-menu .main-menu li:hover > .only { | ||||||
|  |     visibility: visible; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #sidebar-menu .main-menu .only:hover{ | ||||||
|  |     border-left: none; | ||||||
|  | } | ||||||
|  | #sidebar-menu .main-menu .balance { | ||||||
|  |     float: right; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | #sidebar-menu .main-menu .total { | ||||||
|  |     border-left: none; | ||||||
|  |     border-right: none; | ||||||
|  |     border-bottom: none; | ||||||
|  |     border-top: 1px solid black; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .transactionsreport .nonhead { | ||||||
|  |     border: none !important; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .negative { | ||||||
|  |     color: #a94442; | ||||||
|  | } | ||||||
|  | |||||||
| @ -26,9 +26,7 @@ $newline never | |||||||
| 
 | 
 | ||||||
|     <body> |     <body> | ||||||
|         <div class="container"> |         <div class="container"> | ||||||
|             <header> |             ^{pageBody pc} | ||||||
|             <div id="outermain" role="main"> |  | ||||||
|               ^{pageBody pc} |  | ||||||
|             <footer> |             <footer> | ||||||
|                 #{extraCopyright $ appExtra $ settings master} |                 #{extraCopyright $ appExtra $ settings master} | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user