From 426adab88d105742bfdef672e754797122ac7d16 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 20 Aug 2022 00:33:28 +0200
Subject: [PATCH] #400 - fixed search results
---
.../src/main/resources/static/css/transactions.css | 8 ++++----
.../src/main/resources/templates/search/search.ftl | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/BudgetMasterServer/src/main/resources/static/css/transactions.css b/BudgetMasterServer/src/main/resources/static/css/transactions.css
index fd631a9c7..2f66a78c4 100644
--- a/BudgetMasterServer/src/main/resources/static/css/transactions.css
+++ b/BudgetMasterServer/src/main/resources/static/css/transactions.css
@@ -34,10 +34,6 @@
margin: auto;
}
-.transaction-line-height {
- line-height: 50px;
-}
-
.transaction-row-top {
padding: 14px 0.5rem 0 0.5rem;
}
@@ -82,6 +78,10 @@
margin-bottom: 0.5rem;
}
+.search-result .transaction-date {
+ margin: 0;
+}
+
.new-transaction-button {
position: absolute;
display: inline-block;
diff --git a/BudgetMasterServer/src/main/resources/templates/search/search.ftl b/BudgetMasterServer/src/main/resources/templates/search/search.ftl
index f962e9df4..d40a4367e 100644
--- a/BudgetMasterServer/src/main/resources/templates/search/search.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/search/search.ftl
@@ -41,7 +41,7 @@
${dateService.getDateStringNormal(transaction.date)}
</div>
<@transactionsMacros.transactionAccountIcon transaction/>
- <@transactionsMacros.transactionType transaction/>
+ <@transactionsMacros.transactionType transaction "s2"/>
<@transactionsMacros.transactionLinks transaction/>
</div>
<div class="row valign-wrapper no-margin-bottom">
@@ -52,12 +52,12 @@
</div>
<div class="hide-on-med-and-down">
<div class="row valign-wrapper no-margin-bottom">
- <div class="col l2 xl1 bold transaction-text transaction-line-height transaction-date">
+ <div class="col l2 xl1 bold transaction-text transaction-row-desktop transaction-date valign-wrapper">
${dateService.getDateStringNormal(transaction.date)}
</div>
<@transactionsMacros.transactionCategory transaction "left-align"/>
<@transactionsMacros.transactionAccountIcon transaction/>
- <@transactionsMacros.transactionType transaction/>
+ <@transactionsMacros.transactionType transaction "l1 xl1"/>
<@transactionsMacros.transactionNameAndDescription transaction "l3 xl4"/>
<@transactionsMacros.transactionAmount transaction transaction.getAccount() "l2 xl2"/>
<@transactionsMacros.transactionLinks transaction/>
--
GitLab