diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:42:15 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:42:15 +0300 |
commit | a0cccb736c198f8610273e133df256c48c5f5b05 (patch) | |
tree | 3fcf5da5a8935a938222db46a5440184accc295a /client/components/activities | |
parent | 6ec14ee52bca394189a0f1d41d20b597e90f6320 (diff) | |
parent | 61ee107c27ea4b5be3b8b9bcb6d6a36de65dfcd1 (diff) | |
download | wekan-a0cccb736c198f8610273e133df256c48c5f5b05.tar.gz wekan-a0cccb736c198f8610273e133df256c48c5f5b05.tar.bz2 wekan-a0cccb736c198f8610273e133df256c48c5f5b05.zip |
Merge branch 'improve-activities' of https://github.com/nztqa/wekan into nztqa-improve-activities
Diffstat (limited to 'client/components/activities')
-rw-r--r-- | client/components/activities/activities.jade | 4 | ||||
-rw-r--r-- | client/components/activities/activities.styl | 5 |
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 |