From 40e9ed2d85bbd57c023a44d1f2bc28c4f6c54963 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 1 Jul 2018 11:51:41 +0200
Subject: [PATCH] #258 - added dark them for accounts, payments, categories,
settings and about
---
.../controller/PaymentController.java | 10 ++++--
src/main/resources/languages/_de.properties | 2 +-
src/main/resources/static/css/dark/style.css | 33 ++++++++++++++++---
src/main/resources/static/css/style.css | 4 +++
src/main/resources/templates/about.ftl | 2 +-
.../resources/templates/accounts/accounts.ftl | 18 +++++-----
.../templates/accounts/newAccount.ftl | 4 +--
.../templates/categories/categories.ftl | 12 +++----
.../templates/categories/newCategory.ftl | 4 +--
src/main/resources/templates/datePicker.ftl | 12 +++----
src/main/resources/templates/header.ftl | 8 +++++
src/main/resources/templates/index.ftl | 2 +-
src/main/resources/templates/login.ftl | 10 ------
src/main/resources/templates/navbar.ftl | 4 +--
.../templates/payments/newPayment.ftl | 4 +--
.../resources/templates/payments/payments.ftl | 22 ++++++-------
src/main/resources/templates/settings.ftl | 15 ++++-----
17 files changed, 99 insertions(+), 67 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/PaymentController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/PaymentController.java
index 1aace26bd..78b93e85d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/PaymentController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/PaymentController.java
@@ -86,11 +86,17 @@ public class PaymentController extends BaseController
DateTime date = getDateTimeFromCookie(cookieDate);
List<Payment> payments = paymentService.getPaymentsForMonthAndYear(helpers.getCurrentAccount(), date.getMonthOfYear(), date.getYear(), getSettings().isRestActivated());
+ int incomeSum = helpers.getIncomeSumForPaymentList(payments);
+ int paymentSum = helpers.getPaymentSumForPaymentList(payments);
+ int rest = incomeSum + paymentSum;
+
model.addAttribute("payments", payments);
- model.addAttribute("incomeSum", helpers.getIncomeSumForPaymentList(payments));
- model.addAttribute("paymentSum", helpers.getPaymentSumForPaymentList(payments));
+ model.addAttribute("incomeSum", incomeSum);
+ model.addAttribute("paymentSum", paymentSum);
model.addAttribute("currentDate", date);
model.addAttribute("currentPayment", paymentRepository.getOne(ID));
+ model.addAttribute("rest", rest);
+
return "payments/payments";
}
diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index 26cfe2055..0a267dd4a 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -169,7 +169,7 @@ info.title.database.export=Erfolgreich exportiert
info.text.database.export=Die Datenbank wurde erfolgreich exportiert.
info.title.database.import=Erfolgreich importiert
info.text.database.import=Die Datenbank wurde erfolgreich importiert.
-info.title.database.import.dialog=Datebank importieren
+info.title.database.import.dialog=Datenbank importieren
info.text.database.import.dialog=Soll die Datenbank vor dem Importieren gel�scht werden?
info.text.database.import.dialog.delete=Ja, Datenbank l�schen
info.text.database.import.dialog.append=Nein, Daten hinzuf�gen
diff --git a/src/main/resources/static/css/dark/style.css b/src/main/resources/static/css/dark/style.css
index 91b0c29c4..83928f3ba 100644
--- a/src/main/resources/static/css/dark/style.css
+++ b/src/main/resources/static/css/dark/style.css
@@ -2,6 +2,7 @@ body {
display: flex;
min-height: 100vh;
flex-direction: column;
+ color: #FFFFFF;
}
header, main, footer {
@@ -18,6 +19,10 @@ main {
flex: 1 0 auto;
}
+.text-color {
+ color: #FFFFFF;
+}
+
.budgetmaster-blue {
background-color: #2E79B9;
}
@@ -148,8 +153,8 @@ main {
/* input text color */
.input-field input[type=text] {
color: #FFFFFF;
- border-bottom: 1px solid #FFFFFF !important;
- box-shadow: 0 1px 0 0 #CCCCCC !important;
+ border-bottom: 1px solid #FFFFFF;
+ box-shadow: 0 1px 0 0 #CCCCCC;
}
/* input password label color */
@@ -217,7 +222,10 @@ main {
margin: auto;
width: 95%;
padding: 2rem;
- background-color: #444444;
+}
+
+.background-color {
+ background-color: #444444 !important;
}
#nav-logo-container {
@@ -306,11 +314,13 @@ main {
.headline {
font-size: 2rem;
text-transform: initial;
+ color: #FFFFFF;
}
.headline-date {
font-size: 4vmin;
text-transform: capitalize;
+ color: #FFFFFF;
}
.budget-headline-icon {
@@ -366,7 +376,7 @@ ul.dropdown-content.select-dropdown li.selected {
/* switch color */
.switch label input[type="checkbox"]:checked + .lever {
- background-color: rgba(46, 121, 185, 0.6);
+ background-color: rgba(131, 190, 240, 0.6)
}
.switch label input[type="checkbox"]:checked + .lever::after {
@@ -391,6 +401,10 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la
border: 2px solid #2E79B9;
}
+input[type="radio"]:not(:checked) + label::before, [type="radio"]:not(:checked) + label::after {
+ border: 2px solid #FFFFFF;
+}
+
.account-budget {
font-size: 20px !important;
}
@@ -430,6 +444,14 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la
color: #777777 !important;
}
+.modal-footer .btn-flat {
+ color: #FFFFFF;
+}
+
+.chips .input {
+ color: #FFFFFF;
+}
+
.hidden {
display: none;
}
@@ -441,6 +463,7 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la
.budget-headline {
font-size: 1.5vmin;
+ color: #A3A3A3;
}
.budget {
@@ -455,6 +478,7 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la
.budget-headline {
font-size: 2.5vmin;
+ color: #A3A3A3;
}
.budget {
@@ -469,6 +493,7 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la
.budget-headline {
font-size: 4vmin;
+ color: #A3A3A3;
}
.budget {
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index b6add1392..2f8f21ac5 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -265,6 +265,7 @@ main {
.headline {
font-size: 2rem;
text-transform: initial;
+ color: #212121;
}
.headline-date {
@@ -399,6 +400,7 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la
.budget-headline {
font-size: 1.5vmin;
+ color: #757575;
}
.budget {
@@ -413,6 +415,7 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la
.budget-headline {
font-size: 2.5vmin;
+ color: #757575;
}
.budget {
@@ -427,6 +430,7 @@ input[type="radio"]:checked + label::after, [type="radio"].with-gap:checked + la
.budget-headline {
font-size: 4vmin;
+ color: #757575;
}
.budget {
diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl
index a402a2acd..a0608e80e 100644
--- a/src/main/resources/templates/about.ftl
+++ b/src/main/resources/templates/about.ftl
@@ -9,7 +9,7 @@
<@navbar.navbar "about"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<div class="container">
<div class="row">
<div class="col s8 offset-s2 center-align">
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index c4c0e090a..42eb98dc5 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -9,10 +9,10 @@
<@navbar.navbar "accounts"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="grey-text text-darken-4 headline">${locale.getString("menu.accounts")}</div>
+ <div class="headline">${locale.getString("menu.accounts")}</div>
</div>
</div>
<br>
@@ -24,8 +24,8 @@
<tr>
<td>${account.getName()}</td>
<td>
- <a href="/accounts/${account.getID()}/edit" class="btn-flat no-padding"><i class="material-icons left">edit</i></a>
- <a href="/accounts/${account.getID()}/requestDelete" class="btn-flat no-padding"><i class="material-icons left">delete</i></a>
+ <a href="/accounts/${account.getID()}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
+ <a href="/accounts/${account.getID()}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
</td>
</tr>
</#list>
@@ -36,12 +36,12 @@
<#if currentAccount??>
<!-- confirm delete modal -->
- <div id="modalConfirmDelete" class="modal">
+ <div id="modalConfirmDelete" class="modal background-color">
<div class="modal-content">
<h4>${locale.getString("info.title.account.delete")}</h4>
<p>${locale.getString("info.text.account.delete", currentAccount.getName(), currentAccount.getReferringPayments()?size)}</p>
</div>
- <div class="modal-footer">
+ <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>
</div>
@@ -50,13 +50,13 @@
<#if accountNotDeletable??>
<!-- warning account not deletable -->
- <div id="modalAccountNotDeletable" class="modal">
+ <div id="modalAccountNotDeletable" class="modal background-color">
<div class="modal-content">
<h4>${locale.getString("info.title.account.delete")}</h4>
<p>${locale.getString("warning.text.account.delete", currentAccount.getName())}</p>
</div>
- <div class="modal-footer">
- <a href="/accounts" class="modal-action modal-close waves-effect waves-green btn-flat ">${locale.getString("ok")}</a>
+ <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>
</div>
</div>
</#if>
diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl
index 799fce89b..f7163afb9 100644
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
@@ -9,10 +9,10 @@
<@navbar.navbar "accounts"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="grey-text text-darken-4 headline"><#if account.getID()??>${locale.getString("title.account.edit")}<#else>${locale.getString("title.account.new")}</#if></div>
+ <div class="headline"><#if account.getID()??>${locale.getString("title.account.edit")}<#else>${locale.getString("title.account.new")}</#if></div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index 705d091aa..b0f735776 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -10,10 +10,10 @@
<@navbar.navbar "categories"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="grey-text text-darken-4 headline">${locale.getString("menu.categories")}</div>
+ <div class="headline">${locale.getString("menu.categories")}</div>
</div>
</div>
<br>
@@ -32,9 +32,9 @@
</td>
<td>${category.name}</td>
<td>
- <a href="/categories/${category.ID}/edit" class="btn-flat no-padding"><i class="material-icons left">edit</i></a>
+ <a href="/categories/${category.ID}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
<#if (category.type.name() == "CUSTOM")>
- <a href="/categories/${category.ID}/requestDelete" class="btn-flat no-padding"><i class="material-icons left">delete</i></a>
+ <a href="/categories/${category.ID}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
</#if>
</td>
</tr>
@@ -45,12 +45,12 @@
<#if currentCategory??>
<!-- confirm delete modal -->
- <div id="modalConfirmDelete" class="modal">
+ <div id="modalConfirmDelete" class="modal background-color">
<div class="modal-content">
<h4>${locale.getString("info.title.category.delete")}</h4>
<p>${locale.getString("info.text.category.delete", currentCategory.name)}</p>
</div>
- <div class="modal-footer">
+ <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>
</div>
diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl
index 3b0a3d24a..cbfaddc63 100644
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
@@ -11,10 +11,10 @@
<@navbar.navbar "categories"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="grey-text text-darken-4 headline"><#if category.getID()??>${locale.getString("title.category.edit")}<#else>${locale.getString("title.category.new")}</#if></div>
+ <div class="headline"><#if category.getID()??>${locale.getString("title.category.edit")}<#else>${locale.getString("title.category.new")}</#if></div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/datePicker.ftl b/src/main/resources/templates/datePicker.ftl
index 0237395f1..0724e80ef 100644
--- a/src/main/resources/templates/datePicker.ftl
+++ b/src/main/resources/templates/datePicker.ftl
@@ -2,15 +2,15 @@
<#assign locale = static["tools.Localization"]>
<div class="container">
<div class="section center-align">
- <a href="/previousMonth?target=${target}" class="waves-effect grey-text text-darken-4"><i class="material-icons icon-chevron">chevron_left</i></a>
- <a href="#modalDate" class="waves-effect grey-text text-darken-4 headline-date modal-trigger">${helpers.getDateStringWithMonthAndYear(fullDate)}</a>
- <a href="/nextMonth?target=${target}" class="waves-effect grey-text text-darken-4"><i class="material-icons icon-chevron">chevron_right</i></a>
- <a href="/today?target=${target}" class="waves-effect grey-text text-darken-4"><i class="material-icons icon-today">event</i></a>
+ <a href="/previousMonth?target=${target}" class="waves-effect text-color"><i class="material-icons icon-chevron">chevron_left</i></a>
+ <a href="#modalDate" class="waves-effect headline-date modal-trigger text-color">${helpers.getDateStringWithMonthAndYear(fullDate)}</a>
+ <a href="/nextMonth?target=${target}" class="waves-effect text-color"><i class="material-icons icon-chevron">chevron_right</i></a>
+ <a href="/today?target=${target}" class="waves-effect text-color"><i class="material-icons icon-today">event</i></a>
</div>
</div>
<!-- modal to select specific month and year -->
<div id="modalDate" class="modal modal-fixed-footer">
- <div class="modal-content">
+ <div class="modal-content background-color">
<h4>${locale.getString("title.datepicker")}</h4>
<div class="input-field col s12">
<select id="selectMonth">
@@ -29,7 +29,7 @@
<label for="selectYear">${locale.getString("datepicker.label.year")}</label>
</div>
</div>
- <div class="modal-footer">
+ <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>
</div>
diff --git a/src/main/resources/templates/header.ftl b/src/main/resources/templates/header.ftl
index 590a5e2ca..76a1d9936 100644
--- a/src/main/resources/templates/header.ftl
+++ b/src/main/resources/templates/header.ftl
@@ -14,6 +14,14 @@
<link rel="stylesheet" href="/materialize-0.100.2/css/materialize.min.css">
<@style "style"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+ <#if helpers.getSettings().isUseDarkTheme()>
+ <#global greenTextColor="text-green"/>
+ <#global redTextColor="text-light-red"/>
+ <#else>
+ <#global greenTextColor="text-dark-green"/>
+ <#global redTextColor="text-red"/>
+ </#if>
</#macro>
<#macro logo id classes>
diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl
index ac19821a3..d36bd1fea 100644
--- a/src/main/resources/templates/index.ftl
+++ b/src/main/resources/templates/index.ftl
@@ -9,7 +9,7 @@
<@navbar.navbar "home"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<div class="container">
<#-- icon -->
<div class="row">
diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl
index 916e41510..1b47507ea 100644
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
@@ -3,17 +3,7 @@
<#import "header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "login"/>
-
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<#assign locale = static["tools.Localization"]>
-
- <#if helpers.getSettings().isUseDarkTheme()>
- <#assign greenTextColor="text-green"/>
- <#assign redTextColor="text-light-red"/>
- <#else>
- <#assign greenTextColor="text-dark-green"/>
- <#assign redTextColor="text-red"/>
- </#if>
</head>
<body class="budgetmaster-blue-light">
<main>
diff --git a/src/main/resources/templates/navbar.ftl b/src/main/resources/templates/navbar.ftl
index 3483d3a14..9e69c909b 100644
--- a/src/main/resources/templates/navbar.ftl
+++ b/src/main/resources/templates/navbar.ftl
@@ -59,9 +59,9 @@
</div>
<#assign accountBudget = helpers.getAccountBudget()/>
<#if accountBudget <= 0>
- <div class="account-budget text-red">${helpers.getCurrencyString(accountBudget)}</div>
+ <div class="account-budget ${redTextColor}">${helpers.getCurrencyString(accountBudget)}</div>
<#else>
- <div class="account-budget text-dark-green">${helpers.getCurrencyString(accountBudget)}</div>
+ <div class="account-budget ${greenTextColor}">${helpers.getCurrencyString(accountBudget)}</div>
</#if>
</div>
</#macro>
diff --git a/src/main/resources/templates/payments/newPayment.ftl b/src/main/resources/templates/payments/newPayment.ftl
index 46ed6a199..ddf35ad3a 100644
--- a/src/main/resources/templates/payments/newPayment.ftl
+++ b/src/main/resources/templates/payments/newPayment.ftl
@@ -12,10 +12,10 @@
<@navbar.navbar "payments"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="grey-text text-darken-4 headline"><#if payment.getID()??>${locale.getString("title.payment.edit")}<#else>${locale.getString("title.payment.new")}</#if></div>
+ <div class="headline"><#if payment.getID()??>${locale.getString("title.payment.edit")}<#else>${locale.getString("title.payment.new")}</#if></div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/payments/payments.ftl b/src/main/resources/templates/payments/payments.ftl
index a95b211e8..107f51bc5 100644
--- a/src/main/resources/templates/payments/payments.ftl
+++ b/src/main/resources/templates/payments/payments.ftl
@@ -10,7 +10,7 @@
<@navbar.navbar "payments"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<#import "../datePicker.ftl" as datePicker>
<@datePicker.datePicker currentDate "/payments"/>
<div class="container">
@@ -19,21 +19,21 @@
<div class="icon-block">
<h1 class="center text-green budget-headline-icon"><i class="material-icons icon-budget">file_download</i></h1>
<h5 class="center budget">${helpers.getCurrencyString(incomeSum)}</h5>
- <h5 class="center grey-text text-darken-1 budget-headline">${locale.getString("title.incomes")}</h5>
+ <h5 class="center budget-headline">${locale.getString("title.incomes")}</h5>
</div>
</div>
<div class="col s4">
<div class="icon-block">
- <h1 class="center text-red budget-headline-icon"><i class="material-icons icon-budget">file_upload</i></h1>
+ <h1 class="center ${redTextColor} budget-headline-icon"><i class="material-icons icon-budget">file_upload</i></h1>
<h5 class="center budget">${helpers.getCurrencyString(paymentSum)}</h5>
- <h5 class="center grey-text text-darken-1 budget-headline">${locale.getString("title.payments")}</h5>
+ <h5 class="center budget-headline">${locale.getString("title.payments")}</h5>
</div>
</div>
<div class="col s4">
<div class="icon-block">
<h1 class="center budgetmaster-blue-text budget-headline-icon"><i class="fas fa-piggy-bank icon-budget"></i></h1>
<h5 class="center budget">${helpers.getCurrencyString(rest)}</h5>
- <h5 class="center grey-text text-darken-1 budget-headline">${locale.getString("title.rest")}</h5>
+ <h5 class="center budget-headline">${locale.getString("title.rest")}</h5>
</div>
</div>
</div>
@@ -64,14 +64,14 @@
</#if>
</td>
<#if payment.amount <= 0>
- <td class="bold text-red">${helpers.getCurrencyString(payment.amount)}</td>
+ <td class="bold ${redTextColor}">${helpers.getCurrencyString(payment.amount)}</td>
<#else>
- <td class="bold text-dark-green">${helpers.getCurrencyString(payment.amount)}</td>
+ <td class="bold ${greenTextColor}">${helpers.getCurrencyString(payment.amount)}</td>
</#if>
<td>
<#if (payment.category.type.name() != "REST")>
- <a href="/payments/${payment.ID}/edit" class="btn-flat no-padding"><i class="material-icons left">edit</i></a>
- <a href="/payments/${payment.ID}/requestDelete" class="btn-flat no-padding"><i class="material-icons left">delete</i></a>
+ <a href="/payments/${payment.ID}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
+ <a href="/payments/${payment.ID}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
</#if>
</td>
</tr>
@@ -82,12 +82,12 @@
<#if currentPayment??>
<!-- confirm delete modal -->
- <div id="modalConfirmDelete" class="modal">
+ <div id="modalConfirmDelete" class="modal background-color">
<div class="modal-content">
<h4>${locale.getString("info.title.payment.delete")}</h4>
<p>${locale.getString("info.text.payment.delete", currentPayment.name)}</p>
</div>
- <div class="modal-footer">
+ <div class="modal-footer background-color">
<a href="/payments" class="modal-action modal-close waves-effect waves-red btn-flat ">${locale.getString("cancel")}</a>
<a href="/payments/${currentPayment.ID}/delete" class="modal-action modal-close waves-effect waves-green btn-flat ">${locale.getString("delete")}</a>
</div>
diff --git a/src/main/resources/templates/settings.ftl b/src/main/resources/templates/settings.ftl
index 495d835a4..2dbd3e71e 100644
--- a/src/main/resources/templates/settings.ftl
+++ b/src/main/resources/templates/settings.ftl
@@ -9,10 +9,10 @@
<@navbar.navbar "settings"/>
<main>
- <div class="card main-card">
+ <div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="grey-text text-darken-4 headline">${locale.getString("menu.settings")}</div>
+ <div class="headline">${locale.getString("menu.settings")}</div>
</div>
</div>
<div class="container">
@@ -141,7 +141,7 @@
<#-- database -->
<div class="container">
<div class="section center-align">
- <div class="grey-text text-darken-4 headline">${locale.getString("menu.settings.database")}</div>
+ <div class="headline">${locale.getString("menu.settings.database")}</div>
</div>
</div>
<div class="container">
@@ -183,7 +183,7 @@
</main>
<#if deleteDatabase??>
- <div id="modalConfirmDelete" class="modal">
+ <div id="modalConfirmDelete" class="modal background-color">
<div class="modal-content">
<h4>${locale.getString("info.title.database.delete")}</h4>
<p>${locale.getString("info.header.text.database.delete")}</p>
@@ -200,9 +200,8 @@
</div>
</div>
</form>
-
</div>
- <div class="modal-footer">
+ <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>
</div>
@@ -210,7 +209,7 @@
</#if>
<#if importDatabase??>
- <div id="modalImportDatabase" class="modal">
+ <div id="modalImportDatabase" class="modal background-color">
<div class="modal-content">
<h4>${locale.getString("info.title.database.import.dialog")}</h4>
@@ -227,7 +226,7 @@
</div>
</form>
</div>
- <div class="modal-footer">
+ <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>
</div>
--
GitLab