summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-11-04 10:00:28 +0200
committerLauri Ojansivu <x@xet7.org>2019-11-04 10:00:28 +0200
commitea823ab68fd5243c8485177e44a074be836836b8 (patch)
treeba852a97f4313b1c88feaef3d4361b54d72d3843
parentb56ddf9df9a3719fd29bd8b777decc37773779b6 (diff)
downloadwekan-ea823ab68fd5243c8485177e44a074be836836b8.tar.gz
wekan-ea823ab68fd5243c8485177e44a074be836836b8.tar.bz2
wekan-ea823ab68fd5243c8485177e44a074be836836b8.zip
Assignee field like Jira #2452 , in progress.
-rw-r--r--client/components/cards/cardDetails.jade2
-rw-r--r--client/components/cards/cardDetails.styl45
-rw-r--r--client/components/main/popup.styl6
3 files changed, 5 insertions, 48 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index ad8010e4..97c2144f 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -325,7 +325,7 @@ template(name="userAvatarAssignee")
+userAvatarAssigneeInitials(userId=userData._id)
if showStatus
- span.member-presence-status(class=presenceStatusClassName)
+ span.assignee-presence-status(class=presenceStatusClassName)
span.member-type(class=memberType)
unless isSandstorm
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index 295a659d..e4549e44 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -62,23 +62,6 @@ avatar-radius = 50%
background: #e44242
border-color: #f1dada
- .edit-avatar
- position: absolute
- top: 0
- height: 100%
- width: 100%
- border-radius: avatar-radius
- background: black
- display: flex
- align-items: center
- justify-content: center
- opacity: 0
-
- &:hover
- opacity: 0.6
-
- i.fa-pencil
- color: white
&.add-assignee
@@ -90,34 +73,6 @@ avatar-radius = 50%
&:hover, &.is-active
box-shadow: 0 0 0 2px darken(white, 60%) inset
-.atMention
- background: #dbdbdb
- border-radius: 3px
- padding: 1px 4px
- margin: -1px 0
- display: inline-block
-
- &.me
- background: #cfdfe8
-
-.mini-profile-info
- margin-top: 10px
-
- .info
- padding-top: 5px
-
- h3, p
- margin-bottom: 0
- padding-left: 0
-
- p
- padding-top: 0
-
- .assignee
- width: 50px
- height: @width
- margin-right: 10px
-
// Other card details
.card-details
diff --git a/client/components/main/popup.styl b/client/components/main/popup.styl
index ff00eef3..023cba3d 100644
--- a/client/components/main/popup.styl
+++ b/client/components/main/popup.styl
@@ -130,7 +130,8 @@ $popupWidth = 300px
.popup-container-depth-{depth}
transform: translateX(- depth * $popupWidth)
-.select-members-list
+.select-members-list,
+.select-avatars-list
margin-bottom: 8px
.pop-over-list
@@ -230,7 +231,8 @@ $popupWidth = 300px
min-height: 56px
position: relative
- .member
+ .member,
+ .avatar
position: absolute
top: 2px
left: 2px