Merge pull request #3374 from helioguardabaxo/master

Improvements in activities design
This commit is contained in:
Lauri Ojansivu 2020-11-29 04:17:38 +02:00 committed by GitHub
commit baf652a569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View file

@ -25,7 +25,8 @@ template(name="activity")
.activity .activity
+userAvatar(userId=activity.user._id) +userAvatar(userId=activity.user._id)
p.activity-desc p.activity-desc
+memberName(user=activity.user) span.activity-member
+memberName(user=activity.user)
//- attachment activity ------------------------------------------------- //- attachment activity -------------------------------------------------
if($eq activity.activityType 'deleteAttachment') if($eq activity.activityType 'deleteAttachment')

View file

@ -10,12 +10,16 @@
.activity .activity
margin: 0.5px 0 margin: 0.5px 0
padding: 6px 0;
display: flex display: flex
.member .member
width: 24px width: 32px
height: @width height: @width
.activity-member
font-weight: 700
.activity-desc .activity-desc
word-wrap: break-word word-wrap: break-word
overflow: hidden overflow: hidden