taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #512 from taigaio/issue/2836/membership-timeline 

Fix user visualization in timeline
stable
David Barragán Merino 2015-06-11 17:58:52 +02:00
parent 4d52013e26 ecea4f665a
commit 181db3cf7f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/user-timeline/user-timeline-item/user-timeline-item.jade
View File

@ -11,7 +11,7 @@ div.activity-item
| {{::vm.activity.description | limitTo:300}} | {{::vm.activity.description | limitTo:300}}
.activity-member-view(ng-if="::vm.activity.member") .activity-member-view(ng-if="::vm.activity.member")
.profile-member-picture a.profile-member-picture(tg-nav="user-profile:username=vm.activity.member.user.username", title="{{::vm.activity.member.user.name }}")
img(ng-src="{{::vm.activity.member.user.photo}}", alt="{{::vm.activity.member.user.name}}") img(ng-src="{{::vm.activity.member.user.photo}}", alt="{{::vm.activity.member.user.name}}")
.activity-member-info .activity-member-info
a(tg-nav="user-profile:username=vm.activity.member.user.username", title="{{::vm.activity.member.user.name }}") a(tg-nav="user-profile:username=vm.activity.member.user.username", title="{{::vm.activity.member.user.name }}")

7
app/modules/user-timeline/user-timeline/user-timeline.scss
View File

@ -42,7 +42,8 @@
right: .5rem; right: .5rem;
top: 1.2rem; top: 1.2rem;
} }
.profile-contact-picture { .profile-contact-picture,
.profile-member-picture {
border-radius: .1rem; border-radius: .1rem;
flex-basis: 2rem; flex-basis: 2rem;
flex-shrink: 0; flex-shrink: 0;
@ -59,6 +60,10 @@
margin-bottom: .5rem; margin-bottom: .5rem;
margin-left: calc(35px + 1rem); margin-left: calc(35px + 1rem);
margin-top: .5rem; margin-top: .5rem;
.profile-member-picture {
flex-basis: 3rem;
width: 3rem;
}
.activity-member-info { .activity-member-info {
flex: 1; flex: 1;
} }