From 35a4f221d8384dd2ce975dd2c79c316b5d937fe7 Mon Sep 17 00:00:00 2001
From: molan-git <mol_an@sunrise.ch>
Date: Thu, 7 May 2020 16:42:07 +0200
Subject: [PATCH] Added topMargin padding

---
 qml/images/tooter.svg             | 71 +++++++++++++++++--------------
 qml/pages/Conversation.qml        |  1 +
 translations/harbour-tooter-it.ts | 14 +++---
 3 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/qml/images/tooter.svg b/qml/images/tooter.svg
index 62c8550..705b6fa 100644
--- a/qml/images/tooter.svg
+++ b/qml/images/tooter.svg
@@ -1,33 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 227.9 240.1" enable-background="new 0 0 227.9 240.1" xml:space="preserve">
-<g>
-	<path opacity="0.5" fill="#FFFFFF" d="M122.2,119.8c0,0,0,0.3-0.1,0.9c-0.1,0.6-0.2,1.5-0.3,2.7c-0.2,2.4-0.5,5.8-0.6,10
-		c-0.2,8.3,0.1,19.5,2.5,30.2c0.6,2.7,1.4,5.3,2.3,7.8c0.9,2.5,2,4.9,3.2,7.1c0.6,1.1,1.2,2.2,2,3.2c0.7,1,1.4,1.9,2.2,2.8
-		c1.5,1.8,3.2,3.2,4.8,4.5c1.7,1.2,3.4,2.2,5,2.8c1.5,0.8,3.1,1.1,4.3,1.5c2.5,0.5,3.9,0.8,3.9,0.8s-1.4,0.1-4.1,0.3
-		c-1.3-0.1-2.9,0-4.7-0.4c-1.9-0.2-3.9-0.8-6.1-1.6c-2.2-0.9-4.5-2-6.8-3.6c-1.1-0.8-2.3-1.6-3.3-2.6c-1.1-0.9-2.2-1.9-3.2-3
-		c-2.1-2.1-4-4.6-5.8-7.1c-1.7-2.6-3.4-5.3-4.9-8.1c-5.9-11.2-9.4-23.2-11.6-32.3c-1.1-4.6-1.8-8.4-2.2-11.2
-		c-0.2-1.4-0.4-2.5-0.5-3.2c-0.1-0.8-0.2-1.2-0.2-1.2l0-0.4c-0.8-6.7,4-12.9,10.7-13.7c6.7-0.8,12.9,4,13.7,10.7
-		C122.4,117.7,122.4,118.8,122.2,119.8z"/>
-	<g opacity="0.2">
-		<path fill="#FFFFFF" d="M43.7,12.5c3-1.1,6.1-2.1,9.2-3.1c-3.6-2-10.7-4.7-24.8-5.5C28.1,3.9,40.4,7.9,43.7,12.5z"/>
-		<path fill="#FFFFFF" d="M151.5,156.8v-33.4c-3.7,0-7.3,0-9.7,0c6,0,8.5-5.5,9.5-11c-1.5-34.8-21.5-67.6-55.1-83.7
-			c-6.9-3.3-14-5.7-21.2-7.3c12-5,26.5-7.4,26.5-7.4c-17.7-0.7-32.2,1.9-43.2,5.2c-0.6,0-1.2,0-1.8,0C67.8,10.9,87.2,5.4,87.2,5.4
-			c-27.8,0-55.5,12.7-72.8,22c-0.7,0-1.4-0.1-2-0.1c-30.8,0-55.9,25-55.9,55.9c0,5.3,0.8,10.5,2.2,15.3c-0.4,2-0.6,4.1-0.9,6.1
-			l-31.6,31.6V246H54.3h14h19.6h20v-93.7c0,0,4.6,77.8,32.3,77.8c4.3,0,8.4,0,11.5,0v-16.4c-3.7,0-7.3,0-9.7,0c6.3,0,8.7-6,9.7-11.8
-			v-33.4c-3.7,0-7.3,0-9.7,0C148.1,168.5,150.6,162.5,151.5,156.8z"/>
-	</g>
-	<path opacity="0.2" d="M98.6,124.4c-0.2-1.4-0.4-2.5-0.5-3.2c-0.1-0.8-0.2-1.2-0.2-1.2l0-0.4c-0.8-6.7,4-12.9,10.7-13.7
-		c6.7-0.8,12.9,4,13.7,10.7c0.1,1.1,0.1,2.2,0,3.3c0,0,0,0.3-0.1,0.9c-0.1,0.6-0.2,1.5-0.3,2.7c-0.1,1.1-0.2,2.5-0.3,4.1
-		c2.1-2.6,3.4-5.8,3.4-9.4c0-8.2-6.6-14.8-14.8-14.8c-8.2,0-14.8,6.6-14.8,14.8c0,3.8,1.5,7.2,3.8,9.9
-		C99,126.7,98.8,125.4,98.6,124.4z"/>
-	<path opacity="0.2" d="M89.5,76.4c18.5,26.1-10.2,54.9-36.4,36.4c-0.7-0.5-1.4-1.2-1.9-1.9C32.7,84.7,61.5,56,87.6,74.5
-		C88.4,75,89,75.7,89.5,76.4z"/>
-	<circle opacity="0.5" fill="#FFFFFF" cx="74.7" cy="83.5" r="13.8"/>
-	<circle opacity="0.5" cx="78" cy="83.5" r="6.4"/>
-	<path opacity="0.2" d="M12.4,139c-30.8,0-55.9-25-55.9-55.9c0-1.2,0.1-2.3,0.2-3.5C-45,84.7-46,90-46,95.5
-		c0,26.8,21.7,48.6,48.6,48.6c9.4,0,18.2-2.7,25.6-7.4C23.2,138.2,17.9,139,12.4,139z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 227.9 240.1" style="enable-background:new 0 0 227.9 240.1;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+	.st1{opacity:0.2;}
+	.st2{fill:#FFFFFF;}
+	.st3{opacity:0.2;enable-background:new    ;}
+	.st4{opacity:0.5;enable-background:new    ;}
+</style>
+<g>
+	<path class="st0" d="M109.8,117.4c0.8-6.7,7-11.5,13.7-10.7c6.7,0.8,11.5,7,10.7,13.7v0.4c0,0-0.1,0.4-0.2,1.2
+		c-0.1,0.7-0.3,1.8-0.5,3.2c-0.4,2.8-1.1,6.6-2.2,11.2c-2.2,9.1-5.7,21.1-11.6,32.3c-1.5,2.8-3.2,5.5-4.9,8.1
+		c-1.8,2.5-3.7,5-5.8,7.1c-1,1.1-2.1,2.1-3.2,3c-1,1-2.2,1.8-3.3,2.6c-2.3,1.6-4.6,2.7-6.8,3.6c-2.2,0.8-4.2,1.4-6.1,1.6
+		c-1.8,0.4-3.4,0.3-4.7,0.4c-2.7-0.2-4.1-0.3-4.1-0.3s1.4-0.3,3.9-0.8c1.2-0.4,2.8-0.7,4.3-1.5c1.6-0.6,3.3-1.6,5-2.8
+		c1.6-1.3,3.3-2.7,4.8-4.5c0.8-0.9,1.5-1.8,2.2-2.8c0.8-1,1.4-2.1,2-3.2c1.2-2.2,2.3-4.6,3.2-7.1s1.7-5.1,2.3-7.8
+		c2.4-10.7,2.7-21.9,2.5-30.2c-0.1-4.2-0.4-7.6-0.6-10c-0.1-1.2-0.2-2.1-0.3-2.7s-0.1-0.9-0.1-0.9
+		C109.8,119.6,109.8,118.5,109.8,117.4z"/>
+	<g class="st1">
+		<path class="st2" d="M204.1,4.7c-14.1,0.8-21.2,3.5-24.8,5.5c3.1,1,6.2,2,9.2,3.1C191.8,8.7,204.1,4.7,204.1,4.7z"/>
+		<path class="st2" d="M90.2,169.3c-2.4,0-6,0-9.7,0v33.4c1,5.8,3.4,11.8,9.7,11.8c-2.4,0-6,0-9.7,0l0,16.4c3.1,0,7.2,0,11.5,0
+			c27.7,0,32.3-77.8,32.3-77.8l0,93.7h20h19.6h14H306V136.9l-31.6-31.6c-0.3-2-0.5-4.1-0.9-6.1c1.4-4.8,2.2-10,2.2-15.3
+			c0-30.9-25.1-55.9-55.9-55.9c-0.6,0-1.3,0.1-2,0.1c-17.3-9.3-45-22-72.8-22c0,0,19.4,5.5,30.7,13.8c-0.6,0-1.2,0-1.8,0
+			c-11-3.3-25.5-5.9-43.2-5.2c0,0,14.5,2.4,26.5,7.4c-7.2,1.6-14.3,4-21.2,7.3c-33.6,16.1-53.6,48.9-55.1,83.7c1,5.5,3.5,11,9.5,11
+			c-2.4,0-6,0-9.7,0v33.4C81.5,163.3,84,169.3,90.2,169.3z"/>
+	</g>
+	<path class="st3" d="M133,128.9c2.3-2.7,3.8-6.1,3.8-9.9c0-8.2-6.6-14.8-14.8-14.8s-14.8,6.6-14.8,14.8c0,3.6,1.3,6.8,3.4,9.4
+		c-0.1-1.6-0.2-3-0.3-4.1c-0.1-1.2-0.2-2.1-0.3-2.7s-0.1-0.9-0.1-0.9c-0.1-1.1-0.1-2.2,0-3.3c0.8-6.7,7-11.5,13.7-10.7
+		c6.7,0.8,11.5,7,10.7,13.7v0.4c0,0-0.1,0.4-0.2,1.2c-0.1,0.7-0.3,1.8-0.5,3.2C133.3,126.2,133.1,127.5,133,128.9z"/>
+	<path class="st3" d="M144.6,75.3c26.1-18.5,54.9,10.2,36.4,36.4c-0.5,0.7-1.2,1.4-1.9,1.9c-26.2,18.5-54.9-10.3-36.4-36.4
+		C143.1,76.5,143.8,75.8,144.6,75.3z"/>
+	<circle class="st0" cx="157.4" cy="84.3" r="13.8"/>
+	<circle class="st4" cx="154.1" cy="84.3" r="6.4"/>
+	<path class="st3" d="M203.9,137.5c7.4,4.7,16.2,7.4,25.6,7.4c26.9,0,48.6-21.8,48.6-48.6c0-5.5-1-10.8-2.7-15.9
+		c0.1,1.2,0.2,2.3,0.2,3.5c0,30.9-25.1,55.9-55.9,55.9C214.3,139.8,208.9,138.9,203.9,137.5z"/>
+</g>
+</svg>
diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml
index 5da692c..767955e 100644
--- a/qml/pages/Conversation.qml
+++ b/qml/pages/Conversation.qml
@@ -390,6 +390,7 @@ Page {
 				+ (pressed ? Theme.highlightColor : Theme.primaryColor)
 			anchors {
                 top: toot.bottom
+                topMargin: -Theme.paddingSmall * 2
 				right: parent.right
                 rightMargin: Theme.paddingSmall
 			}
diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts
index 7f50712..7ef928a 100644
--- a/translations/harbour-tooter-it.ts
+++ b/translations/harbour-tooter-it.ts
@@ -43,37 +43,37 @@
         <translation>A cosa stai pensando?</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Conversation.qml" line="274"/>
+        <location filename="../qml/pages/Conversation.qml" line="275"/>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Conversation.qml" line="372"/>
+        <location filename="../qml/pages/Conversation.qml" line="373"/>
         <source>Public</source>
         <translation>Pubblico</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Conversation.qml" line="375"/>
+        <location filename="../qml/pages/Conversation.qml" line="376"/>
         <source>Unlisted</source>
         <translation>Non elencato</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Conversation.qml" line="378"/>
+        <location filename="../qml/pages/Conversation.qml" line="379"/>
         <source>Followers-only</source>
         <translation>Solo ai seguaci</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Conversation.qml" line="381"/>
+        <location filename="../qml/pages/Conversation.qml" line="382"/>
         <source>Direct</source>
         <translation>Diretto</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Conversation.qml" line="494"/>
+        <location filename="../qml/pages/Conversation.qml" line="496"/>
         <source>Emojis</source>
         <translation>Emojis</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Conversation.qml" line="495"/>
+        <location filename="../qml/pages/Conversation.qml" line="497"/>
         <source>Tap to insert</source>
         <translation>Tap per inserire</translation>
     </message>