diff --git a/src/main/resources/static/css/search.css b/src/main/resources/static/css/search.css index 2f51148b487097decd0d5c52bf264e8e0145b407..4085b316171cead3929eccfa4d4a48f80e46e51e 100644 --- a/src/main/resources/static/css/search.css +++ b/src/main/resources/static/css/search.css @@ -15,11 +15,11 @@ } .pagination li a { - color: #FFFFFF; + color: #212121; } .pagination li.active { - background-color: #212121; + background-color: #2E79B9; } .page-link:hover { diff --git a/src/main/resources/templates/search/search.ftl b/src/main/resources/templates/search/search.ftl index f9e4d880394733ecb3ad7061cc90652853f66fae..811acefa9c9228a46025b13918476ebe73c43059 100644 --- a/src/main/resources/templates/search/search.ftl +++ b/src/main/resources/templates/search/search.ftl @@ -39,12 +39,13 @@ ${dateService.getDateStringWithoutYear(transaction.date)} </div> <@transactionsMacros.transactionType transaction/> + <@transactionsMacros.transactionAccount transaction/> <@transactionsMacros.transactionLinks transaction/> </div> <div class="row valign-wrapper no-margin-bottom"> <@transactionsMacros.transactionCategory transaction "center-align"/> - <@transactionsMacros.transactionNameAndDescription transaction/> - <@transactionsMacros.transactionAmount transaction transaction.getAccount()/> + <@transactionsMacros.transactionNameAndDescription transaction "s5"/> + <@transactionsMacros.transactionAmount transaction transaction.getAccount() "s4"/> </div> </div> <div class="hide-on-med-and-down"> @@ -54,8 +55,9 @@ </div> <@transactionsMacros.transactionCategory transaction "left-align"/> <@transactionsMacros.transactionType transaction/> - <@transactionsMacros.transactionNameAndDescription transaction/> - <@transactionsMacros.transactionAmount transaction transaction.getAccount()/> + <@transactionsMacros.transactionAccount transaction/> + <@transactionsMacros.transactionNameAndDescription transaction "l3 xl4"/> + <@transactionsMacros.transactionAmount transaction transaction.getAccount() "l2 xl2"/> <@transactionsMacros.transactionLinks transaction/> </div> </div> diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl index ad30611792be965fd55fd6339079ab31ae9e42d7..85eb1e6ec39ffb7c6968feb9dd187eb05ed82bee 100644 --- a/src/main/resources/templates/transactions/transactions.ftl +++ b/src/main/resources/templates/transactions/transactions.ftl @@ -62,8 +62,8 @@ </div> <div class="row valign-wrapper transaction-row-bottom"> <@transactionsMacros.transactionCategory transaction "center-align"/> - <@transactionsMacros.transactionNameAndDescription transaction/> - <@transactionsMacros.transactionAmount transaction account/> + <@transactionsMacros.transactionNameAndDescription transaction "s5"/> + <@transactionsMacros.transactionAmount transaction account "s4"/> </div> </div> <div class="hide-on-med-and-down transaction-row-top transaction-row-bottom <#if shouldHighlight>budgetmaster-blue-light</#if>"> @@ -73,8 +73,8 @@ </div> <@transactionsMacros.transactionCategory transaction "left-align"/> <@transactionsMacros.transactionType transaction/> - <@transactionsMacros.transactionNameAndDescription transaction/> - <@transactionsMacros.transactionAmount transaction account/> + <@transactionsMacros.transactionNameAndDescription transaction "l4 xl5"/> + <@transactionsMacros.transactionAmount transaction account "l3 xl3"/> <@transactionsMacros.transactionButtons transaction/> </div> </div> diff --git a/src/main/resources/templates/transactions/transactionsMacros.ftl b/src/main/resources/templates/transactions/transactionsMacros.ftl index 8d90849d0486ba9e0c906ed555aa9727c20435d8..bcbad2bbc2edc1da4b6c0450bc9f884b0fcfa7cc 100644 --- a/src/main/resources/templates/transactions/transactionsMacros.ftl +++ b/src/main/resources/templates/transactions/transactionsMacros.ftl @@ -31,8 +31,8 @@ </div> </#macro> -<#macro transactionNameAndDescription transaction> - <div class="col s5 l4 xl5"> +<#macro transactionNameAndDescription transaction size> + <div class="col ${size}"> <div class="truncate transaction-text">${transaction.name}</div> <div class="hide-on-med-and-down"> <#if transaction.description??> @@ -42,12 +42,12 @@ </div> </#macro> -<#macro transactionAmount transaction account> +<#macro transactionAmount transaction account size> <#assign amount = helpers.getAmount(transaction, account)/> <#if amount <= 0> - <div class="col s4 l3 xl3 bold ${redTextColor} no-wrap right-align transaction-text">${helpers.getCurrencyString(amount)}</div> + <div class="col ${size} bold ${redTextColor} no-wrap right-align transaction-text">${helpers.getCurrencyString(amount)}</div> <#else> - <div class="col s4 l3 xl3 bold ${greenTextColor} no-wrap right-align transaction-text">${helpers.getCurrencyString(amount)}</div> + <div class="col ${size} bold ${greenTextColor} no-wrap right-align transaction-text">${helpers.getCurrencyString(amount)}</div> </#if> </#macro> @@ -60,8 +60,14 @@ </div> </#macro> +<#macro transactionAccount transaction> + <div class="col s4 l2 xl2 truncate"> + ${transaction.getAccount().getName()} + </div> +</#macro> + <#macro transactionLinks transaction> - <div class="col s8 l2 xl1 right-align transaction-buttons no-wrap"> + <div class="col s4 l2 xl1 right-align transaction-buttons no-wrap"> <a href="<@s.url '/transactions/${transaction.ID?c}/highlight'/>" class="btn-flat no-padding text-color"><i class="material-icons left">open_in_new</i></a> <a href="<@s.url '/transactions/${transaction.ID?c}/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">edit</i></a> </div>