From 2dc4db0317ae53a2efd738cf9a73ece505deb4f0 Mon Sep 17 00:00:00 2001 From: yanas Date: Mon, 19 May 2014 14:49:20 +0200 Subject: [PATCH] Adds new icons and fixes some alignments in mute/kick menu. --- app.js | 18 +++++++++--------- css/font.css | 6 ++++++ css/popup_menu.css | 14 +++++++++++--- fonts/jitsi.eot | Bin 4532 -> 5136 bytes fonts/jitsi.svg | 2 ++ fonts/jitsi.ttf | Bin 4376 -> 4980 bytes fonts/jitsi.woff | Bin 3428 -> 3840 bytes 7 files changed, 28 insertions(+), 12 deletions(-) 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 26d0f7d653d3fe39f9ad9247650786ba62b41903..0679560af40f425cce4a516651b04c734343c232 100755 GIT binary patch delta 879 zcmYLH%}*0i5TBX1A1&SO2W%~EmI7VqE>KFBQW^_31Oka4M+}Jur9mQzAOwjaF|qyu z#6apzJQy#WynvoOaMGBVa5XWJ2LA#Ry^8ZN#Let`@Aqcr_j@z%9XdOn7PSC2+jg~4 z<>{5TFLo!^VjltE1OE$)tF`si%`f+NkL>#KlW#KsxDF6GT3)K%gP+H50AdA>8(roN zrA|AHml^jguWoMjUIpffZ8M%-SzD}iZudN6++>_vt!=GC8r}o68jQOh)>fB3Kd?_3 z=UBsCUwgC(f<4eSEBzp-aT_Nv+StP>j2<-cm04&1S(6Z(U_l?qvkj*y9u`g}Po7u&@b5My-6^kFB`-`F3ly2#bT03 z2-J+AibRB#=ed^NqALmymgjmFA_=6r(0EJNDJ64MMN$78@PMcYL1Lq&)eHp8Sm?19 z)D=|pP+&!9nkM4ejwrTv4J0+wF!XC`P*V_pN!=97F*UJ_nM|gPb0|e)j^o7S36PN3 zl{8sbtxKecf9kbs;W{Tqze>Qr+dk0Z%-JVJ$@mS z%5}FPM`%hw*W`Oc`Q`wI_x{m2l;8($+gG~zT` dXk?=Omfo&6&spMd2mzS`)Oa0hJ6MZO<6k`siqil9 delta 252 zcmbQBu|=6}iy#Aogy2LrGnW4=md=>ykS}dZ2L0xb1ReGClz5=MgT0)K4bs@ 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 b0adc9caef9f7c8ad785fac0e68b9c04c3b8401a..dfe9bade010eece4967a1d7796e494450a04a84a 100755 GIT binary patch delta 896 zcmYLI&rcIk5Pmanf0gcbTi9CKECpKVwxyIVr8Kmp2M~-(;z10FNtFf>5~(ym48}t_ zc_K#b#Y8=M@m@6^Jb2QWm~ilDA`SipCU`UAJdE*W_Rag|&CEA5yZa<|oMQ+D~|$w6?Z!_vXR9uk(b-ZoXe% zt=(Wh4qh-8$kF}eIvJ!UJ|rysht}&myTj)hq_(c5$2e+;wWZ=Z$dMw84Z9R%nwi=~*T zX*`NSACJefSeU3_UXA%MXhktUULivkf4NWrw-aCp%l|WLx+6Gq?g$EOTe&`+;2`h%Ks~2RCA^{u=-U!iAY9tyX9FFLx zP>=@V@pwQ~00>A|VS{+(ra%(^%kJ@XN#7(zrUU?jc5rrPCe{@&G*0{|%Q9+Sl>@i> zoiloGZ%FSSa&z8DX0QjyLy&nA3d7~reKT#Ty=vz)OOU-{nuuZ8f0G+6cGynhq delta 281 zcmeyOHbbeNfsuiMft#U$ftkU;KUm+0L+Q^EpvWE|PDsv8ERYI4lghxrC#1~7YxUMd>bI&CnrDIGEt&LW&u#311O-8n^;l6Aj2>l$ln0uE952Srk>1}c?9Hx zEKx7WFD?N(6bJ-kGLu0svilK4$;` diff --git a/fonts/jitsi.woff b/fonts/jitsi.woff index 468e1830780bd8af3ebb1ddd0c9963466747bca1..23574d131ad348a6fa07d37b30b53bae53452ec6 100755 GIT binary patch delta 780 zcmXw0OH30{6n)dscIeQS-)KV6gsKojjQB&+Xe3dn5VTZkqXv+I1Q03&P-uvhqM_|v z2B?#2U+FEP-?$(EB_ZcjaCON3B4DnB-7es62-=)}+e8s4%US~Ks#*7X!s z6H%B8sbm*L=@_Fqb$4b~c5dDY>zQ*U7b~t*)iwy%sLHh4MfrKfC`a-L(NH0hMp$8) zI+&1HYABuGqTbQIK{*oZWaTW7^@<*pEKac~I)o*@*UNg4EjVQzVjs|4A)5nME95}- zhV>V0!^Q^6w)Jy1&gGZ`?QqzmwY7`Y<9D%u!{NZnTpiER(UoZV z>sP+&#oh_6>E~=S8yf}fviyv-N#`Y-6c`Hf0lp{P;{z`=A#OqtLJ$hZ7Z<4Tg5M8b z8mgcY>5cdw!P_`^;9(flc7*z96Z8%Dj|L(Gk)a0yElF$Asx&qR4}HEdTKT55vs}a< z#up9^Kmh0D5ZtBv zRaZj}XhyWq&;o#es~+Y7+Z)$vXcDFnG{8D&$3YbNi4+(GkrQZBOiYi7EF>9(1w#>) zEbJK0q82j8GsWkpd#{^M{UMA7@0}27@_qaNRTyDTQmpWSDKlv(yy6j zggKP{97)biEMQ>ZmH_g7Kv*jDOlo>!F-R;0$mf7!fsE8dAfG!2$TtJyxZH&qKtZ6` z5+Gj%gjwpD`Z97$Du7}qfPAod3dS!Oj^!p+01f030SdB#v2XxGUSe)4P)vq_fl(cV zPiD(JD#$M`0Xo}d;tO}}BmA;Jr6&bJBqxyI+#$pu!pO+R&C4$&E~BWXZD49;@8anf z91%M?hB1bdfq{v!lR=O{c=BmR&CNd;k8p7Pm?H9HifA_v7sF&P9#=-b$rE^-f#ek) x6PX!HSNxCXxB1Gz%>*=`f#H0RSRss_tio%~C_Fia*9Yj>00su(&D(gr7y-z&O(6gP