ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Frontend: cleanup dom structure and css

Browse Source 
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
committed by Julius Härtl
parent f42e3eb857
commit 02ec4ae9d1
2 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
css/style.scss
View File

@@ -644,14 +644,20 @@ input.input-inline {
text-align: right; text-align: right;
} }
.card-details-assigned-users { .card-details-assign-users {
display: flex;
.select2 .ui-select-choices-row-inner {
display: flex;
padding: 5px !important;
}
.card-details-assign-users-list {
display: flex;
.assigned-user { .assigned-user {
position: relative; position: relative;
.avatardiv { .avatardiv {
margin-right:5px; margin-right: 5px;
} }
.icon-delete { .icon-delete {
display: none; display: none;
@@ -668,6 +674,7 @@ input.input-inline {
} }
} }
} }
}
#card-description { #card-description {
height: 100%; height: 100%;

6
templates/part.card.php
View File

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