diff --git a/app.js b/app.js
index 33f7f528a..9c8f0060c 100644
--- a/app.js
+++ b/app.js
@@ -1558,14 +1558,14 @@ function addRemoteVideoMenu(jid, parentElement) {
var muteMenuItem = document.createElement('li');
var muteLinkItem = document.createElement('a');
- var mutedIndicator = "";
+ var mutedIndicator = "";
if (!mutedAudios[jid]) {
muteLinkItem.innerHTML = mutedIndicator + 'Mute';
muteLinkItem.className = 'mutelink';
}
else {
- muteLinkItem.innerHTML = mutedIndicator + ' Muted';
+ muteLinkItem.innerHTML = mutedIndicator + 'Muted';
muteLinkItem.className = 'mutelink disabled';
}
@@ -1578,11 +1578,11 @@ function addRemoteVideoMenu(jid, parentElement) {
popupmenuElement.setAttribute('style', 'display:none;');
if (isMute) {
- this.innerHTML = mutedIndicator + ' Muted';
+ this.innerHTML = mutedIndicator + 'Muted';
this.className = 'mutelink disabled';
}
else {
- this.innerHTML = mutedIndicator + ' Mute';
+ this.innerHTML = mutedIndicator + 'Mute';
this.className = 'mutelink';
}
};
@@ -1590,11 +1590,11 @@ function addRemoteVideoMenu(jid, parentElement) {
muteMenuItem.appendChild(muteLinkItem);
popupmenuElement.appendChild(muteMenuItem);
- var ejectIndicator = "";
+ var ejectIndicator = "";
var ejectMenuItem = document.createElement('li');
var ejectLinkItem = document.createElement('a');
- ejectLinkItem.innerHTML = ejectIndicator + ' Kick out';
+ ejectLinkItem.innerHTML = ejectIndicator + 'Kick out';
ejectLinkItem.onclick = function(){
connection.moderate.eject(jid);
popupmenuElement.setAttribute('style', 'display:none;');
@@ -1610,17 +1610,17 @@ function updateRemoteVideoMenu(jid, isMuted) {
+ Strophe.getResourceFromJid(jid)
+ '>li>a.mutelink');
- var mutedIndicator = "";
+ var mutedIndicator = "";
if (muteMenuItem.length) {
var muteLink = muteMenuItem.get(0);
if (isMuted === 'true') {
- muteLink.innerHTML = mutedIndicator + ' Muted';
+ muteLink.innerHTML = mutedIndicator + 'Muted';
muteLink.className = 'mutelink disabled';
}
else {
- muteLink.innerHTML = mutedIndicator + ' Mute';
+ muteLink.innerHTML = mutedIndicator + 'Mute';
muteLink.className = 'mutelink';
}
}
diff --git a/css/font.css b/css/font.css
index f62621791..b0caacf70 100755
--- a/css/font.css
+++ b/css/font.css
@@ -24,6 +24,12 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-kick1:before {
+ content: "\e60f";
+}
+.icon-kick:before {
+ content: "\e610";
+}
.icon-share-desktop:before {
content: "\e602";
}
diff --git a/css/popup_menu.css b/css/popup_menu.css
index c91c4aa25..74d99551d 100644
--- a/css/popup_menu.css
+++ b/css/popup_menu.css
@@ -4,7 +4,8 @@ ul.popupmenu {
position: absolute;
padding:0;
margin: 0;
- bottom: 20px;
+ bottom: 0;
+ margin-bottom: 35px;
padding-bottom: 5px;
padding-top: 5px;
right: 10px;
@@ -42,8 +43,15 @@ ul.popupmenu li a {
font-size: 9pt;
}
-ul.popupmenu li a i {
- width: 12px;
+ul.popupmenu li a i.icon-kick {
+ font-size: 8pt;
+}
+
+ul.popupmenu li a span {
+ display: inline-block;
+ width: 20px;
+ height: 16px;
+ text-align: center;
}
span.remotevideomenu:hover ul.popupmenu {
diff --git a/fonts/jitsi.eot b/fonts/jitsi.eot
index 26d0f7d65..0679560af 100755
Binary files a/fonts/jitsi.eot and b/fonts/jitsi.eot differ
diff --git a/fonts/jitsi.svg b/fonts/jitsi.svg
index 91ad129c5..b2289b675 100755
--- a/fonts/jitsi.svg
+++ b/fonts/jitsi.svg
@@ -22,4 +22,6 @@
+
+
\ No newline at end of file
diff --git a/fonts/jitsi.ttf b/fonts/jitsi.ttf
index b0adc9cae..dfe9bade0 100755
Binary files a/fonts/jitsi.ttf and b/fonts/jitsi.ttf differ
diff --git a/fonts/jitsi.woff b/fonts/jitsi.woff
index 468e18307..23574d131 100755
Binary files a/fonts/jitsi.woff and b/fonts/jitsi.woff differ