Frontend: cleanup dom structure and css

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2017-10-01 16:12:29 +02:00 коммит произвёл Julius Härtl
Родитель f42e3eb857
Коммит 02ec4ae9d1
2 изменённых файлов: 42 добавлений и 33 удалений

Просмотреть файл

@ -644,27 +644,34 @@ input.input-inline {
text-align: right;
}
.card-details-assigned-users {
display: flex;
.card-details-assign-users {
.assigned-user {
position: relative;
.select2 .ui-select-choices-row-inner {
display: flex;
padding: 5px !important;
}
.avatardiv {
margin-right:5px;
}
.icon-delete {
display: none;
position: absolute;
top: 8px;
left: 8px;
}
&:hover .icon-delete {
display: inline-block;
cursor: pointer;
}
&:hover .avatardiv {
opacity: .7;
.card-details-assign-users-list {
display: flex;
.assigned-user {
position: relative;
.avatardiv {
margin-right: 5px;
}
.icon-delete {
display: none;
position: absolute;
top: 8px;
left: 8px;
}
&:hover .icon-delete {
display: inline-block;
cursor: pointer;
}
&:hover .avatardiv {
opacity: .7;
}
}
}
}

Просмотреть файл

@ -53,21 +53,23 @@
<h4><?php p($l->t('Assign users')); ?></h4>
<button class="button icon-add" ng-click="showAssignUser()"></button>
</div>
<ui-select id="assignUserSelect" ng-model="status.assignedUser" ng-show="status.showAssignUser" uis-open-close="assingUserOpenClose(isOpen)"
theme="select2" style="width:100%;"
title="Choose a user to assign" placeholder="Choose a user to assign"
on-select="addAssignedUser($item)">
<ui-select-match placeholder="<?php p($l->t('Assign this card to a user')); ?>">
<span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant.displayname }}</span>
</ui-select-match>
<ui-select-choices repeat="user in boardservice.getCurrent().users| filter: $select.search track by user.uid">
<div class="avatardiv" avatar ng-attr-displayname="{{ user.uid }}" ng-if="boardservice.id"></div><span>{{ user.displayname }}</span>
</ui-select-choices>
<div class="section-content card-details-assign-users">
<ui-select id="assignUserSelect" class="card-details-assign-user" ng-model="status.assignedUser" ng-show="status.showAssignUser" uis-open-close="assingUserOpenClose(isOpen)"
theme="select2" style="width:100%;"
title="Choose a user to assign" placeholder="Choose a user to assign"
on-select="addAssignedUser($item)">
<ui-select-match placeholder="<?php p($l->t('Assign this card to a user')); ?>">
<span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant.displayname }}</span>
</ui-select-match>
<ui-select-choices repeat="user in boardservice.getCurrent().users| filter: $select.search track by user.uid">
<div class="avatardiv" avatar ng-attr-displayname="{{ user.uid }}" ng-if="boardservice.id"></div><span>{{ user.displayname }}</span>
</ui-select-choices>
</ui-select>
<div class="section-content card-details-assigned-users">
<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers">
<div class="avatardiv" avatar ng-attr-displayname="{{ user.participant.uid }}"></div>
<div class="icon icon-delete" ng-click="removeAssignedUser(user)"></div>
<div class="card-details-assign-users-list">
<div class="assigned-user" ng-repeat="user in cardservice.getCurrent().assignedUsers">
<div class="avatardiv" avatar ng-attr-displayname="{{ user.participant.uid }}"></div>
<div class="icon icon-delete" ng-click="removeAssignedUser(user)"></div>
</div>
</div>
</div>