From 460c30bd366db2db332144245c127ad8c37c973e Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 15 Nov 2020 17:17:08 +0100
Subject: [PATCH] Improve comment avatars on mobile

---
 src/components/input/editor.vue            | 53 +++++++++++++++++++++-
 src/components/tasks/partials/comments.vue | 38 +++++++++++-----
 src/styles/components/comments.scss        | 47 +++++++++++--------
 src/styles/theme/variables.scss            |  1 +
 4 files changed, 107 insertions(+), 32 deletions(-)

diff --git a/src/components/input/editor.vue b/src/components/input/editor.vue
index bb78ea9b0..c7bd95ad1 100644
--- a/src/components/input/editor.vue
+++ b/src/components/input/editor.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="{'is-pulled-up': isEditEnabled}" class="editor">
-		<div class="tabs is-right" v-if="hasPreview && isEditEnabled">
+		<div class="tabs is-right" v-if="hasPreview && isEditEnabled && !hasEditBottom">
 			<ul>
 				<li :class="{'is-active': isPreviewActive}" v-if="isEditActive">
 					<a @click="showPreview">Preview</a>
@@ -21,6 +21,20 @@
 
 		<div class="preview content" v-html="preview" v-if="isPreviewActive">
 		</div>
+
+		<ul class="actions">
+			<li v-for="(action, k) in bottomActions" :key="k">
+				<a @click="action.action">{{ action.title }}</a>
+			</li>
+			<template v-if="hasEditBottom">
+				<li :class="{'is-active': isPreviewActive}" v-if="isEditActive">
+					<a @click="showPreview">Preview</a>
+				</li>
+				<li :class="{'is-active': isEditActive}">
+					<a @click="() => {isPreviewActive = false; isEditActive = true}">Edit</a>
+				</li>
+			</template>
+		</ul>
 	</div>
 </template>
 
