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

Fix membership table avatars

stable
xaviju 2017-01-20 12:16:11 +01:00
parent 338f0c77d9
commit ebc70eb330
3 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/partials/admin/memberships-row-avatar.jade
View File

@ -1,10 +1,11 @@
figure.avatar .avatar
img( img(
src!="<%- imgurl %>"
alt!="<%- full_name %>"
style!="background-color: <%- bg %>" style!="background-color: <%- bg %>"
src!="<%- imgurl %>", alt!="<%- full_name %>"
) )
figcaption .user-data
div.name .name
span(ng-non-bindable) <%- full_name %> span(ng-non-bindable) <%- full_name %>
<% if (isOwner) { %> <% if (isOwner) { %>
tg-svg.owner-badge( tg-svg.owner-badge(
@ -12,6 +13,8 @@ figure.avatar
svg-title-translate="COMMON.OWNER" svg-title-translate="COMMON.OWNER"
) )
<% } %> <% } %>
div .data
span.pending <%- pending %>
span.email <%- email %> span.email <%- email %>
<% if (pending) { %>
span.pending <%- pending %>
<% } %>

4
app/partials/includes/modules/admin/admin-membership-table.jade
View File

@ -1,11 +1,11 @@
section.admin-membership-table.basic-table section.admin-membership-table.basic-table
div.row.title .row.title
div.header-member(translate="ADMIN.MEMBERSHIP.COLUMN_MEMBER") div.header-member(translate="ADMIN.MEMBERSHIP.COLUMN_MEMBER")
div.header-admin(translate="ADMIN.MEMBERSHIP.COLUMN_ADMIN") div.header-admin(translate="ADMIN.MEMBERSHIP.COLUMN_ADMIN")
div.header-role(translate="ADMIN.MEMBERSHIP.COLUMN_ROLE") div.header-role(translate="ADMIN.MEMBERSHIP.COLUMN_ROLE")
div.header-status(translate="ADMIN.MEMBERSHIP.COLUMN_STATUS") div.header-status(translate="ADMIN.MEMBERSHIP.COLUMN_STATUS")
div.row(ng-repeat="member in memberships") .row(ng-repeat="member in memberships")
div.row-member(tg-memberships-row-avatar="member") div.row-member(tg-memberships-row-avatar="member")
div.row-admin(tg-memberships-row-admin-checkbox="member") div.row-admin(tg-memberships-row-admin-checkbox="member")
div.row-role(tg-memberships-row-role-selector="member") div.row-role(tg-memberships-row-role-selector="member")

37
app/styles/modules/admin/admin-membership-table.scss
View File

@ -5,32 +5,23 @@
.avatar { .avatar {
align-items: center; align-items: center;
display: flex; display: flex;
justify-content: flex-start;
figcaption {
margin-left: 1rem;
width: 75%;
span {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
}
}
img { img {
flex-basis: 35px; border-radius: 4px;
flex-grow: 1; flex-grow: 0;
max-width: 35px; margin: 0 .5rem 0 .3rem;
width: 50px;
} }
.name, .data {
.email { @include font-type(light);
display: block; @include font-size(small);
width: 100%; color: $gray;
margin-top: .2rem;
} }
.name { .pending {
@include font-type(bold); @include font-type(normal);
} color: $red-light;
.email { display: inline-block;
color: $gray-light; padding-left: .3rem;
} }
} }
.header-role, .header-role,