kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #529 in FS/freeswitch from ~STEFAN_YOHANSSON/freeswitch:feature/FS-8263-reset-the-banner-of-a-member to master 

* commit '2cd99e7c4ef96e5f4c16930e1ea32b30ad614db0':
  FS-8263 $resolve [verto_communicator] lock icon in floorLocked status
This commit is contained in:
Ítalo Rossi 2015-10-02 14:02:04 -05:00
parent ed9e9c6243 2cd99e7c4e
commit b514c9cd6e
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
html5/verto/verto_communicator/src/css/verto.css
View File

@ -895,9 +895,26 @@ body .modal-body .btn-group .btn.active {
white-space: nowrap;
}
.members-number {
font-size: 10px;
}
.members-badges {
font-size: 10px;
text-transform: uppercase;
margin-top: -2px;
}
.badge-floor span {
display: inline-block;
}
.lock-floor {
position: relative;
top: -3px;
display: inline-block;
font-size: 10px;
color: #FFF;
}
.chat-members .chat-member-item {
@ -931,7 +948,8 @@ body .modal-body .btn-group .btn.active {
margin: 0;
font-size: 16px;
display: inline-block;
line-height: 14px;
line-height: 16px;
margin-top: -3px;
}
.chat-members .chat-members-status i {

4
html5/verto/verto_communicator/src/partials/chat.html
View File

@ -24,10 +24,10 @@
<!-- FIXME(italo): Put this whole block in a flex box to avoid defining fixed width.-->
<h4 class="chat-members-name">
<div class="members-name">{{ member.name }}</div>
<small class="ellipsis">({{ member.number }})</small>
<small class="ellipsis members-number">({{ member.number }})</small>
<div class="members-badges">
<div ng-if="member.status.video.floor" class="label" ng-class="{'label-danger': member.status.video.floorLocked, 'label-info': !member.status.video.floorLocked}">Floor</div>
<div ng-if="member.status.video.floor" class="label badge-floor" ng-class="{'label-danger': member.status.video.floorLocked, 'label-info': !member.status.video.floorLocked}"><i class="mdi mdi-action-https lock-floor" ng-if="member.status.video.floorLocked"></i> <span>Floor</span></div>
<div ng-if="member.status.video.reservationID == 'presenter'" class="label label-warning">Presenter</div>
</div>
</h4>