summaryrefslogtreecommitdiffstats
path: root/client/components/activities
diff options
context:
space:
mode:
authornztqa <nztqa@users.noreply.github.com>2017-09-25 14:52:55 +0900
committernztqa <nztqa@users.noreply.github.com>2017-09-25 14:52:55 +0900
commitb503ba1144454234c3b9f852aefcde6e4a262a63 (patch)
tree9bd64aa3e89c37d8e38e9c70db35c308a3b1dacd /client/components/activities
parent415343bbd0184059ab5b4c838e26bc14fa2c7627 (diff)
downloadwekan-b503ba1144454234c3b9f852aefcde6e4a262a63.tar.gz
wekan-b503ba1144454234c3b9f852aefcde6e4a262a63.tar.bz2
wekan-b503ba1144454234c3b9f852aefcde6e4a262a63.zip
Add comments only in activity feed
Diffstat (limited to 'client/components/activities')
-rw-r--r--client/components/activities/activities.jade4
-rw-r--r--client/components/activities/activities.styl5
2 files changed, 7 insertions, 2 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index be12a728..deaee25e 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -31,7 +31,7 @@ template(name="boardActivities")
.activity-checklist(href="{{ card.absoluteUrl }}")
+viewer
= checklist.title
-
+
if($eq activityType 'addChecklistItem')
| {{{_ 'activity-checklist-item-added' checklist.title cardLink}}}.
.activity-checklist(href="{{ card.absoluteUrl }}")
@@ -90,7 +90,7 @@ template(name="boardActivities")
template(name="cardActivities")
each currentCard.activities
- .activity
+ .activity.js-card-activity
+userAvatar(userId=user._id)
p.activity-desc
+memberName(user=user)
diff --git a/client/components/activities/activities.styl b/client/components/activities/activities.styl
index 2285fc0a..36efd771 100644
--- a/client/components/activities/activities.styl
+++ b/client/components/activities/activities.styl
@@ -1,5 +1,10 @@
@import 'nib'
+.activity-title
+ margin: 0 0.5em 0.8em
+ display: flex
+ justify-content:space-between
+
.activities
clear: both