From d664085cf699fbffd827b2f75687575e7945256d Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sun, 11 Sep 2022 11:02:13 +0200 Subject: [PATCH] Fixed #719 - color row on highlight transaction from search --- .../src/main/resources/static/css/transactions.css | 3 ++- .../main/resources/templates/transactions/transactions.ftl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BudgetMasterServer/src/main/resources/static/css/transactions.css b/BudgetMasterServer/src/main/resources/static/css/transactions.css index 8651d6d01..c72fe1b4a 100644 --- a/BudgetMasterServer/src/main/resources/static/css/transactions.css +++ b/BudgetMasterServer/src/main/resources/static/css/transactions.css @@ -50,7 +50,8 @@ opacity: 0.5; } -.transaction-row-transparent-override { +.transaction-row-highlighted { + background-color: var(--color-blue-light) !important; opacity: 1.0 !important; } diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl index f11ab9a9d..009899eac 100644 --- a/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl +++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl @@ -64,7 +64,7 @@ <#assign lastDate=transactionDate/> </#if> - <div class="hide-on-large-only transaction-row-top card transaction-card background-light <#if transaction.isFuture()>transaction-row-transparent</#if> <#if shouldHighlight>background-blue-light transaction-row-transparent-override" id="highlighted-small"<#else>"</#if>> + <div class="hide-on-large-only transaction-row-top card transaction-card background-light <#if transaction.isFuture()>transaction-row-transparent</#if> <#if shouldHighlight>transaction-row-highlighted" id="highlighted-small"<#else>"</#if>> <div class="row valign-wrapper transaction-row-bottom no-margin-bottom"> <@transactionsMacros.transactionNameAndDescription transaction "s6"/> <@transactionsMacros.transactionAmount transaction account "s6"/> @@ -77,7 +77,7 @@ </div> </div> - <div class="hide-on-med-and-down transaction-row-top card transaction-card transaction-row-bottom background-light <#if transaction.isFuture()>transaction-row-transparent</#if> <#if shouldHighlight>background-blue-light transaction-row-transparent-override" id="highlighted-large"<#else>"</#if>> + <div class="hide-on-med-and-down transaction-row-top card transaction-card transaction-row-bottom background-light <#if transaction.isFuture()>transaction-row-transparent</#if> <#if shouldHighlight>transaction-row-highlighted" id="highlighted-large"<#else>"</#if>> <div class="row valign-wrapper no-margin-bottom transaction-row-desktop"> <@transactionsMacros.transactionCategory transaction "left-align"/> <@transactionsMacros.transactionAccountIcon transaction/> -- GitLab