From c7589c229344a52a53f9c5e40d702596375fcf38 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Mon, 15 Feb 2021 22:20:56 +0100 Subject: [PATCH] #563 - Refactor usages of .budgetmaster-blue --- src/main/resources/static/css/dark/style.css | 4 ---- src/main/resources/static/css/style.css | 4 ---- src/main/resources/templates/accounts/accounts.ftl | 2 +- src/main/resources/templates/accounts/newAccount.ftl | 8 ++++---- .../resources/templates/categories/categories.ftl | 2 +- .../resources/templates/categories/newCategory.ftl | 8 ++++---- .../resources/templates/charts/chartFunctions.ftl | 4 ++-- src/main/resources/templates/charts/charts.ftl | 4 ++-- src/main/resources/templates/charts/newChart.ftl | 8 ++++---- src/main/resources/templates/error/400.ftl | 2 +- src/main/resources/templates/error/403.ftl | 2 +- src/main/resources/templates/error/404.ftl | 2 +- src/main/resources/templates/error/418.ftl | 2 +- src/main/resources/templates/error/500.ftl | 2 +- src/main/resources/templates/filter/filterMacros.ftl | 12 ++++++------ src/main/resources/templates/firstUse.ftl | 2 +- src/main/resources/templates/login.ftl | 2 +- src/main/resources/templates/reports/reports.ftl | 2 +- src/main/resources/templates/search/searchMacros.ftl | 4 ++-- src/main/resources/templates/settings/import.ftl | 6 +++--- src/main/resources/templates/settings/settings.ftl | 2 +- .../resources/templates/settings/settingsMacros.ftl | 4 ++-- .../templates/templates/templateFunctions.ftl | 4 ++-- .../templates/transactions/newTransactionMacros.ftl | 6 +++--- 24 files changed, 45 insertions(+), 53 deletions(-) diff --git a/src/main/resources/static/css/dark/style.css b/src/main/resources/static/css/dark/style.css index 1276a6d6f..45630ae92 100644 --- a/src/main/resources/static/css/dark/style.css +++ b/src/main/resources/static/css/dark/style.css @@ -24,10 +24,6 @@ main { color: #FFFFFF; } -.budgetmaster-blue { - background-color: #2E79B9; -} - .budgetmaster-grey { background-color: #CCCCCC !important; } diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index e80f74a57..bf1da78be 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -23,10 +23,6 @@ main { color: #212121; } -.budgetmaster-blue { - background-color: #2E79B9; -} - .budgetmaster-grey { background-color: #696969 !important; } diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl index 87f6ec596..730794743 100644 --- a/src/main/resources/templates/accounts/accounts.ftl +++ b/src/main/resources/templates/accounts/accounts.ftl @@ -17,7 +17,7 @@ </div> </div> <br> - <div class="center-align"><a href="<@s.url '/accounts/newAccount'/>" id="button-new-account" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">add</i>${locale.getString("title.account.new")}</a></div> + <div class="center-align"><a href="<@s.url '/accounts/newAccount'/>" id="button-new-account" class="waves-effect waves-light btn background-blue"><i class="material-icons left">add</i>${locale.getString("title.account.new")}</a></div> <br> <div class="container account-container"> <table class="bordered"> diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl index 41a2273ae..3b64c0b29 100644 --- a/src/main/resources/templates/accounts/newAccount.ftl +++ b/src/main/resources/templates/accounts/newAccount.ftl @@ -45,11 +45,11 @@ <#-- buttons --> <div class="row hide-on-small-only"> <div class="col s6 right-align"> - <a href="<@s.url '/accounts'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <a href="<@s.url '/accounts'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </div> <div class="col s6 left-align"> - <button id="button-save-account" class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> + <button id="button-save-account" class="btn waves-effect waves-light background-blue" type="submit" name="action"> <i class="material-icons left">save</i>${locale.getString("save")} </button> </div> @@ -57,12 +57,12 @@ <div class="hide-on-med-and-up"> <div class="row center-align"> <div class="col s12"> - <a href="<@s.url '/accounts'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <a href="<@s.url '/accounts'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </div> </div> <div class="row center-align"> <div class="col s12"> - <button id="button-save-account" class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave"> + <button id="button-save-account" class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave"> <i class="material-icons left">save</i>${locale.getString("save")} </button> </div> diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl index fca30c4fc..a22c90990 100644 --- a/src/main/resources/templates/categories/categories.ftl +++ b/src/main/resources/templates/categories/categories.ftl @@ -23,7 +23,7 @@ </div> <br> <div class="center-align"> - <a href="<@s.url '/categories/newCategory'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">add</i>${locale.getString("title.category.new")} + <a href="<@s.url '/categories/newCategory'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">add</i>${locale.getString("title.category.new")} </a></div> <br> <div class="container"> diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl index 4e716bf89..0c089be64 100644 --- a/src/main/resources/templates/categories/newCategory.ftl +++ b/src/main/resources/templates/categories/newCategory.ftl @@ -77,11 +77,11 @@ <#-- buttons --> <div class="row hide-on-small-only"> <div class="col s6 right-align"> - <a href="<@s.url '/categories'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <a href="<@s.url '/categories'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </div> <div class="col s6 left-align"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="action"> <i class="material-icons left">save</i>${locale.getString("save")} </button> </div> @@ -89,12 +89,12 @@ <div class="hide-on-med-and-up"> <div class="row center-align"> <div class="col s12"> - <a href="<@s.url '/categories'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <a href="<@s.url '/categories'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </div> </div> <div class="row center-align"> <div class="col s12"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave"> <i class="material-icons left">save</i>${locale.getString("save")} </button> </div> diff --git a/src/main/resources/templates/charts/chartFunctions.ftl b/src/main/resources/templates/charts/chartFunctions.ftl index 1714f4371..5b5165cc1 100644 --- a/src/main/resources/templates/charts/chartFunctions.ftl +++ b/src/main/resources/templates/charts/chartFunctions.ftl @@ -26,11 +26,11 @@ </#macro> <#macro buttonNew> - <a href="<@s.url '/charts/newChart'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">add</i>${locale.getString("title.chart.new")}</a> + <a href="<@s.url '/charts/newChart'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">add</i>${locale.getString("title.chart.new")}</a> </#macro> <#macro buttonShow> - <a href="<@s.url '/charts'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">show_chart</i>${locale.getString("home.menu.charts.action.show")}</a> + <a href="<@s.url '/charts'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">show_chart</i>${locale.getString("home.menu.charts.action.show")}</a> </#macro> <#macro buttons> diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl index c6be30714..76a00c36d 100644 --- a/src/main/resources/templates/charts/charts.ftl +++ b/src/main/resources/templates/charts/charts.ftl @@ -26,7 +26,7 @@ </div> <br> <div class="center-align"> - <a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">edit</i>${locale.getString("home.menu.charts.action.manage")} + <a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">edit</i>${locale.getString("home.menu.charts.action.manage")} </a></div> <br> <div class="container"> @@ -50,7 +50,7 @@ <#-- buttons --> <div class="row center-align"> <div class="col s12"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" + <button class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave"> <i class="material-icons left">show_chart</i>${locale.getString("chart.show")} </button> diff --git a/src/main/resources/templates/charts/newChart.ftl b/src/main/resources/templates/charts/newChart.ftl index 173e2a990..641b3159f 100644 --- a/src/main/resources/templates/charts/newChart.ftl +++ b/src/main/resources/templates/charts/newChart.ftl @@ -72,11 +72,11 @@ <#-- buttons --> <div class="row hide-on-small-only"> <div class="col s6 right-align"> - <a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </div> <div class="col s6 left-align"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action" <#if (chart.getType().name() == "DEFAULT")>disabled</#if>> + <button class="btn waves-effect waves-light background-blue" type="submit" name="action" <#if (chart.getType().name() == "DEFAULT")>disabled</#if>> <i class="material-icons left">save</i>${locale.getString("save")} </button> </div> @@ -84,12 +84,12 @@ <div class="hide-on-med-and-up"> <div class="row center-align"> <div class="col s12"> - <a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </div> </div> <div class="row center-align"> <div class="col s12"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave" <#if (chart.getType().name() == "DEFAULT")>disabled</#if>> + <button class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave" <#if (chart.getType().name() == "DEFAULT")>disabled</#if>> <i class="material-icons left">save</i>${locale.getString("save")} </button> </div> diff --git a/src/main/resources/templates/error/400.ftl b/src/main/resources/templates/error/400.ftl index b66d11075..8392c5ddb 100644 --- a/src/main/resources/templates/error/400.ftl +++ b/src/main/resources/templates/error/400.ftl @@ -22,7 +22,7 @@ </div> </div> <div class="center-align"> - <a href="<@s.url '/'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> + <a href="<@s.url '/'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> </div> </div> </div> diff --git a/src/main/resources/templates/error/403.ftl b/src/main/resources/templates/error/403.ftl index bcf6f85e8..b54ceabe1 100644 --- a/src/main/resources/templates/error/403.ftl +++ b/src/main/resources/templates/error/403.ftl @@ -22,7 +22,7 @@ </div> </div> <div class="center-align"> - <a href="<@s.url '/'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> + <a href="<@s.url '/'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> </div> </div> </div> diff --git a/src/main/resources/templates/error/404.ftl b/src/main/resources/templates/error/404.ftl index 00cca924b..c8311115a 100644 --- a/src/main/resources/templates/error/404.ftl +++ b/src/main/resources/templates/error/404.ftl @@ -22,7 +22,7 @@ </div> </div> <div class="center-align"> - <a href="<@s.url '/'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> + <a href="<@s.url '/'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> </div> </div> </div> diff --git a/src/main/resources/templates/error/418.ftl b/src/main/resources/templates/error/418.ftl index 39bccd513..1573e794d 100644 --- a/src/main/resources/templates/error/418.ftl +++ b/src/main/resources/templates/error/418.ftl @@ -24,7 +24,7 @@ </div> </div> <div class="center-align"> - <a href="<@s.url '/'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> + <a href="<@s.url '/'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> </div> </div> </div> diff --git a/src/main/resources/templates/error/500.ftl b/src/main/resources/templates/error/500.ftl index e37239873..d5b40de61 100644 --- a/src/main/resources/templates/error/500.ftl +++ b/src/main/resources/templates/error/500.ftl @@ -22,7 +22,7 @@ </div> </div> <div class="center-align"> - <a href="<@s.url '/'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> + <a href="<@s.url '/'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">home</i>${locale.getString("errorpages.home")}</a> </div> </div> </div> diff --git a/src/main/resources/templates/filter/filterMacros.ftl b/src/main/resources/templates/filter/filterMacros.ftl index d0892a6db..7eac102ac 100644 --- a/src/main/resources/templates/filter/filterMacros.ftl +++ b/src/main/resources/templates/filter/filterMacros.ftl @@ -51,30 +51,30 @@ </#macro> <#macro buttonReset> - <a href="<@s.url '/filter/reset'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">settings_backup_restore</i>${locale.getString("filter.reset")}</a> + <a href="<@s.url '/filter/reset'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">settings_backup_restore</i>${locale.getString("filter.reset")}</a> </#macro> <#macro buttonApply> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave"> <i class="fas fa-filter left"></i>${locale.getString("filter.apply")} </button> </#macro> <#macro buttonResetChart> - <a class="filter-button-reset waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">settings_backup_restore</i>${locale.getString("filter.reset")}</a> + <a class="filter-button-reset waves-effect waves-light btn background-blue"><i class="material-icons left">settings_backup_restore</i>${locale.getString("filter.reset")}</a> </#macro> <#macro buttonClose> - <a class="filter-button-close waves-effect waves-light budgetmaster-blue btn white-text"><i class="fas fa-filter left"></i>${locale.getString("filter.apply")}</a> + <a class="filter-button-close waves-effect waves-light background-blue btn white-text"><i class="fas fa-filter left"></i>${locale.getString("filter.apply")}</a> </#macro> <#macro buttonsAllOrNone> <div class="row no-margin"> <div class="col s6 right-align"> - <a class="waves-effect waves-light btn budgetmaster-blue filter-button-all">${locale.getString("filter.tags.button.all")}</a> + <a class="waves-effect waves-light btn background-blue filter-button-all">${locale.getString("filter.tags.button.all")}</a> </div> <div class="col s6"> - <a class="waves-effect waves-light btn budgetmaster-blue filter-button-none">${locale.getString("filter.tags.button.none")}</a> + <a class="waves-effect waves-light btn background-blue filter-button-none">${locale.getString("filter.tags.button.none")}</a> </div> </div> </#macro> diff --git a/src/main/resources/templates/firstUse.ftl b/src/main/resources/templates/firstUse.ftl index 9f56150a0..161e231b1 100644 --- a/src/main/resources/templates/firstUse.ftl +++ b/src/main/resources/templates/firstUse.ftl @@ -97,7 +97,7 @@ <h5>${locale.getString("home.first.use.step.5.sub.4")}</h5> <p class="center-align"> - <a href="<@s.url '/'/>" class="waves-effect waves-light btn budgetmaster-blue"> + <a href="<@s.url '/'/>" class="waves-effect waves-light btn background-blue"> <i class="material-icons left">home</i>${locale.getString("home.first.use.home")} </a> </p> diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl index f5c06b087..c74e90950 100644 --- a/src/main/resources/templates/login.ftl +++ b/src/main/resources/templates/login.ftl @@ -54,7 +54,7 @@ <div class="row login-margin-top"> <div class="col s12 right-align"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="action"> <i class="material-icons left">send</i>${locale.getString("login.button")} </button> </div> diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl index 421a75df8..60259de57 100644 --- a/src/main/resources/templates/reports/reports.ftl +++ b/src/main/resources/templates/reports/reports.ftl @@ -97,7 +97,7 @@ <#-- button generate --> <div class="row valign-wrapper"> <div class="col s12 center-align"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="buttonSave"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave"> <i class="material-icons left">save</i>${locale.getString("report.button.generate")} </button> </div> diff --git a/src/main/resources/templates/search/searchMacros.ftl b/src/main/resources/templates/search/searchMacros.ftl index 7e3bd84c1..3cae21ef2 100644 --- a/src/main/resources/templates/search/searchMacros.ftl +++ b/src/main/resources/templates/search/searchMacros.ftl @@ -11,12 +11,12 @@ <div class="col s2 m3 l4"> <div class="hide-on-small-only"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="action"> <i class="material-icons left">search</i>${locale.getString("search.submit")} </button> </div> <div class="hide-on-med-and-up"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="action"> <i class="material-icons">search</i> </button> </div> diff --git a/src/main/resources/templates/settings/import.ftl b/src/main/resources/templates/settings/import.ftl index 7f7b33333..ae6a42306 100644 --- a/src/main/resources/templates/settings/import.ftl +++ b/src/main/resources/templates/settings/import.ftl @@ -42,7 +42,7 @@ </td> <td class="import-text">${locale.getString("info.database.import.or")}</td> <td> - <a href="<@s.url '/accounts/newAccount'/>" class="btn waves-effect waves-light budgetmaster-blue button-new-account"><i class="material-icons left">add</i>${locale.getString("title.account.new")}</a> + <a href="<@s.url '/accounts/newAccount'/>" class="btn waves-effect waves-light background-blue button-new-account"><i class="material-icons left">add</i>${locale.getString("title.account.new")}</a> </td> </tr> </#list> @@ -58,11 +58,11 @@ <#-- buttons --> <div class="row"> <div class="col m6 l4 offset-l2 right-align"> - <a href="<@s.url '/settings'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <a href="<@s.url '/settings'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </div> <div class="col m6 l4 left-align"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action" id="buttonImport"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="action" id="buttonImport"> <i class="material-icons left">unarchive</i>${locale.getString("settings.database.import")} </button> </div> diff --git a/src/main/resources/templates/settings/settings.ftl b/src/main/resources/templates/settings/settings.ftl index 532791649..f562fbe3d 100644 --- a/src/main/resources/templates/settings/settings.ftl +++ b/src/main/resources/templates/settings/settings.ftl @@ -133,7 +133,7 @@ <#-- buttons --> <div class="row"> <div class="col s12 center-align"> - <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> + <button class="btn waves-effect waves-light background-blue" type="submit" name="action"> <i class="material-icons left">save</i>${locale.getString("save")} </button> </div> diff --git a/src/main/resources/templates/settings/settingsMacros.ftl b/src/main/resources/templates/settings/settingsMacros.ftl index 3d6f3cb30..43cbb56a3 100644 --- a/src/main/resources/templates/settings/settingsMacros.ftl +++ b/src/main/resources/templates/settings/settingsMacros.ftl @@ -115,7 +115,7 @@ <form id="form-database-import" method="POST" action="<@s.url '/settings/database/upload'/>" enctype="multipart/form-data" accept-charset="UTF-8"> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <div class="file-field input-field"> - <div class="btn budgetmaster-blue"> + <div class="btn background-blue"> <i class="material-icons">cloud_upload</i> <input id="inputDatabaseImport" type="file" accept=".json" name="file"> </div> @@ -265,7 +265,7 @@ </div> <div class="col s6 m6 l4 offset-l2"> - <a id="settings-backup-auto-git-test" data-url="<@s.url '/settings/git/test'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">send</i>${locale.getString("settings.backup.auto.git.test")}</a> + <a id="settings-backup-auto-git-test" data-url="<@s.url '/settings/git/test'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">send</i>${locale.getString("settings.backup.auto.git.test")}</a> </div> <div class="col s6 m6 l4 right-align"> diff --git a/src/main/resources/templates/templates/templateFunctions.ftl b/src/main/resources/templates/templates/templateFunctions.ftl index 903886c14..39db17d2c 100644 --- a/src/main/resources/templates/templates/templateFunctions.ftl +++ b/src/main/resources/templates/templates/templateFunctions.ftl @@ -2,7 +2,7 @@ <#import "../helpers/validation.ftl" as validation> <#macro buttonNew> - <a href="<@s.url '/templates/newTemplate'/>" class="waves-effect waves-light btn budgetmaster-blue"><i + <a href="<@s.url '/templates/newTemplate'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">add</i>${locale.getString("title.template.new")}</a> </#macro> @@ -26,7 +26,7 @@ <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}/select'/>" class="waves-effect waves-light btn budgetmaster-blue button-select-template"><i class="material-icons left no-margin">note_add</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"> diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl index 1a88b4bec..7c8db1c7b 100644 --- a/src/main/resources/templates/transactions/newTransactionMacros.ftl +++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl @@ -379,11 +379,11 @@ </#macro> <#macro buttonCancel cancelURL> - <a href="<@s.url cancelURL/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> + <a href="<@s.url cancelURL/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </#macro> <#macro buttonSave> - <button id="button-save-transaction" class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> + <button id="button-save-transaction" class="btn waves-effect waves-light background-blue" type="submit" name="action"> <i class="material-icons left">save</i>${locale.getString("save")} </button> </#macro> @@ -391,7 +391,7 @@ <#macro buttonTransactionActions canChangeType canCreateTemplate changetypeInProgress> <#if (canChangeType || canCreateTemplate) && !changetypeInProgress> <div class="fixed-action-btn" id="transaction-actions-button"> - <a class="btn-floating btn-large waves-effect waves-light budgetmaster-blue"> + <a class="btn-floating btn-large waves-effect waves-light background-blue"> <i class="material-icons left">settings</i>${locale.getString("save")} </a> <ul> -- GitLab