Farbkorrekturen/Layoutkorrekturen und neues Zeichen "Truppführer", Cl…

…oses #132
jonas-koeritz · Jun 22, 2024 · fb0c521 · fb0c521
1 parent 1bc2813
commit fb0c521
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 27 deletions.
diff --git a/symbols/Feuerwehr_Personen/Angriffstruppführer.j2 b/symbols/Feuerwehr_Personen/Angriffstruppführer.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
 
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ feuerwehr.colorSecondary }}">A</text>

diff --git a/symbols/Feuerwehr_Personen/Angriffstruppmann.j2 b/symbols/Feuerwehr_Personen/Angriffstruppmann.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ feuerwehr.colorSecondary }}">A</text>
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />

diff --git a/symbols/Feuerwehr_Personen/Einsatzabschnittsleiter_Feuerwehr.j2 b/symbols/Feuerwehr_Personen/Einsatzabschnittsleiter_Feuerwehr.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">EAL</text>
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />

diff --git a/symbols/Feuerwehr_Personen/Gruppenführer.j2 b/symbols/Feuerwehr_Personen/Gruppenführer.j2
@@ -6,7 +6,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
 
 	<ellipse cx="100" cy="44" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />

diff --git a/symbols/Feuerwehr_Personen/Maschinist.j2 b/symbols/Feuerwehr_Personen/Maschinist.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ feuerwehr.colorSecondary }}">Ma</text>
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />

diff --git a/symbols/Feuerwehr_Personen/Melder.j2 b/symbols/Feuerwehr_Personen/Melder.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ feuerwehr.colorSecondary }}">Me</text>
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />

diff --git a/symbols/Feuerwehr_Personen/RettR_Bildauswerter.j2 b/symbols/Feuerwehr_Personen/RettR_Bildauswerter.j2
@@ -6,11 +6,11 @@
 		{% include './fonts/fonts.j2' %}
 		</style>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
-	<path d="M153,88 L103,88" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" />
 
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">RettR</text>
-	<text x="128" y="240" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">Bildauswerter</text>
+	<text x="128" y="240" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorStroke }}">Bildauswerter</text>
 
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />
 </svg>
diff --git a/symbols/Feuerwehr_Personen/RettR_Fachberater.j2 b/symbols/Feuerwehr_Personen/RettR_Fachberater.j2
@@ -6,8 +6,8 @@
 		{% include './fonts/fonts.j2' %}
 		</style>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
-	<path d="M153,88 L103,88" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" />
 
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">RettR</text>
 

diff --git a/symbols/Feuerwehr_Personen/RettR_Flugleiter.j2 b/symbols/Feuerwehr_Personen/RettR_Flugleiter.j2
@@ -6,13 +6,13 @@
 		{% include './fonts/fonts.j2' %}
 		</style>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
 	<ellipse cx="128" cy="20" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
 
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">RettR</text>
-	<text x="128" y="240" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">Flugleiter</text>
+	<text x="128" y="240" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorStroke }}">Flugleiter</text>
 
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />
 </svg>
diff --git a/symbols/Feuerwehr_Personen/RettR_Gruppenführer.j2 b/symbols/Feuerwehr_Personen/RettR_Gruppenführer.j2
@@ -6,7 +6,7 @@
 		{% include './fonts/fonts.j2' %}
 		</style>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
 
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">RettR</text>

diff --git a/symbols/Feuerwehr_Personen/Schlauchtruppführer.j2 b/symbols/Feuerwehr_Personen/Schlauchtruppführer.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
 
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ feuerwehr.colorSecondary }}">S</text>

diff --git a/symbols/Feuerwehr_Personen/Schlauchtruppmann.j2 b/symbols/Feuerwehr_Personen/Schlauchtruppmann.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ feuerwehr.colorSecondary }}">S</text>
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />

diff --git a/symbols/Feuerwehr_Personen/Staffelführer.j2 b/symbols/Feuerwehr_Personen/Staffelführer.j2
@@ -6,7 +6,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
 
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />

diff --git a/symbols/Feuerwehr_Personen/Truppführer.j2 b/symbols/Feuerwehr_Personen/Truppführer.j2
@@ -0,0 +1,15 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Wassertruppführer</title>
+	<defs>
+		<style type="text/css">
+			{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="person">
+			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
+		</clipPath>
+	</defs>
+	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
+	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />
+</svg>
diff --git a/symbols/Feuerwehr_Personen/UAV_Flugleiter.j2 b/symbols/Feuerwehr_Personen/UAV_Flugleiter.j2
@@ -6,11 +6,11 @@
 		{% include './fonts/fonts.j2' %}
 		</style>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
-	<path d="M153,88 L103,88" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" />
 
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">UAV</text>
-	<text x="128" y="240" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorSecondary }}">Flugleiter</text>
+	<text x="128" y="240" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ feuerwehr.colorStroke }}">Flugleiter</text>
 
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />
 </svg>
diff --git a/symbols/Feuerwehr_Personen/Wassertruppführer.j2 b/symbols/Feuerwehr_Personen/Wassertruppführer.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
 
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ feuerwehr.colorSecondary }}">W</text>

diff --git a/symbols/Feuerwehr_Personen/Wassertruppmann.j2 b/symbols/Feuerwehr_Personen/Wassertruppmann.j2
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ feuerwehr.colorSecondary }}">W</text>
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />

diff --git a/symbols/Feuerwehr_Personen/Zugführer_Löschzug.j2 b/symbols/Feuerwehr_Personen/Zugführer_Löschzug.j2
@@ -6,12 +6,9 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="{{ feuerwehr.colorPrimary }}" />
-	<path d="M67,128 l123,0 M144,128 l23,-23 M144,128 l23,23" stroke-width="5" stroke="{{ feuerwehr.colorStroke }}" fill="none" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M67,128 l123,0 M144,128 l23,-23 M144,128 l23,23" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="none" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
-
-
-
 	<ellipse cx="100" cy="44" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
 	<ellipse cx="156" cy="44" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />