From 27a9543da987e104d2a7f82ec301332c7646f2a9 Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Sun, 17 Apr 2022 16:16:05 +0200
Subject: [PATCH] Added merge icons

---
 maloja/web/jinja/icons/merge.jinja      | 8 ++++++++
 maloja/web/jinja/icons/merge_mark.jinja | 5 +++++
 2 files changed, 13 insertions(+)
 create mode 100644 maloja/web/jinja/icons/merge.jinja
 create mode 100644 maloja/web/jinja/icons/merge_mark.jinja

diff --git a/maloja/web/jinja/icons/merge.jinja b/maloja/web/jinja/icons/merge.jinja
new file mode 100644
index 0000000..9963b90
--- /dev/null
+++ b/maloja/web/jinja/icons/merge.jinja
@@ -0,0 +1,8 @@
+<div title="merge" id="mergeicon" class="clickable_icon" onclick="merge()">
+	<svg width="20px" height="20px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+	<g>
+		<path fill="none" d="M0 0h24v24H0z"/>
+		<path d="M7.105 8.79A3.001 3.001 0 0 0 10 11h4a5.001 5.001 0 0 1 4.927 4.146A3.001 3.001 0 0 1 18 21a3 3 0 0 1-1.105-5.79A3.001 3.001 0 0 0 14 13h-4a4.978 4.978 0 0 1-3-1v3.17a3.001 3.001 0 1 1-2 0V8.83a3.001 3.001 0 1 1 2.105-.04z"/>
+	</g>
+	</svg>
+</div>
diff --git a/maloja/web/jinja/icons/merge_mark.jinja b/maloja/web/jinja/icons/merge_mark.jinja
new file mode 100644
index 0000000..11f4bdb
--- /dev/null
+++ b/maloja/web/jinja/icons/merge_mark.jinja
@@ -0,0 +1,5 @@
+<div title="Mark for merging" id="mergemarkicon" class="clickable_icon" onclick="markForMerge()">
+	<svg width="20px" height="20px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+	<path fill-rule="evenodd" d="M10,0 L10,2.60002 C12.2108812,3.04881281 13.8920863,4.95644867 13.9950026,7.27443311 L14,7.5 L14,11.2676 C14.5978,11.6134 15,12.2597 15,13 C15,14.1046 14.1046,15 13,15 C11.8954,15 11,14.1046 11,13 C11,12.3166462 11.342703,11.713387 11.8656124,11.3526403 L12,11.2676 L12,7.5 C12,6.259091 11.246593,5.19415145 10.1722389,4.73766702 L10,4.67071 L10,7 L6,3.5 L10,0 Z M3,1 C4.10457,1 5,1.89543 5,3 C5,3.68333538 4.65729704,4.28663574 4.13438762,4.6473967 L4,4.73244 L4,11.2676 C4.5978,11.6134 5,12.2597 5,13 C5,14.1046 4.10457,15 3,15 C1.89543,15 1,14.1046 1,13 C1,12.3166462 1.34270296,11.713387 1.86561238,11.3526403 L2,11.2676 L2,4.73244 C1.4022,4.38663 1,3.74028 1,3 C1,1.89543 1.89543,1 3,1 Z"/>
+	</svg>
+</div>