summaryrefslogtreecommitdiffstats
path: root/client/components/activities
diff options
context:
space:
mode:
Diffstat (limited to 'client/components/activities')
-rw-r--r--client/components/activities/activities.jade6
-rw-r--r--client/components/activities/activities.styl2
-rw-r--r--client/components/activities/comments.js3
-rw-r--r--client/components/activities/comments.styl20
4 files changed, 24 insertions, 7 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index deb73072..8ecbdee8 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -201,20 +201,20 @@ template(name="cardActivities")
.activity-checklist(href="{{ card.absoluteUrl }}")
+viewer
= checklistItem.title
-
+
if(currentData.timeKey)
| {{{_ activityType }}}
= ' '
i(title=currentData.timeValue).activity-meta {{ moment currentData.timeValue 'LLL' }}
if (currentData.timeOldValue)
- = ' '
+ = ' '
| {{{_ "previous_as" }}}
= ' '
i(title=currentData.timeOldValue).activity-meta {{ moment currentData.timeOldValue 'LLL' }}
= ' @'
else if(currentData.timeValue)
| {{{_ activityType currentData.timeValue}}}
-
+
if($eq activityType 'deleteComment')
| {{{_ 'activity-deleteComment' currentData.commentId}}}.
diff --git a/client/components/activities/activities.styl b/client/components/activities/activities.styl
index 380e7b40..f3b1acdd 100644
--- a/client/components/activities/activities.styl
+++ b/client/components/activities/activities.styl
@@ -9,7 +9,7 @@
clear: both
.activity
- margin: 10px 0
+ margin: 0.5px 0
display: flex
.member
diff --git a/client/components/activities/comments.js b/client/components/activities/comments.js
index 95084646..50ca019b 100644
--- a/client/components/activities/comments.js
+++ b/client/components/activities/comments.js
@@ -16,9 +16,6 @@ BlazeComponent.extendComponent({
events() {
return [
{
- 'click .js-new-comment:not(.focus)'() {
- commentFormIsOpen.set(true);
- },
'submit .js-new-comment-form'(evt) {
const input = this.getInput();
const text = input.val().trim();
diff --git a/client/components/activities/comments.styl b/client/components/activities/comments.styl
index 22f9c482..ccf24b72 100644
--- a/client/components/activities/comments.styl
+++ b/client/components/activities/comments.styl
@@ -46,3 +46,23 @@
&:is-open
cursor: auto
+
+.comment-item
+ background-color: #fff
+ border: 0
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .23)
+ color: #8c8c8c
+ height: 36px
+ margin: 4px 4px 6px 0
+ width: 92%
+
+ &:hover
+ background: darken(white, 12%)
+
+ &.add-comment
+ display: flex
+ margin: 5px
+
+ a
+ display: block
+ margin: auto