@@ -67,6 +81,13 @@ export default {
 		isEditEnabled: {
 			default: true,
 		},
+		hasEditBottom: {
+			type: Boolean,
+			default: false,
+		},
+		bottomActions: {
+			default: () => [],
+		},
 	},
 	data() {
 		return {
@@ -435,4 +456,34 @@ pre.CodeMirror-line {
 	font-family: $vikunja-font;
 	font-weight: 400;
 }
+
+ul.actions {
+	font-size: .8em;
+	margin: 0;
+
+	li {
+		display: inline-block;
+
+		&:after {
+			content: '·';
+			padding: 0 .25rem;
+		}
+
+		&:last-child:after {
+			content: '';
+		}
+	}
+
+	&, a {
+		color: $grey;
+	}
+
+	a:hover {
+		text-decoration: underline;
+	}
+}
+
+.vue-easymde.content {
+	margin-bottom: 0 !important;
+}
 </style>
diff --git a/src/components/tasks/partials/comments.vue b/src/components/tasks/partials/comments.vue
index f25e3060b..f5445df02 100644
--- a/src/components/tasks/partials/comments.vue
+++ b/src/components/tasks/partials/comments.vue
@@ -7,19 +7,21 @@
 			Comments
 		</h1>
 		<div class="comments">
-			<progress class="progress is-small is-info" max="100" v-if="taskCommentService.loading">Loading
-				comments...
+			<progress class="progress is-small is-info" max="100" v-if="taskCommentService.loading">
+				Loading comments...
 			</progress>
 			<div :key="c.id" class="media comment" v-for="c in comments">
-				<figure class="media-left">
+				<figure class="media-left is-hidden-mobile">
 					<img :src="c.author.getAvatarUrl(48)" alt="" class="image is-avatar" height="48" width="48"/>
 				</figure>
 				<div class="media-content">
-					<div :class="{'is-pulled-up': canWrite}" class="comment-info">
+					<div class="comment-info">
+						<img :src="c.author.getAvatarUrl(20)" alt="" class="image is-avatar" height="20" width="20"/>
 						<strong>{{ c.author.username }}</strong>&nbsp;
-						<small v-tooltip="formatDate(c.created)">{{ formatDateSince(c.created) }}</small>
-						<small v-if="+new Date(c.created) !== +new Date(c.updated)" v-tooltip="formatDate(c.updated)"> ·
-							edited {{ formatDateSince(c.updated) }}</small>
+						<span v-tooltip="formatDate(c.created)">{{ formatDateSince(c.created) }}</span>
+						<span v-if="+new Date(c.created) !== +new Date(c.updated)" v-tooltip="formatDate(c.updated)">
+							· edited {{ formatDateSince(c.updated) }}
+						</span>
 					</div>
 					<editor
 						:has-preview="true"
@@ -28,14 +30,13 @@
 						:upload-enabled="true"
 						@change="() => {toggleEdit(c);editComment()}"
 						v-model="c.comment"
+						:has-edit-bottom="true"
+						:bottom-actions="actions[c.id]"
 					/>
-					<div class="comment-actions" v-if="canWrite">
-						<a @click="toggleDelete(c.id)">Remove</a>
-					</div>
 				</div>
 			</div>
 			<div class="media comment" v-if="canWrite">
-				<figure class="media-left">
+				<figure class="media-left is-hidden-mobile">
 					<img :src="userAvatar" alt="" class="image is-avatar" height="48" width="48"/>
 				</figure>
 				<div class="media-content">
@@ -114,6 +115,7 @@ export default {
 			taskCommentService: TaskCommentService,
 			newComment: TaskCommentModel,
 			editorActive: true,
+			actions: {},
 		}
 	},
 	created() {
@@ -130,6 +132,9 @@ export default {
 		taskId() {
 			this.loadComments()
 		},
+		canWrite() {
+			this.makeActions()
+		},
 	},
 	computed: {
 		userAvatar() {
@@ -141,6 +146,7 @@ export default {
 			this.taskCommentService.getAll({taskId: this.taskId})
 				.then(r => {
 					this.$set(this, 'comments', r)
+					this.makeActions()
 				})
 				.catch(e => {
 					this.error(e, this)
@@ -212,6 +218,16 @@ export default {
 					this.showDeleteModal = false
 				})
 		},
+		makeActions() {
+			if (this.canWrite) {
+				this.comments.forEach(c => {
+					this.$set(this.actions, c.id, [{
+						action: () => this.toggleDelete(c.id),
+						title: 'Remove',
+					}])
+				})
+			}
+		}
 	},
 }
 </script>
diff --git a/src/styles/components/comments.scss b/src/styles/components/comments.scss
index 761ff9afb..8cfb1c4b9 100644
--- a/src/styles/components/comments.scss
+++ b/src/styles/components/comments.scss
@@ -5,29 +5,36 @@
     margin: 0 1em;
   }
 
-  @media screen and (min-width: $tablet) {
-    .comment-info.is-pulled-up {
-      margin-bottom: -3rem;
+  .comment-info {
+    display: flex;
+    align-items: center;
+
+    * {
+      padding-right: .5rem;
+    }
+
+    img {
+      display: none;
+    }
+
+    @media screen and (max-width: $tablet) {
+      img {
+        display: block;
+        width: 20px;
+        height: 20px;
+        padding-right: 0;
+        margin-right: .5rem;
+      }
+    }
+
+    span {
+      font-size: .75rem;
+      line-height: 1;
     }
   }
 
-  .editor .tabs {
-    margin-bottom: 0;
-
-    ul {
-      border-bottom: none;
-    }
+  .editor {
+    margin-top: .5rem;
   }
 
-  .comment-actions {
-    font-size: .8em;
-
-    &, a {
-      color: $grey;
-    }
-
-    a:hover {
-      text-decoration: underline;
-    }
-  }
 }
\ No newline at end of file
diff --git a/src/styles/theme/variables.scss b/src/styles/theme/variables.scss
index 11133a6a1..b9dcf591d 100644
--- a/src/styles/theme/variables.scss
+++ b/src/styles/theme/variables.scss
@@ -5,6 +5,7 @@ $red: #ff4136;
 $blue: #1973ff;
 $primary: $blue;
 $dark: lighten($black, 8);
+$grey: hsl(0, 0%, 48%);
 
 $info-invert: #fff;
 $family-sans-serif: 'Open Sans', Helvetica, Arial, sans-serif;