From 5690dbf18351202089af0491a0df89926c99b1a7 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 15 Feb 2021 22:36:56 +0100
Subject: [PATCH] #563 - Refactor usages of text-color
---
src/main/resources/static/css/dark/style.css | 4 ----
src/main/resources/static/css/style.css | 4 ----
src/main/resources/templates/accounts/accounts.ftl | 8 ++++----
.../resources/templates/categories/categories.ftl | 4 ++--
.../resources/templates/charts/chartFunctions.ftl | 2 +-
src/main/resources/templates/charts/manage.ftl | 8 ++++----
.../resources/templates/filter/filterMacros.ftl | 14 +++++++-------
.../templates/helpers/globalDatePicker.ftl | 12 ++++++------
src/main/resources/templates/helpers/navbar.ftl | 4 ++--
src/main/resources/templates/indexFunctions.ftl | 6 +++---
src/main/resources/templates/reports/reports.ftl | 10 +++++-----
.../resources/templates/search/searchMacros.ftl | 14 +++++++-------
src/main/resources/templates/settings/settings.ftl | 4 ++--
.../templates/settings/settingsMacros.ftl | 8 ++++----
.../templates/createFromTransactionModal.ftl | 4 ++--
.../templates/templates/templateFunctions.ftl | 8 ++++----
.../templates/transactions/transactionsMacros.ftl | 8 ++++----
.../selenium/NewTransactionFromTemplateTest.java | 4 ++--
18 files changed, 59 insertions(+), 67 deletions(-)
diff --git a/src/main/resources/static/css/dark/style.css b/src/main/resources/static/css/dark/style.css
index 4b3d161de..7908301a9 100644
--- a/src/main/resources/static/css/dark/style.css
+++ b/src/main/resources/static/css/dark/style.css
@@ -20,10 +20,6 @@ main {
margin-bottom: 24px;
}
-.text-color {
- color: #FFFFFF;
-}
-
.budgetmaster-text-update {
color: #212121 !important;
}
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 52720e862..d0045fe08 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -19,10 +19,6 @@ main {
margin-bottom: 24px;
}
-.text-color {
- color: #212121;
-}
-
.sidenav-trigger, .sidenav-trigger i {
font-size: 1.5em;
}
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index 730794743..8bba0e5f7 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -32,17 +32,17 @@
<#else>
<#assign toolTipText = locale.getString("account.tooltip.readonly.deactivate")/>
<#assign lockIcon = '<i class="fas fa-lock-open"></i>'/>
- <a href="<@s.url '/accounts/${account.getID()?c}/setAsDefault'/>" class="btn-flat no-padding text-color tooltipped" data-position="left" data-tooltip="${locale.getString("account.tooltip.default")}"><i class="material-icons left"><#if account.isDefault()>star<#else>star_border</#if></i></a>
+ <a href="<@s.url '/accounts/${account.getID()?c}/setAsDefault'/>" class="btn-flat no-padding text-defaultr tooltipped" data-position="left" data-tooltip="${locale.getString("account.tooltip.default")}"><i class="material-icons left"><#if account.isDefault()>star<#else>star_border</#if></i></a>
</#if>
<#if !account.isDefault()>
- <a href="<@s.url '/accounts/${account.getID()?c}/toggleReadOnly'/>" class="btn-flat no-padding text-color tooltipped" data-position="right" data-tooltip="${toolTipText}">${lockIcon}</a>
+ <a href="<@s.url '/accounts/${account.getID()?c}/toggleReadOnly'/>" class="btn-flat no-padding text-defaultr tooltipped" data-position="right" data-tooltip="${toolTipText}">${lockIcon}</a>
</#if>
</td>
<td>${account.getName()}</td>
<td>
- <a href="<@s.url '/accounts/${account.getID()?c}/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
- <a href="<@s.url '/accounts/${account.getID()?c}/requestDelete'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">delete</i></a>
+ <a href="<@s.url '/accounts/${account.getID()?c}/edit'/>" class="btn-flat no-padding text-defaultr"><i class="material-icons left">edit</i></a>
+ <a href="<@s.url '/accounts/${account.getID()?c}/requestDelete'/>" class="btn-flat no-padding text-defaultr"><i class="material-icons left no-margin">delete</i></a>
</td>
</tr>
</#if>
diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index a22c90990..73015f8a4 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -44,9 +44,9 @@
<td>${categoryName} </td>
<td>${usageCount}</td>
<td>
- <a href="<@s.url '/categories/${category.ID?c}/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
+ <a href="<@s.url '/categories/${category.ID?c}/edit'/>" class="btn-flat no-padding text-defaultr"><i class="material-icons left">edit</i></a>
<#if (category.getType().name() == "CUSTOM")>
- <a href="<@s.url '/categories/${category.ID?c}/requestDelete'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">delete</i></a>
+ <a href="<@s.url '/categories/${category.ID?c}/requestDelete'/>" class="btn-flat no-padding text-defaultr"><i class="material-icons left no-margin">delete</i></a>
</#if>
</td>
</tr>
diff --git a/src/main/resources/templates/charts/chartFunctions.ftl b/src/main/resources/templates/charts/chartFunctions.ftl
index 5b5165cc1..cff4d2b3c 100644
--- a/src/main/resources/templates/charts/chartFunctions.ftl
+++ b/src/main/resources/templates/charts/chartFunctions.ftl
@@ -15,7 +15,7 @@
<#macro infoMessage text>
<div class="row no-margin-bottom">
<div class="col s12 center-align">
- <table class="text-color login-message no-border-table">
+ <table class="text-default login-message no-border-table">
<tr>
<td><i class="material-icons">info</i></td>
<td>${text}</td>
diff --git a/src/main/resources/templates/charts/manage.ftl b/src/main/resources/templates/charts/manage.ftl
index 94b6495b0..5538a6428 100644
--- a/src/main/resources/templates/charts/manage.ftl
+++ b/src/main/resources/templates/charts/manage.ftl
@@ -36,15 +36,15 @@
<td>${chartName}</td>
<td>
<#if chart.getType().name() == "DEFAULT">
- <a class="no-padding text-color"><i class="material-icons left">lock</i></a>
+ <a class="no-padding text-default"><i class="material-icons left">lock</i></a>
<#else>
- <a class="no-padding text-color"><i class="material-icons left">person</i></a>
+ <a class="no-padding text-default"><i class="material-icons left">person</i></a>
</#if>
</td>
<td>
- <a href="<@s.url '/charts/${chart.ID?c}/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
+ <a href="<@s.url '/charts/${chart.ID?c}/edit'/>" class="btn-flat no-padding text-default"><i class="material-icons left">edit</i></a>
<#if (chart.getType().name() == "CUSTOM")>
- <a href="<@s.url '/charts/${chart.ID?c}/requestDelete'/>" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
+ <a href="<@s.url '/charts/${chart.ID?c}/requestDelete'/>" class="btn-flat no-padding text-default"><i class="material-icons left">delete</i></a>
</#if>
</td>
</tr>
diff --git a/src/main/resources/templates/filter/filterMacros.ftl b/src/main/resources/templates/filter/filterMacros.ftl
index 7eac102ac..740437698 100644
--- a/src/main/resources/templates/filter/filterMacros.ftl
+++ b/src/main/resources/templates/filter/filterMacros.ftl
@@ -128,19 +128,19 @@
<div class="col s12 m4 l4">
<label>
<input type="checkbox" name="${prefixValue}includeIncome" <#if filterConfiguration.isIncludeIncome()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('filter.type.income')}</span>
+ <span class="text-default">${locale.getString('filter.type.income')}</span>
</label>
</div>
<div class="col s12 m4 l4">
<label>
<input type="checkbox" name="${prefixValue}includeExpenditure" <#if filterConfiguration.isIncludeExpenditure()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('filter.type.expenditure')}</span>
+ <span class="text-default">${locale.getString('filter.type.expenditure')}</span>
</label>
</div>
<div class="col s12 m4 l4">
<label>
<input type="checkbox" name="${prefixValue}includeTransfer" <#if filterConfiguration.isIncludeTransfer()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('filter.type.transfer')}</span>
+ <span class="text-default">${locale.getString('filter.type.transfer')}</span>
</label>
</div>
</div>
@@ -158,13 +158,13 @@
<div class="col s6 m6 l6">
<label>
<input type="checkbox" name="${prefixValue}includeNotRepeating" <#if filterConfiguration.isIncludeNotRepeating()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('filter.repeating.false')}</span>
+ <span class="text-default">${locale.getString('filter.repeating.false')}</span>
</label>
</div>
<div class="col s6 m6 l6">
<label>
<input type="checkbox" name="${prefixValue}includeRepeating" <#if filterConfiguration.isIncludeRepeating()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('filter.repeating.true')}</span>
+ <span class="text-default">${locale.getString('filter.repeating.true')}</span>
</label>
</div>
</div>
@@ -185,7 +185,7 @@
<div>
<label>
<input type="checkbox" name="${prefixValue}filterCategories['${filterCategory?index}'].include" <#if filterCategory.isInclude()>checked="checked"</#if>>
- <span class="text-color">${filterCategory.getName()}</span>
+ <span class="text-default">${filterCategory.getName()}</span>
</label>
<input type="hidden" name="${prefixValue}filterCategories['${filterCategory?index}'].ID" value="${filterCategory.getID()}"/>
<input type="hidden" name="${prefixValue}filterCategories['${filterCategory?index}'].name" value="${filterCategory.getName()}"/>
@@ -210,7 +210,7 @@
<div>
<label>
<input type="checkbox" name="${prefixValue}filterTags['${filterTag?index}'].include" <#if filterTag.isInclude()>checked="checked"</#if>>
- <span class="text-color">${filterTag.getName()}</span>
+ <span class="text-default">${filterTag.getName()}</span>
</label>
<input type="hidden" name="${prefixValue}filterTags['${filterTag?index}'].ID" value="${filterTag.getID()}"/>
<input type="hidden" name="${prefixValue}filterTags['${filterTag?index}'].name" value="${filterTag.getName()}"/>
diff --git a/src/main/resources/templates/helpers/globalDatePicker.ftl b/src/main/resources/templates/helpers/globalDatePicker.ftl
index 618f90a36..a6f23cffa 100644
--- a/src/main/resources/templates/helpers/globalDatePicker.ftl
+++ b/src/main/resources/templates/helpers/globalDatePicker.ftl
@@ -2,10 +2,10 @@
<#import "/spring.ftl" as s>
<div class="container">
<div class="section center-align">
- <a href="<@s.url '/previousMonth?target=${target}'/>" id="global-datepicker-previous-month" 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 datePicker-fixed-width">${dateService.getDateStringWithMonthAndYear(fullDate)}</a>
- <a href="<@s.url '/nextMonth?target=${target}'/>" id="global-datepicker-next-month" class="waves-effect text-color"><i class="material-icons icon-chevron">chevron_right</i></a>
- <a href="<@s.url '/today?target=${target}'/>" id="global-datepicker-today" class="waves-effect text-color"><i class="material-icons icon-today">event</i></a>
+ <a href="<@s.url '/previousMonth?target=${target}'/>" id="global-datepicker-previous-month" class="waves-effect text-default"><i class="material-icons icon-chevron">chevron_left</i></a>
+ <a href="#modalDate" class="waves-effect headline-date modal-trigger text-default datePicker-fixed-width">${dateService.getDateStringWithMonthAndYear(fullDate)}</a>
+ <a href="<@s.url '/nextMonth?target=${target}'/>" id="global-datepicker-next-month" class="waves-effect text-default"><i class="material-icons icon-chevron">chevron_right</i></a>
+ <a href="<@s.url '/today?target=${target}'/>" id="global-datepicker-today" class="waves-effect text-default"><i class="material-icons icon-today">event</i></a>
</div>
</div>
<!-- modal to select specific month and year -->
@@ -37,8 +37,8 @@
<div class="hidden" id="currentYear">${currentYear?c}</div>
<div class="center-align">
- <a class="waves-effect text-color global-datepicker-button" id="global-datepicker-previous"><i class="material-icons icon-chevron">chevron_left</i></a>
- <a class="waves-effect text-color global-datepicker-button" id="global-datepicker-next"><i class="material-icons icon-chevron">chevron_right</i></a>
+ <a class="waves-effect text-default global-datepicker-button" id="global-datepicker-previous"><i class="material-icons icon-chevron">chevron_left</i></a>
+ <a class="waves-effect text-default global-datepicker-button" id="global-datepicker-next"><i class="material-icons icon-chevron">chevron_right</i></a>
</div>
<#assign years = [] />
diff --git a/src/main/resources/templates/helpers/navbar.ftl b/src/main/resources/templates/helpers/navbar.ftl
index ac00ddde0..c337af275 100644
--- a/src/main/resources/templates/helpers/navbar.ftl
+++ b/src/main/resources/templates/helpers/navbar.ftl
@@ -72,7 +72,7 @@
<input type="hidden" name="searchTags" value="true">
<div class="input-field">
- <input id="search" class="text-color mousetrap" name="searchText" type="search">
+ <input id="search" class="text-default mousetrap" name="searchText" type="search">
<label class="label-icon" for="search"><i class="material-icons">search</i></label>
<i id="buttonSearch" class="material-icons">send</i>
<i id="buttonClearSearch" class="material-icons">close</i>
@@ -104,7 +104,7 @@
<#else>
<div class="account-budget ${greenTextColor}">${currencyService.getCurrencyString(accountBudget)}</div>
</#if>
- <div class="account-budget-date text-color">(${locale.getString("account.budget.asof")}: ${dateService.getDateStringNormal(dateService.getCurrentDate())})</div>
+ <div class="account-budget-date text-default">(${locale.getString("account.budget.asof")}: ${dateService.getDateStringNormal(dateService.getCurrentDate())})</div>
</div>
</#macro>
diff --git a/src/main/resources/templates/indexFunctions.ftl b/src/main/resources/templates/indexFunctions.ftl
index c438cf124..ddd997c46 100644
--- a/src/main/resources/templates/indexFunctions.ftl
+++ b/src/main/resources/templates/indexFunctions.ftl
@@ -35,12 +35,12 @@
<div class="row" id="firstUseBanner">
<div class="col s12 center-align">
<div class="home-firstUseBanner-wrapper">
- <div class="home-firstUseBanner text-color">
- <a href="<@s.url "/firstUse"/>" class="text-color">
+ <div class="home-firstUseBanner text-default">
+ <a href="<@s.url "/firstUse"/>" class="text-default">
<i class="fas fa-graduation-cap home-firstUseBanner-item"></i>
<span class="home-firstUseBanner-item">${locale.getString("home.first.use.teaser")}</span>
</a>
- <a href="<@s.url "/settings/hideFirstUseBanner"/>" class="text-color home-firstUseBanner-item home-firstUseBanner-clear">
+ <a href="<@s.url "/settings/hideFirstUseBanner"/>" class="text-default home-firstUseBanner-item home-firstUseBanner-clear">
<i class="material-icons">clear</i>
</a>
</div>
diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl
index 60259de57..3efb88fe0 100644
--- a/src/main/resources/templates/reports/reports.ftl
+++ b/src/main/resources/templates/reports/reports.ftl
@@ -37,7 +37,7 @@
<#-- settings -->
<div class="row">
<div class="col s12 center-align">
- <div class="headline-small text-color">${locale.getString("report.settings")}</div>
+ <div class="headline-small text-default">${locale.getString("report.settings")}</div>
</div>
</div>
<div class="row">
@@ -45,19 +45,19 @@
<div class="report-checkbox-container">
<label>
<input type="checkbox" name="includeBudget" <#if reportSettings.includeBudget>checked="checked"</#if>>
- <span class="columnName-checkbox-label text-color">${locale.getString('report.checkbox.include.budget')}</span>
+ <span class="columnName-checkbox-label text-default">${locale.getString('report.checkbox.include.budget')}</span>
</label>
</div>
<div class="report-checkbox-container">
<label>
<input type="checkbox" name="splitTables" <#if reportSettings.splitTables>checked="checked"</#if>>
- <span class="columnName-checkbox-label text-color">${locale.getString('report.checkbox.split.tables')}</span>
+ <span class="columnName-checkbox-label text-default">${locale.getString('report.checkbox.split.tables')}</span>
</label>
</div>
<div class="report-checkbox-container">
<label>
<input type="checkbox" name="includeCategoryBudgets" <#if reportSettings.includeCategoryBudgets>checked="checked"</#if>/>
- <span class="columnName-checkbox-label text-color">${locale.getString('report.checkbox.inclue.categorybudgets')}</span>
+ <span class="columnName-checkbox-label text-default">${locale.getString('report.checkbox.inclue.categorybudgets')}</span>
</label>
</div>
</div>
@@ -67,7 +67,7 @@
<#-- columns -->
<div class="row no-margin">
<div class="col s12 center-align">
- <div class="headline-small text-color">${locale.getString("report.columns")}</div>
+ <div class="headline-small text-default">${locale.getString("report.columns")}</div>
<table class="no-border-table table-advice">
<tr>
<td><i class="material-icons">info_outline</i></td>
diff --git a/src/main/resources/templates/search/searchMacros.ftl b/src/main/resources/templates/search/searchMacros.ftl
index 3cae21ef2..3ef8e7f55 100644
--- a/src/main/resources/templates/search/searchMacros.ftl
+++ b/src/main/resources/templates/search/searchMacros.ftl
@@ -30,7 +30,7 @@
<div class="search-checkbox-container">
<label>
<input type="checkbox" name="searchName" <#if search.isSearchName()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('search.in.name')}</span>
+ <span class="text-default">${locale.getString('search.in.name')}</span>
</label>
</div>
</div>
@@ -38,7 +38,7 @@
<div class="search-checkbox-container">
<label>
<input type="checkbox" name="searchDescription" <#if search.isSearchDescription()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('search.in.description')}</span>
+ <span class="text-default">${locale.getString('search.in.description')}</span>
</label>
</div>
</div>
@@ -46,7 +46,7 @@
<div class="search-checkbox-container">
<label>
<input type="checkbox" name="searchCategory" <#if search.isSearchCategory()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('search.in.category')}</span>
+ <span class="text-default">${locale.getString('search.in.category')}</span>
</label>
</div>
</div>
@@ -54,7 +54,7 @@
<div class="search-checkbox-container">
<label>
<input type="checkbox" name="searchTags" <#if search.isSearchTags()>checked="checked"</#if>>
- <span class="text-color">${locale.getString('search.in.tags')}</span>
+ <span class="text-default">${locale.getString('search.in.tags')}</span>
</label>
</div>
</div>
@@ -66,11 +66,11 @@
<div class="col s12 center-align">
<#if page.getTotalPages() gt 0>
<ul class="pagination">
- <li class="text-color <#if page.getNumber() == 0>disabled</#if>"><a class="page-link" data-page="${page.getNumber()-1}"><i class="material-icons">chevron_left</i></a></li>
+ <li class="text-default <#if page.getNumber() == 0>disabled</#if>"><a class="page-link" data-page="${page.getNumber()-1}"><i class="material-icons">chevron_left</i></a></li>
<#list 0..page.getTotalPages()-1 as i>
- <li class="waves-effect text-color <#if page.getNumber() == i>active</#if>"><a class="page-link" data-page="${i}">${i+1}</a></li>
+ <li class="waves-effect text-default <#if page.getNumber() == i>active</#if>"><a class="page-link" data-page="${i}">${i+1}</a></li>
</#list>
- <li class="text-color <#if page.getNumber() == page.getTotalPages()-1>disabled</#if>"><a class="page-link" data-page="${page.getNumber()+1}"><i class="material-icons">chevron_right</i></a></li>
+ <li class="text-default <#if page.getNumber() == page.getTotalPages()-1>disabled</#if>"><a class="page-link" data-page="${page.getNumber()+1}"><i class="material-icons">chevron_right</i></a></li>
</ul>
</#if>
</div>
diff --git a/src/main/resources/templates/settings/settings.ftl b/src/main/resources/templates/settings/settings.ftl
index f562fbe3d..459bd23aa 100644
--- a/src/main/resources/templates/settings/settings.ftl
+++ b/src/main/resources/templates/settings/settings.ftl
@@ -115,10 +115,10 @@
<div class="table-cell table-cell-spacer"></div>
<div class="table-cell">
<div class="switch-cell-margin">
- <a class="btn btn-flat tooltipped text-color" data-position="bottom" data-tooltip="${locale.getString("settings.backupReminder.description")}"><i class="material-icons">help_outline</i></a>
+ <a class="btn btn-flat tooltipped text-default" data-position="bottom" data-tooltip="${locale.getString("settings.backupReminder.description")}"><i class="material-icons">help_outline</i></a>
</div>
<div class="switch-cell-margin">
- <a class="btn btn-flat tooltipped text-color" data-position="bottom" data-tooltip="${locale.getString("settings.backup.auto.description")}"><i class="material-icons">help_outline</i></a>
+ <a class="btn btn-flat tooltipped text-default" data-position="bottom" data-tooltip="${locale.getString("settings.backup.auto.description")}"><i class="material-icons">help_outline</i></a>
</div>
</div>
</div>
diff --git a/src/main/resources/templates/settings/settingsMacros.ftl b/src/main/resources/templates/settings/settingsMacros.ftl
index 43cbb56a3..5a8255fd4 100644
--- a/src/main/resources/templates/settings/settingsMacros.ftl
+++ b/src/main/resources/templates/settings/settingsMacros.ftl
@@ -18,13 +18,13 @@
<div class="table-cell table-cell-spacer"></div>
<div class="table-cell">
<div class="switch-cell-margin">
- <a class="btn btn-flat tooltipped text-color" data-position="bottom" data-tooltip="${locale.getString("settings.rest.description")}"><i class="material-icons">help_outline</i></a>
+ <a class="btn btn-flat tooltipped text-default" data-position="bottom" data-tooltip="${locale.getString("settings.rest.description")}"><i class="material-icons">help_outline</i></a>
</div>
<div class="switch-cell-margin">
- <a class="btn btn-flat tooltipped text-color" data-position="bottom" data-tooltip="${locale.getString("settings.darkTheme.description")}"><i class="material-icons">help_outline</i></a>
+ <a class="btn btn-flat tooltipped text-default" data-position="bottom" data-tooltip="${locale.getString("settings.darkTheme.description")}"><i class="material-icons">help_outline</i></a>
</div>
<div class="switch-cell-margin">
- <a class="btn btn-flat tooltipped text-color" data-position="bottom" data-tooltip="${locale.getString("settings.updates.automatic.description")}"><i class="material-icons">help_outline</i></a>
+ <a class="btn btn-flat tooltipped text-default" data-position="bottom" data-tooltip="${locale.getString("settings.updates.automatic.description")}"><i class="material-icons">help_outline</i></a>
</div>
</div>
</div>
@@ -269,7 +269,7 @@
</div>
<div class="col s6 m6 l4 right-align">
- <a target="_blank" href="${locale.getString("settings.backup.auto.strategy.git.remote.help.url")}" class="waves-effect waves-light btn btn-flat text-color"><i class="material-icons left">help_outline</i>${locale.getString("settings.backup.auto.strategy.git.remote.help")}</a>
+ <a target="_blank" href="${locale.getString("settings.backup.auto.strategy.git.remote.help.url")}" class="waves-effect waves-light btn btn-flat text-default"><i class="material-icons left">help_outline</i>${locale.getString("settings.backup.auto.strategy.git.remote.help")}</a>
</div>
</div>
</#macro>
\ No newline at end of file
diff --git a/src/main/resources/templates/templates/createFromTransactionModal.ftl b/src/main/resources/templates/templates/createFromTransactionModal.ftl
index da4a5c464..c1931c7ac 100644
--- a/src/main/resources/templates/templates/createFromTransactionModal.ftl
+++ b/src/main/resources/templates/templates/createFromTransactionModal.ftl
@@ -13,13 +13,13 @@
<div class="col s12">
<label>
<input id="include-category" type="checkbox" checked="checked">
- <span class="columnName-checkbox-label text-color">${locale.getString('template.checkbox.include.category')}</span>
+ <span class="columnName-checkbox-label text-default">${locale.getString('template.checkbox.include.category')}</span>
</label>
</div>
<div class="col s12">
<label>
<input id="include-account" type="checkbox">
- <span class="columnName-checkbox-label text-color">${locale.getString('template.checkbox.include.account')}</span>
+ <span class="columnName-checkbox-label text-default">${locale.getString('template.checkbox.include.account')}</span>
</label>
</div>
</div>
diff --git a/src/main/resources/templates/templates/templateFunctions.ftl b/src/main/resources/templates/templates/templateFunctions.ftl
index 39db17d2c..0f31ec3f5 100644
--- a/src/main/resources/templates/templates/templateFunctions.ftl
+++ b/src/main/resources/templates/templates/templateFunctions.ftl
@@ -24,14 +24,14 @@
<div class="collapsible-header bold">
<@templateHeader template/>
<div class="collapsible-header-button">
- <a href="<@s.url '/templates/${template.ID?c}/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">edit</i></a>
- <a href="<@s.url '/templates/${template.ID?c}/requestDelete'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">delete</i></a>
+ <a href="<@s.url '/templates/${template.ID?c}/edit'/>" class="btn-flat no-padding text-default"><i class="material-icons left no-margin">edit</i></a>
+ <a href="<@s.url '/templates/${template.ID?c}/requestDelete'/>" class="btn-flat no-padding text-default"><i class="material-icons left no-margin">delete</i></a>
<a href="<@s.url '/templates/${template.ID?c}/select'/>" class="waves-effect waves-light btn background-blue button-select-template"><i class="material-icons left no-margin">note_add</i></a>
</div>
</div>
<div class="collapsible-body">
<div class="row no-margin-bottom">
- <table class="table-template-content text-color">
+ <table class="table-template-content text-default">
<@templateName template/>
<@templateAmount template/>
<@templateCategory template/>
@@ -141,7 +141,7 @@
<div class="input-field col s12 m12 l8 offset-l2">
<label>
<input id="${id}" name="${name}" type="checkbox" <#if checked>checked</#if>>
- <span class="columnName-checkbox-label text-color">${label}</span>
+ <span class="columnName-checkbox-label text-default">${label}</span>
</label>
</div>
</div>
diff --git a/src/main/resources/templates/transactions/transactionsMacros.ftl b/src/main/resources/templates/transactions/transactionsMacros.ftl
index d617fd1f2..f396f5319 100644
--- a/src/main/resources/templates/transactions/transactionsMacros.ftl
+++ b/src/main/resources/templates/transactions/transactionsMacros.ftl
@@ -55,8 +55,8 @@
<#macro transactionButtons transaction>
<div class="col s8 l2 xl1 right-align transaction-buttons no-wrap">
<#if (transaction.category.type.name() != "REST") && !transaction.getAccount().isReadOnly()>
- <a href="<@s.url '/transactions/${transaction.ID?c}/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
- <a href="<@s.url '/transactions/${transaction.ID?c}/requestDelete'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">delete</i></a>
+ <a href="<@s.url '/transactions/${transaction.ID?c}/edit'/>" class="btn-flat no-padding text-default"><i class="material-icons left">edit</i></a>
+ <a href="<@s.url '/transactions/${transaction.ID?c}/requestDelete'/>" class="btn-flat no-padding text-default"><i class="material-icons left no-margin">delete</i></a>
</#if>
</div>
</#macro>
@@ -69,8 +69,8 @@
<#macro transactionLinks transaction>
<div class="col s4 l2 xl1 right-align transaction-buttons no-wrap">
- <a href="<@s.url '/transactions/${transaction.ID?c}/highlight'/>" class="btn-flat no-padding text-color buttonHighlight"><i class="material-icons left">open_in_new</i></a>
- <a href="<@s.url '/transactions/${transaction.ID?c}/edit'/>" class="btn-flat no-padding text-color"><i class="material-icons left no-margin">edit</i></a>
+ <a href="<@s.url '/transactions/${transaction.ID?c}/highlight'/>" class="btn-flat no-padding text-default buttonHighlight"><i class="material-icons left">open_in_new</i></a>
+ <a href="<@s.url '/transactions/${transaction.ID?c}/edit'/>" class="btn-flat no-padding text-default"><i class="material-icons left no-margin">edit</i></a>
</div>
</#macro>
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
index 0a3f97190..c26a1dc96 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/NewTransactionFromTemplateTest.java
@@ -92,7 +92,7 @@ public class NewTransactionFromTemplateTest
WebDriverWait wait = new WebDriverWait(driver, 5);
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector(".headline"), "Templates"));
- driver.findElements(By.cssSelector(".template-item .btn-flat no-padding text-color"));
+ driver.findElements(By.cssSelector(".template-item .btn-flat no-padding text-default"));
driver.findElement(By.xpath("//li[contains(@class, 'template-item')]//a[contains(@href, '/templates/2/select')]")).click();
wait = new WebDriverWait(driver, 5);
@@ -120,7 +120,7 @@ public class NewTransactionFromTemplateTest
WebDriverWait wait = new WebDriverWait(driver, 5);
wait.until(ExpectedConditions.textToBePresentInElementLocated(By.cssSelector(".headline"), "Templates"));
- driver.findElements(By.cssSelector(".template-item .btn-flat no-padding text-color"));
+ driver.findElements(By.cssSelector(".template-item .btn-flat no-padding text-default"));
driver.findElement(By.xpath("//li[contains(@class, 'template-item')]//a[contains(@href, '/templates/1/select')]")).click();
wait = new WebDriverWait(driver, 5);
--
GitLab