Browse Source

Adds new icons and fixes some alignments in mute/kick menu.

master
yanas 10 years ago
parent
commit
2dc4db0317
7 changed files with 28 additions and 12 deletions
  1. 9
    9
      app.js
  2. 6
    0
      css/font.css
  3. 11
    3
      css/popup_menu.css
  4. BIN
      fonts/jitsi.eot
  5. 2
    0
      fonts/jitsi.svg
  6. BIN
      fonts/jitsi.ttf
  7. BIN
      fonts/jitsi.woff

+ 9
- 9
app.js View File

@@ -1558,14 +1558,14 @@ function addRemoteVideoMenu(jid, parentElement) {
1558 1558
     var muteMenuItem = document.createElement('li');
1559 1559
     var muteLinkItem = document.createElement('a');
1560 1560
 
1561
-    var mutedIndicator = "<i class='icon-mic-disabled'></i>";
1561
+    var mutedIndicator = "<span><i class='icon-mic-disabled'></i></span>";
1562 1562
 
1563 1563
     if (!mutedAudios[jid]) {
1564 1564
         muteLinkItem.innerHTML = mutedIndicator + 'Mute';
1565 1565
         muteLinkItem.className = 'mutelink';
1566 1566
     }
1567 1567
     else {
1568
-        muteLinkItem.innerHTML = mutedIndicator + ' Muted';
1568
+        muteLinkItem.innerHTML = mutedIndicator + 'Muted';
1569 1569
         muteLinkItem.className = 'mutelink disabled';
1570 1570
     }
1571 1571
 
@@ -1578,11 +1578,11 @@ function addRemoteVideoMenu(jid, parentElement) {
1578 1578
         popupmenuElement.setAttribute('style', 'display:none;');
1579 1579
 
1580 1580
         if (isMute) {
1581
-            this.innerHTML = mutedIndicator + ' Muted';
1581
+            this.innerHTML = mutedIndicator + 'Muted';
1582 1582
             this.className = 'mutelink disabled';
1583 1583
         }
1584 1584
         else {
1585
-            this.innerHTML = mutedIndicator + ' Mute';
1585
+            this.innerHTML = mutedIndicator + 'Mute';
1586 1586
             this.className = 'mutelink';
1587 1587
         }
1588 1588
     };
@@ -1590,11 +1590,11 @@ function addRemoteVideoMenu(jid, parentElement) {
1590 1590
     muteMenuItem.appendChild(muteLinkItem);
1591 1591
     popupmenuElement.appendChild(muteMenuItem);
1592 1592
 
1593
-    var ejectIndicator = "<i class='fa fa-eject'></i>";
1593
+    var ejectIndicator = "<span><i class='icon-kick'></i></span>";
1594 1594
 
1595 1595
     var ejectMenuItem = document.createElement('li');
1596 1596
     var ejectLinkItem = document.createElement('a');
1597
-    ejectLinkItem.innerHTML = ejectIndicator + ' Kick out';
1597
+    ejectLinkItem.innerHTML = ejectIndicator + 'Kick out';
1598 1598
     ejectLinkItem.onclick = function(){
1599 1599
         connection.moderate.eject(jid);
1600 1600
         popupmenuElement.setAttribute('style', 'display:none;');
@@ -1610,17 +1610,17 @@ function updateRemoteVideoMenu(jid, isMuted) {
1610 1610
                 + Strophe.getResourceFromJid(jid)
1611 1611
                 + '>li>a.mutelink');
1612 1612
 
1613
-    var mutedIndicator = "<i class='icon-mic-disabled'></i>";
1613
+    var mutedIndicator = "<span><i class='icon-mic-disabled'></i></span>";
1614 1614
 
1615 1615
     if (muteMenuItem.length) {
1616 1616
         var muteLink = muteMenuItem.get(0);
1617 1617
 
1618 1618
         if (isMuted === 'true') {
1619
-            muteLink.innerHTML = mutedIndicator + ' Muted';
1619
+            muteLink.innerHTML = mutedIndicator + 'Muted';
1620 1620
             muteLink.className = 'mutelink disabled';
1621 1621
         }
1622 1622
         else {
1623
-            muteLink.innerHTML = mutedIndicator + ' Mute';
1623
+            muteLink.innerHTML = mutedIndicator + 'Mute';
1624 1624
             muteLink.className = 'mutelink';
1625 1625
         }
1626 1626
     }

+ 6
- 0
css/font.css View File

@@ -24,6 +24,12 @@
24 24
     -moz-osx-font-smoothing: grayscale;
25 25
 }
26 26
 
27
+.icon-kick1:before {
28
+    content: "\e60f";
29
+}
30
+.icon-kick:before {
31
+    content: "\e610";
32
+}
27 33
 .icon-share-desktop:before {
28 34
 	content: "\e602";
29 35
 }

+ 11
- 3
css/popup_menu.css View File

@@ -4,7 +4,8 @@ ul.popupmenu {
4 4
     position: absolute;
5 5
     padding:0;
6 6
     margin: 0;
7
-    bottom: 20px;
7
+    bottom: 0;
8
+    margin-bottom: 35px;
8 9
     padding-bottom: 5px;
9 10
     padding-top: 5px;
10 11
     right: 10px;
@@ -42,8 +43,15 @@ ul.popupmenu li a {
42 43
     font-size: 9pt;
43 44
 }
44 45
 
45
-ul.popupmenu li a i {
46
-    width: 12px;
46
+ul.popupmenu li a i.icon-kick {
47
+    font-size: 8pt;
48
+}
49
+
50
+ul.popupmenu li a span {
51
+    display: inline-block;
52
+    width: 20px;
53
+    height: 16px;
54
+    text-align: center;
47 55
 }
48 56
 
49 57
 span.remotevideomenu:hover ul.popupmenu {

BIN
fonts/jitsi.eot View File


+ 2
- 0
fonts/jitsi.svg View File

@@ -22,4 +22,6 @@
22 22
 <glyph unicode="&#xe60c;" d="M256.178 480c-141.228 0-256.178-114.919-256.178-256.239 0-141.195 114.95-256.113 256.178-256.113 141.257 0 256.207 114.919 256.207 256.113 0 141.32-114.95 256.239-256.207 256.239zM256.178 7.428c-119.272 0-216.335 97.063-216.335 216.333 0 119.398 97.063 216.429 216.335 216.429 119.3 0 216.428-97.031 216.428-216.429 0-119.27-97.127-216.333-216.428-216.333zM256.272 427.481c-112.377 0-203.754-91.375-203.754-203.657 0-112.281 91.375-203.657 203.754-203.657 112.219 0 203.594 91.377 203.594 203.658-0.002 112.283-91.375 203.658-203.594 203.658zM256.272 63.661c-88.358 0-160.226 71.902-160.226 160.162 0 88.262 71.868 160.162 160.226 160.162 88.262 0 160.098-71.901 160.098-160.162 0-88.26-71.837-160.162-160.098-160.162zM141.925 281.394l-0.477-0.699v-117.207l0.477-0.699c7.879-11.53 18.237-22.271 30.85-31.899l4.481-3.401v189.171l-4.481-3.368c-12.55-9.595-22.907-20.272-30.85-31.899zM207.819 332.865l-1.81-0.667v-220.18l1.81-0.699c9.341-3.527 19.444-5.97 30.883-7.466l3.112-0.381v237.207l-3.082-0.381c-11.119-1.398-21.508-3.876-30.913-7.435zM273.683 340.299l-3.082 0.381v-237.208l3.082 0.381c11.151 1.397 21.538 3.906 30.882 7.432l1.842 0.7v220.244l-1.842 0.667c-9.406 3.526-19.762 6.005-30.882 7.403zM370.49 281.394c-7.846 11.501-18.236 22.24-30.849 31.899l-4.447 3.43v-189.234l4.447 3.401c12.675 9.69 23.066 20.431 30.849 31.93l0.445 0.699v117.176l-0.445 0.7z" horiz-adv-x="513" />
23 23
 <glyph unicode="&#xe60d;" d="M476.183 480.067h-410.238c-36.514 0-66.266-30.38-66.266-67.728v-376.179c0-37.33 29.752-67.712 66.266-67.712h410.24c36.545 0 66.298 30.383 66.298 67.712v376.179c-0.001 37.347-29.754 67.728-66.299 67.728zM473.067 39.401h-403.947v369.731h403.917l0.029-369.731zM284.871 255.938l45.886 48.433-38.652 38.654 158.197 42.52-42.49-158.195-37.678 37.647-45.917-48.433zM257.382 192.281l-45.883-48.433 38.65-38.652-158.194-42.522 42.489 158.194 37.678-37.645 45.917 48.435z" horiz-adv-x="545" />
24 24
 <glyph unicode="&#xe60e;" d="M476.613 479.59h-410.332c-36.523 0-66.281-30.388-66.281-67.744v-376.262c0-37.324 29.759-67.71 66.281-67.71h410.33c36.553 0 66.312 30.388 66.312 67.711v376.262c0.001 37.356-29.758 67.744-66.311 67.744zM473.497 38.824h-404.039v369.798h404.009l0.031-369.798zM457.769 353.35l-45.897-48.445 38.663-38.661-158.232-42.515 42.5 158.232 37.687-37.67 45.926 48.445zM85.313 94.111l45.897 48.442-38.661 38.663 158.232 42.514-42.499-158.23-37.686 37.671-45.928-48.445z" horiz-adv-x="545" />
25
+<glyph unicode="&#xe60f;" d="M256.518 480c141.785-0.094 256.207-114.737 256.018-256.332-0.188-141.878-114.483-256.114-256.271-256.144-141.595-0.034-256.456 114.737-256.267 256.050 0.187 142.319 114.483 256.551 256.518 256.426zM256.142 405.365c-100.395-0.063-181.478-81.146-181.416-181.507 0-100.553 80.894-181.541 181.416-181.667 100.582-0.156 181.791 81.147 181.728 181.886-0.125 100.426-81.209 181.351-181.727 181.287zM298.696 223.794h-0.252l-0.063 0.063h0.315l57.808 57.933c0 0-39.123 39.252-41.077 41.077l-58.877-58.091-59.507 59.098-41.012-41.139 44.407-44.409 13.337-14.531h0.251l0.126-0.127h-0.378l-57.744-57.903c0 0 39.125-39.282 41.012-41.106l58.88 58.123 59.504-59.13 41.077 41.203-44.408 44.41-13.4 14.531z" horiz-adv-x="513" />
26
+<glyph unicode="&#xe610;" d="M33.245-31.998h513.97zM599.298 243.993c-67.851 67.947-135.707 135.83-203.683 203.62-3.122 3.045-6.934 5.857-10.933 7.327-15.618 5.7-31.74-6.404-31.864-23.837-0.127-33.832-0.063-67.666-0.063-101.483 0-2.14 0-4.31 0-6.982-3.062 0-5.435 0-7.81 0-53.123 0-106.167 0.031-159.243 0-17.589-0.016-27.43-9.855-27.43-27.461-0.030-46.389-0.030-92.75 0-139.173 0-17.9 9.841-27.74 27.805-27.74 52.887-0.031 105.712 0 158.555 0 2.438 0 4.811 0 8.123 0 0-2.688 0-4.687 0-6.654 0-33.397 0.125-66.851 0-100.248 0-11.529 4.623-20.12 15.121-24.774 10.558-4.685 19.68-1.405 27.615 6.469 67.978 68.039 136.016 136.017 203.994 204.087 11.745 11.716 11.62 25.056-0.187 36.847zM266.298 22.365c-1.313 9.81-11.028 16.058-13.964 17.713-4.405 2.593-9.185 2.906-12.841 2.906l-3.185-0.063-113.963 0.094c-28.021 0.062-49.234 21.087-49.296 48.858-0.094 88.563-0.094 177.161 0.032 265.755 0.029 26.991 21.335 48.265 48.484 48.406l117.961 0.031c16.713 0.015 25.647 8.060 27.24 24.618 0.5 6.482 0.405 13.026 0.219 19.586-0.564 19.869-9.685 28.74-29.553 28.756l-108.933-0.060c-7.747 0-15.463-0.281-23.18-1.172-57.76-6.577-103.778-56.825-104.841-114.399-0.656-31.944-0.498-63.902-0.342-95.859l0.093-30.101h-0.189c0 0-0.060-113.977 0.033-144.906 0.124-67.851 50.764-120.398 117.772-122.24 16.588-0.438 33.209-0.594 49.827-0.594h0.032l74.006 0.377c14.684 0 23.741 8.685 24.865 23.772 0.877 11.029 0.814 20.087-0.279 28.522z" horiz-adv-x="608" />
25 27
 </font></defs></svg>

BIN
fonts/jitsi.ttf View File


BIN
fonts/jitsi.woff View File


Loading…
Cancel
Save