From e0ecccfa7bebaebb532d532f9a40b8d85facdecc Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Fri, 7 Aug 2015 09:53:34 +0200 Subject: Printing: fix color numbers in printing templates After adding the additional 'Table Cells 2' color to the color palette fix the colors assigned to each field. Signed-off-by: Lubomir I. Ivanov Signed-off-by: Gehad elrobey --- printing_templates/Flowlayout.html | 8 ++++---- printing_templates/One Dive.html | 10 +++++----- printing_templates/Six Dives.html | 2 +- printing_templates/Table.html | 6 +++--- printing_templates/Two Dives.html | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'printing_templates') diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html index f035e2172..cab684e7e 100644 --- a/printing_templates/Flowlayout.html +++ b/printing_templates/Flowlayout.html @@ -20,7 +20,7 @@ box-sizing: border-box; border:max(1px, 0.1vw); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; } td { @@ -55,7 +55,7 @@ box-sizing: border-box; border:max(1px, 0.1vw); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; float: left; } @@ -66,11 +66,11 @@ .fieldTitle { background-color: {{ template_options.color2 }}; overflow: hidden; - color: {{ template_options.color3 }}; + color: {{ template_options.color4 }}; } .fieldData { - color: {{ template_options.color4 }}; + color: {{ template_options.color5 }}; } .table_class { diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html index 24108c69f..bdf7ab3a7 100644 --- a/printing_templates/One Dive.html +++ b/printing_templates/One Dive.html @@ -20,7 +20,7 @@ box-sizing: border-box; border:max(1px, 0.1vw); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; } td { @@ -58,7 +58,7 @@ box-sizing: border-box; border:max(1px, 0.1vw); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; float: left; } @@ -77,11 +77,11 @@ .fieldTitle { background-color: {{ template_options.color2 }}; overflow: hidden; - color: {{ template_options.color3 }}; + color: {{ template_options.color4 }}; } .fieldData { - color: {{ template_options.color4 }}; + color: {{ template_options.color5 }}; } .table_class { @@ -98,7 +98,7 @@ .textArea { line-height: {{ template_options.line_spacing }}; - color: {{ template_options.color4 }}; + color: {{ template_options.color5 }}; max-height: 19vh; overflow: hidden; } diff --git a/printing_templates/Six Dives.html b/printing_templates/Six Dives.html index 3c64d5ec3..65d81f1cb 100644 --- a/printing_templates/Six Dives.html +++ b/printing_templates/Six Dives.html @@ -63,7 +63,7 @@ box-sizing: border-box; border:max(0.1vw, 1px); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; font-size: {{ template_options.font_size }}vw; } diff --git a/printing_templates/Table.html b/printing_templates/Table.html index 2668ccb62..3cf65be96 100644 --- a/printing_templates/Table.html +++ b/printing_templates/Table.html @@ -47,7 +47,7 @@ box-sizing: border-box; border:max(0.1vw, 1px); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; } @@ -55,7 +55,7 @@

- + @@ -66,7 +66,7 @@ {% block main_rows %} {% for dive in dives %} - + diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html index 463942ab5..288a20262 100644 --- a/printing_templates/Two Dives.html +++ b/printing_templates/Two Dives.html @@ -40,7 +40,7 @@ box-sizing: border-box; border:max(0.1vw, 1px); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; } .table_class { @@ -53,7 +53,7 @@ box-sizing: border-box; border:max(0.1vw, 1px); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; } .notes_table_class { @@ -66,18 +66,18 @@ box-sizing: border-box; border:max(0.1vw, 1px); border-style:solid; - border-color: {{ template_options.color5 }}; + border-color: {{ template_options.color6 }}; } .fieldTitle { background-color: {{ template_options.color2 }}; - color: {{ template_options.color3 }}; + color: {{ template_options.color4 }}; overflow: hidden; padding:0; } .fieldData { - color: {{ template_options.color4 }}; + color: {{ template_options.color5 }}; } .diveProfile { -- cgit v1.2.3-70-g09d2

Dive #	Date	Time
{{ dive.number }}	{{ dive.date }}	{{ dive.time }}