Merge branch 'development' into next-release-3.2.0

This commit is contained in:
Eugenio Romano
2019-03-27 14:30:33 +00:00
committed by Eugenio Romano
120 changed files with 1583 additions and 13770 deletions

View File

@@ -40,9 +40,10 @@
</data-column>
<data-column key="email" class="adf-full-width">
<ng-template let-entry="$implicit">
<div class="adf-people-full-name">{{ getDisplayUser(entry.row.obj.firstName, entry.row.obj.lastName, ' ') }}</div>
<div class="adf-people-email">{{ entry.row.obj.email }}</div>
<div class="adf-people-edit-label">can edit</div>
<div class="adf-people-user-info">
<div class="adf-people-full-name">{{ getDisplayUser(entry.row.obj.firstName, entry.row.obj.lastName, ' ') }}</div>
<div class="adf-people-email">{{ entry.row.obj.email }}</div>
</div>
</ng-template>
</data-column>
</data-columns>

View File

@@ -13,9 +13,11 @@
padding: 10px 0;
font-weight: bolder;
opacity: 0.54;
margin: 13px;
}
.adf-add-people {
margin: 13px;
float: right;
padding: 8px;
height: 26px;
@@ -53,13 +55,15 @@
padding: 0;
}
adf-people-list adf-datatable {
thead {
display: none;
}
.adf-datatable-cell {
margin: 13px;
}
.adf-datatable .adf-datatable-cell .adf-cell-container {
flex-direction: column;
align-items: left;
@@ -89,4 +93,9 @@
text-transform: uppercase;
vertical-align: text-bottom;
}
.adf-people-user-info {
flex-direction: column;
text-align: center;
}
}