From 9d0ae38cd17f78f2794851871b60b94c1b9447a2 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Thu, 20 Jun 2019 22:38:54 +0200 Subject: [PATCH] Fixed #450 - show full date on search result page --- src/main/resources/static/css/dark/transactions.css | 4 ++++ src/main/resources/static/css/transactions.css | 4 ++++ src/main/resources/templates/search/search.ftl | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/resources/static/css/dark/transactions.css b/src/main/resources/static/css/dark/transactions.css index a59e6e044..5424dc506 100644 --- a/src/main/resources/static/css/dark/transactions.css +++ b/src/main/resources/static/css/dark/transactions.css @@ -61,6 +61,10 @@ height: 36px; } +.transaction-date { + min-width: 5.5rem; +} + .new-transaction-button { position: absolute; display: inline-block; diff --git a/src/main/resources/static/css/transactions.css b/src/main/resources/static/css/transactions.css index a59e6e044..5424dc506 100644 --- a/src/main/resources/static/css/transactions.css +++ b/src/main/resources/static/css/transactions.css @@ -61,6 +61,10 @@ height: 36px; } +.transaction-date { + min-width: 5.5rem; +} + .new-transaction-button { position: absolute; display: inline-block; diff --git a/src/main/resources/templates/search/search.ftl b/src/main/resources/templates/search/search.ftl index d18cde2b6..9d2859033 100644 --- a/src/main/resources/templates/search/search.ftl +++ b/src/main/resources/templates/search/search.ftl @@ -36,7 +36,7 @@ <div class="hide-on-large-only"> <div class="row valign-wrapper"> <div class="col s3 center-align bold transaction-text"> - ${dateService.getDateStringWithoutYear(transaction.date)} + ${dateService.getDateStringNormal(transaction.date)} </div> <@transactionsMacros.transactionType transaction/> <@transactionsMacros.transactionAccount transaction/> @@ -50,8 +50,8 @@ </div> <div class="hide-on-med-and-down"> <div class="row valign-wrapper no-margin-bottom"> - <div class="col l1 xl1 bold transaction-text transaction-line-height"> - ${dateService.getDateStringWithoutYear(transaction.date)} + <div class="col l2 xl1 bold transaction-text transaction-line-height transaction-date"> + ${dateService.getDateStringNormal(transaction.date)} </div> <@transactionsMacros.transactionCategory transaction "left-align"/> <@transactionsMacros.transactionType transaction/> -- GitLab