From 2372a20bfb381f8c22fa732cd7a3f9b522505443 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 20 Jan 2019 20:24:51 +0100
Subject: [PATCH] #268 - improved style
---
.../resources/static/css/dark/reports.css | 19 +++++++++++++++++--
src/main/resources/static/css/reports.css | 5 ++++-
.../resources/templates/reports/reports.ftl | 10 +++++-----
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/static/css/dark/reports.css b/src/main/resources/static/css/dark/reports.css
index e6fc59027..0866da7d0 100644
--- a/src/main/resources/static/css/dark/reports.css
+++ b/src/main/resources/static/css/dark/reports.css
@@ -1,7 +1,6 @@
.headline-small {
font-size: 1.5rem;
text-transform: initial;
- color: #212121;
}
.report-checkbox-container {
@@ -24,6 +23,10 @@
background-color: #CCCCCC;
}
+.columnName-checkbox-label {
+ font-weight: 600;
+}
+
.columnName-label {
color: #212121;
font-weight: 600;
@@ -33,10 +36,22 @@
background-color: #999999;
}
-.columnName-disabled .columnName-label{
+.columnName-disabled .columnName-label {
color: #666666;
}
+.report-checkbox-container input[type="checkbox"] + span:not(.lever)::before,
+.report-checkbox-container input[type="checkbox"]:not(.filled-in) + span:not(.lever)::after {
+ border-color: rgba(255, 255, 255, 0.7);
+}
+
+.report-checkbox-container input[type="checkbox"]:checked + span:not(.lever)::before {
+ border-top: 2px solid transparent;
+ border-left: 2px solid transparent;
+ border-right: 2px solid #2E79B9;
+ border-bottom: 2px solid #2E79B9;
+}
+
.table-advice {
width: auto;
margin: auto;
diff --git a/src/main/resources/static/css/reports.css b/src/main/resources/static/css/reports.css
index d0c6f4c76..d03e30bc4 100644
--- a/src/main/resources/static/css/reports.css
+++ b/src/main/resources/static/css/reports.css
@@ -1,7 +1,6 @@
.headline-small {
font-size: 1.5rem;
text-transform: initial;
- color: #212121;
}
.report-checkbox-container {
@@ -24,6 +23,10 @@
background-color: #FFFFFF;
}
+.columnName-checkbox-label {
+ font-weight: 600;
+}
+
.columnName-label {
color: #212121;
font-weight: 600;
diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl
index 61c28c980..a62982fd2 100644
--- a/src/main/resources/templates/reports/reports.ftl
+++ b/src/main/resources/templates/reports/reports.ftl
@@ -26,7 +26,7 @@
<#-- settings -->
<div class="row">
<div class="col s12 center-align">
- <div class="headline-small">${locale.getString("report.settings")}</div>
+ <div class="headline-small text-color">${locale.getString("report.settings")}</div>
</div>
</div>
<div class="row">
@@ -34,19 +34,19 @@
<div class="report-checkbox-container">
<label>
<input type="checkbox" name="includeBudget" <#if reportSettings.includeBudget>checked="checked"</#if>>
- <span class="columnName-label">${locale.getString('report.checkbox.include.budget')}</span>
+ <span class="columnName-checkbox-label text-color">${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-label">${locale.getString('report.checkbox.split.tables')}</span>
+ <span class="columnName-checkbox-label text-color">${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-label">${locale.getString('report.checkbox.inclue.categorybudgets')}</span>
+ <span class="columnName-checkbox-label text-color">${locale.getString('report.checkbox.inclue.categorybudgets')}</span>
</label>
</div>
</div>
@@ -56,7 +56,7 @@
<#-- columns -->
<div class="row no-margin">
<div class="col s12 center-align">
- <div class="headline-small">${locale.getString("report.columns")}</div>
+ <div class="headline-small text-color">${locale.getString("report.columns")}</div>
<table class="no-border-table table-advice">
<tr>
<td><i class="material-icons">info_outline</i></td>
--
GitLab