Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable13] Add an icon for participants which are in the call #793

Merged
merged 1 commit into from
Apr 20, 2018
Merged

[stable13] Add an icon for participants which are in the call #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,8 +837,7 @@ video {

a {
padding-left: 32px;
background-position: 12px;
background-repeat: no-repeat;
background: no-repeat 12px;
color: $color-main-text;
opacity: .5;
}
Expand All @@ -861,6 +860,14 @@ video {
padding-left: 5px;
}

.participantWithList .icon {
width: 16px;
display: inline-block;
opacity: 0.4;
margin-left: 5px;
margin-bottom: -4px;
}

.participantWithList .participant-offline > a {
opacity: .5;
}
Expand All @@ -882,8 +889,7 @@ video {
text-overflow: ellipsis;
padding-left: 44px;
background-size: 16px 16px;
background-position: 14px center;
background-repeat: no-repeat;
background: no-repeat 14px center;
}


Expand Down Expand Up @@ -1048,9 +1054,9 @@ video {
* the sidebar.
*/
#app-sidebar .tab-chat {
padding-left: 0px;
padding-right: 0px;
padding-bottom: 0px;
padding-left: 0;
padding-right: 0;
padding-bottom: 0;
}

#app-sidebar #commentsTabView .newCommentRow,
Expand Down Expand Up @@ -1084,8 +1090,8 @@ video {
* edge of the sidebar.
*/
#app-sidebar .tab-participants {
padding-right: 0px;
padding-bottom: 0px;
padding-right: 0;
padding-bottom: 0;
}

#app-sidebar #participantsTabView form,
Expand Down
1 change: 1 addition & 0 deletions js/models/participant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
userId: '',
sessionId: '',
participantType: 4,
inCall: 0,
lastPing: 0
},

Expand Down
1 change: 1 addition & 0 deletions js/views/participantlistview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
' {{name}}' +
'{{#if participantIsOwner}}<span class="participant-moderator-indicator">(' + t('spreed', 'moderator') + ')</span>{{/if}}' +
'{{#if participantIsModerator}}<span class="participant-moderator-indicator">(' + t('spreed', 'moderator') + ')</span>{{/if}}' +
'{{#if inCall}}<span class="icon icon-video"></span>{{/if}}' +
'</a>'+
'{{#if canModerate}}' +
'<div class="participant-entry-utils">'+
Expand Down