Merge branch '134-reply-swap-close-button' into 'dev'

reply close button moved to right side

Closes #134

See merge request keanuapp/keanuapp-weblite!57

src/components/Chat.vue

@@ -135,17 +135,6 @@
 
         <v-row class="ma-0 pa-0">
           <div v-if="replyToEvent" class="row">
-            <div class="col col-auto">
-              <v-btn
-                fab
-                small
-                elevation="0"
-                color="black"
-                @click.stop="cancelEditReply"
-              >
-                <v-icon color="white">cancel</v-icon>
-              </v-btn>
-            </div>
             <div class="col">
               <div class="font-weight-medium">{{ $t("message.replying_to", { user: replyToEvent.sender.name }) }}</div>
               <div v-if="replyToContentType === 'm.text'"> {{ replyToEvent.getContent().body }} </div>
@@ -169,6 +158,17 @@
                 src="@/assets/icons/video_message.svg"
               />
             </div>
+            <div class="col col-auto">
+              <v-btn
+                fab
+                small
+                elevation="0"
+                color="black"
+                @click.stop="cancelEditReply"
+              >
+                <v-icon color="white">cancel</v-icon>
+              </v-btn>
+            </div>
           </div>
 
           <!-- CONTACT IS TYPING -->