From 04925b247a0b8f57ac4143a9dd6c239fdf879638 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 29 Sep 2018 22:19:54 +0200
Subject: [PATCH] changed style of modals (buttons are now colored)
---
src/main/resources/templates/accounts/accounts.ftl | 6 +++---
src/main/resources/templates/categories/categories.ftl | 4 ++--
src/main/resources/templates/datePicker.ftl | 4 ++--
src/main/resources/templates/notification.ftl | 4 ++--
src/main/resources/templates/settings.ftl | 10 +++++-----
.../resources/templates/transactions/transactions.ftl | 4 ++--
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index e4be009dd..b1b30e88b 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -44,8 +44,8 @@
<p>${locale.getString("info.text.account.delete", currentAccount.getName(), currentAccount.getReferringTransactions()?size)}</p>
</div>
<div class="modal-footer background-color">
- <a href="/accounts" class="modal-action modal-close waves-effect waves-red btn-flat ">${locale.getString("cancel")}</a>
- <a href="/accounts/${currentAccount.getID()}/delete" class="modal-action modal-close waves-effect waves-green btn-flat ">${locale.getString("info.button.account.delete")}</a>
+ <a href="/accounts" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
+ <a href="/accounts/${currentAccount.getID()}/delete" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("info.button.account.delete")}</a>
</div>
</div>
</#if>
@@ -58,7 +58,7 @@
<p>${locale.getString("warning.text.account.delete", currentAccount.getName())}</p>
</div>
<div class="modal-footer background-color">
- <a href="/accounts" class="modal-action modal-close waves-effect waves-green btn-flat text-color">${locale.getString("ok")}</a>
+ <a href="/accounts" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("ok")}</a>
</div>
</div>
</#if>
diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index 7891e8ccd..f6e1ae684 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -53,8 +53,8 @@
<p>${locale.getString("info.text.category.delete", currentCategory.name)}</p>
</div>
<div class="modal-footer background-color">
- <a href="/categories" class="modal-action modal-close waves-effect waves-red btn-flat ">${locale.getString("cancel")}</a>
- <a href="/categories/${currentCategory.ID}/delete" class="modal-action modal-close waves-effect waves-green btn-flat ">${locale.getString("delete")}</a>
+ <a href="/categories" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
+ <a href="/categories/${currentCategory.ID}/delete" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("delete")}</a>
</div>
</div>
</#if>
diff --git a/src/main/resources/templates/datePicker.ftl b/src/main/resources/templates/datePicker.ftl
index b960460d6..36c1ca521 100644
--- a/src/main/resources/templates/datePicker.ftl
+++ b/src/main/resources/templates/datePicker.ftl
@@ -29,8 +29,8 @@
</div>
</div>
<div class="modal-footer background-color">
- <a href="${target}" class="modal-action modal-close waves-effect waves-red btn-flat">${locale.getString("cancel")}</a>
- <a href="/setDate?target=${target}" id="buttonChooseDate" class="modal-action modal-close waves-effect waves-green btn-flat">${locale.getString("ok")}</a>
+ <a href="${target}" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
+ <a href="/setDate?target=${target}" id="buttonChooseDate" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("ok")}</a>
</div>
</div>
</#macro>
diff --git a/src/main/resources/templates/notification.ftl b/src/main/resources/templates/notification.ftl
index b19eb2f52..84cfebf5d 100644
--- a/src/main/resources/templates/notification.ftl
+++ b/src/main/resources/templates/notification.ftl
@@ -8,7 +8,7 @@
<p>${model["notifications"][0].messageBody}</p>
</div>
<div class="modal-footer">
- <a class="modal-action modal-close waves-effect waves-green btn-flat">OK</a>
+ <a class="modal-action modal-close waves-effect waves-light green btn-flat white-text">OK</a>
</div>
</div>
<#else>
@@ -24,7 +24,7 @@
</#list>
</div>
<div class="modal-footer">
- <a class="modal-action modal-close waves-effect waves-green btn-flat">OK</a>
+ <a class="modal-action modal-close waves-effect waves-light green btn-flat white-text">OK</a>
</div>
</div>
</#if>
diff --git a/src/main/resources/templates/settings.ftl b/src/main/resources/templates/settings.ftl
index 8ba7ee27d..606388cb9 100644
--- a/src/main/resources/templates/settings.ftl
+++ b/src/main/resources/templates/settings.ftl
@@ -201,8 +201,8 @@
</form>
</div>
<div class="modal-footer background-color">
- <a href="/settings" class="modal-action modal-close waves-effect waves-red btn-flat ">${locale.getString("cancel")}</a>
- <a class="modal-action modal-close waves-effect waves-green btn-flat" id="button-confirm-database-delete">${locale.getString("delete")}</a>
+ <a href="/settings" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
+ <a class="modal-action modal-close waves-effect waves-light green btn-flat white-text" id="button-confirm-database-delete">${locale.getString("delete")}</a>
</div>
</div>
</#if>
@@ -223,8 +223,8 @@
</form>
</div>
<div class="modal-footer background-color">
- <a href="/settings" class="modal-action modal-close waves-effect waves-red btn-flat ">${locale.getString("cancel")}</a>
- <a class="modal-action modal-close waves-effect waves-green btn-flat" id="button-confirm-database-import">${locale.getString("settings.database.import")}</a>
+ <a href="/settings" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
+ <a class="modal-action modal-close waves-effect waves-light green btn-flat white-text" id="button-confirm-database-import">${locale.getString("settings.database.import")}</a>
</div>
</div>
</#if>
@@ -236,7 +236,7 @@
<p>${locale.getString("error.text.database.import", errorImportDatabase)}</p>
</div>
<div class="modal-footer background-color">
- <a href="/settings" class="modal-action modal-close waves-effect waves-red btn-flat ">${locale.getString("ok")}</a>
+ <a href="/settings" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("ok")}</a>
</div>
</div>
</#if>
diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl
index ceab026f5..139b78751 100644
--- a/src/main/resources/templates/transactions/transactions.ftl
+++ b/src/main/resources/templates/transactions/transactions.ftl
@@ -90,8 +90,8 @@
<p>${locale.getString("info.text.transaction.delete", currentTransaction.name)}</p>
</div>
<div class="modal-footer background-color">
- <a href="/transactions" class="modal-action modal-close waves-effect waves-red btn-flat ">${locale.getString("cancel")}</a>
- <a href="/transactions/${currentTransaction.ID}/delete" class="modal-action modal-close waves-effect waves-green btn-flat ">${locale.getString("delete")}</a>
+ <a href="/transactions" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
+ <a href="/transactions/${currentTransaction.ID}/delete" class="modal-action modal-close waves-effectwaves-light green btn-flat white-text">${locale.getString("delete")}</a>
</div>
</div>
</#if>
--
GitLab