Merge branch 'custom-print' of github.com:neolit123/subsurface

1 files changed, 58 insertions, 49 deletions

diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index 5dba74303..95cc9a088 100644
--- a/printing_templates/Two Dives.html
+++ b/printing_templates/Two Dives.html
@@ -15,15 +15,20 @@
 			float: left;
 		}
 
+		p {
+			font-size: {{ template_options.font_size }}vw;
+			float: left;
+		}
+
 		#body_div {
 			background-color: {{ template_options.color1 }};
 		}
 
 		.mainContainer {
-			width: 96%;
+			width: 99%;
 			height: 50%;
-			margin-left: 2%;
-			margin-right: 2%;
+			margin-left: 0.5%;
+			margin-right: 0.5%;
 			margin-top: 0;
 			margin-bottom: 0;
 			overflow: hidden;
@@ -32,68 +37,70 @@
 
 		.innerContainer {
 			height: 85%;
-			padding: 0.5%;
 			margin-top: 1%;
 			margin-bottom: 1%;
 			overflow: hidden;
-			-webkit-box-sizing: border-box;
-			box-sizing: border-box;
-			border:max(0.1vw, 1px);
-			border-style:solid;
 		}
 
 		.table_class {
 			overflow: hidden;
-			max-width: 25%;
-			min-width: 25%;
+			width: 25%;
+			height: 99%;
 			margin: 0.5%;
 			float: left;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
-			border:max(0.1vw, 1px);
+			border-width: {{ template_options.borderwidth }}px;
 			border-style:solid;
+			border-color: {{ template_options.color6 }};
 		}
 
 		.notes_table_class {
 			overflow: hidden;
-			max-width: 100%;
-			min-width: 100%;
+			width: 99%;
 			margin: 0.5%;
-			float: left;
 			-webkit-box-sizing: border-box;
 			box-sizing: border-box;
-			border:max(0.1vw, 1px);
+			border-width: {{ template_options.borderwidth }}px;
 			border-style:solid;
+			border-color: {{ template_options.color6 }};
 		}
 
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
-			overflow: hidden;
-			padding:0;
+			color: {{ template_options.color4 }};
+			padding-left: 2%;
+		}
+
+		.fieldData {
+			color: {{ template_options.color5 }};
+			background-color: {{ template_options.color3 }};
+			padding-left: 2%;
 		}
 
 		.diveProfile {
-			width: 48%;
-			height: 95%;
-			margin-left: 0%;
-			margin-right: 0%;
-			margin-bottom: 0%;
-			margin-top: 0.5%;
-			float: right;
+			float: left;
+			height: 99%;
+			width: 47%;
+			margin: 0.5%;
 		}
 
 		.diveDetails {
-			width: 98.5%;
+			width: 100%;
 			float: left;
 		}
 
 		.dataPart {
-			height: 45%;
-			max-height: 60%;
+			height: 64%;
+			padding-bottom: 1%;
+			width: 100%;
+			float: left;
 		}
 
 		.notesPart {
 			height: 35%;
+			width: 100%;
+			float: left;
 		}
 
 		.textArea {
@@ -122,39 +129,40 @@
 								<td class="fieldTitle">
 									<h1> Dive No. </h1>
 								</td>
-								<td>
-									<h1> {{ dive.number }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.number }} </p>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Date </h1>
 								</td>
-									<td><h1> {{ dive.date }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.date }} </p>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Location </h1>
 								</td>
-								<td>
-									<h1> {{ dive.location }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.location }} </p>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Max depth </h1>
 								</td>
-								<td>
-									<h1> {{ dive.depth }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.depth }} </p>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Duration </h1>
 								</td>
-								<td>
-									<h1> {{ dive.duration }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.duration }} </p>
 								</td>
 							</tr>
 						</tbody></table>
@@ -163,39 +171,40 @@
 								<td class="fieldTitle">
 									<h1> Time. </h1>
 								</td>
-								<td>
-									<h1> {{ dive.time }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.time }} </p>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Air Temp. </h1>
 								</td>
-									<td><h1> {{ dive.airTemp }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.airTemp }} </p>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Water Temp. </h1>
 								</td>
-								<td>
-									<h1> {{ dive.waterTemp }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.waterTemp }} </p>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Buddy </h1>
 								</td>
-								<td>
-									<h1> {{ dive.buddy }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.buddy }} </p>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Dive Master </h1>
 								</td>
-								<td>
-									<h1> {{ dive.divemaster }} </h1>
+								<td class="fieldData">
+									<p> {{ dive.divemaster }} </p>
 								</td>
 							</tr>
 						</tbody></table>
@@ -205,14 +214,14 @@
 					<div class="notesPart">
 						<table class="notes_table_class">
 							<tbody><tr>
-								<td class="fieldTitle">
+								<td style="padding-left:1%" class="fieldTitle">
 									<h1> Notes </h1>
 								</td>
 							</tr>
 							<tr>
-								<td>
+								<td class="fieldData">
 									<div class="textArea">
-										<h1> {{ dive.notes }} </h1>
+										<p> {{ dive.notes }} </p>
 									</div>
 								</td>
 							</tr>
@@ -224,7 +233,7 @@
 	{% endfor %}
 {% endblock %}
 <div id="footer">
-<div>
+</div>
 </div>
 </body>
 </html>