diff options
| -rw-r--r-- | css/style.scss | 12 | ||||
| -rw-r--r-- | js/views/participantlistview.js | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/css/style.scss b/css/style.scss index 4533e4e65..70a16bd13 100644 --- a/css/style.scss +++ b/css/style.scss @@ -161,13 +161,17 @@ input[type="password"] { top: 6px; } -.participantWithList li > a:first-child img, +.participantWithList > li > a:first-child > img, #app-navigation li > a:first-child img { width: 32px !important; height: 32px !important; margin: 0 !important; } +.participantWithList .contactsmenu-popover { + margin-left: 7px; +} + .select2-result .avatar.icon, .atwho-view-ul .avatar.icon, #app-navigation .app-navigation-entry-link .avatar.icon { @@ -669,13 +673,13 @@ input[type="password"] { } } -.participantWithList li { +.participantWithList > li { position: relative; width: 100%; box-sizing: border-box; } -.participantWithList li > a { +.participantWithList > li > a { display: block; width: 100%; line-height: 44px; @@ -1066,7 +1070,7 @@ input[type="password"] { #app-sidebar .participantWithList .participant:last-child { /* Add room for the popovermenu on last user */ - padding-bottom: 64px; + padding-bottom: 94px; } /** diff --git a/js/views/participantlistview.js b/js/views/participantlistview.js index 4df40ef70..c42ab31c9 100644 --- a/js/views/participantlistview.js +++ b/js/views/participantlistview.js @@ -132,6 +132,12 @@ } }); + if (OC.getCurrentUser().uid && model.get('userId') && + model.get('userId') !== OC.getCurrentUser().uid) { + this.$el.find('.participant-entry-link .avatar').contactsMenu( + model.get('userId'), 0, this.$el.find('.participant-entry-link')); + } + this.$el.attr('data-session-id', this.model.get('sessionId')); this.$el.attr('data-participant', this.model.get('userId')); this.$el.addClass('participant'); |