diff --git a/css/_font.scss b/css/_font.scss index 57e1c8a85..55e9e9baf 100644 --- a/css/_font.scss +++ b/css/_font.scss @@ -25,6 +25,9 @@ -moz-osx-font-smoothing: grayscale; } +.icon-thumb-menu:before { + content: "\e5d4"; +} .icon-mic-camera-combined:before { content: "\e903"; } diff --git a/css/_vertical_filmstrip_overrides.scss b/css/_vertical_filmstrip_overrides.scss index 698e35536..d15f58278 100644 --- a/css/_vertical_filmstrip_overrides.scss +++ b/css/_vertical_filmstrip_overrides.scss @@ -65,7 +65,8 @@ left: 0; top: auto; right: auto; - transform: translate3d(0,0,0) rotate(-90deg); + margin-bottom: 7px; + transform: translate3d(0,0,0); } #remoteVideos { diff --git a/css/_videolayout_default.scss b/css/_videolayout_default.scss index 5384ecbc7..f8e35391f 100644 --- a/css/_videolayout_default.scss +++ b/css/_videolayout_default.scss @@ -315,12 +315,16 @@ position: absolute; top: 0px; right: 0; - margin: 7px; + margin-top: 7px; z-index: $zindex3; width: 18px; height: 13px; color: #FFF; - font-size: 8pt; + font-size: 10pt; + + >i{ + cursor: hand; + } } /** diff --git a/fonts/jitsi.eot b/fonts/jitsi.eot old mode 100644 new mode 100755 index f369ce469..e08358f41 Binary files a/fonts/jitsi.eot and b/fonts/jitsi.eot differ diff --git a/fonts/jitsi.svg b/fonts/jitsi.svg old mode 100644 new mode 100755 index 23a820ec9..198b965e4 --- a/fonts/jitsi.svg +++ b/fonts/jitsi.svg @@ -9,6 +9,7 @@ + diff --git a/fonts/jitsi.ttf b/fonts/jitsi.ttf old mode 100644 new mode 100755 index 65eaa9dcd..4542f317c Binary files a/fonts/jitsi.ttf and b/fonts/jitsi.ttf differ diff --git a/fonts/jitsi.woff b/fonts/jitsi.woff old mode 100644 new mode 100755 index 0a7405f09..62f9cc78d Binary files a/fonts/jitsi.woff and b/fonts/jitsi.woff differ diff --git a/fonts/selection.json b/fonts/selection.json old mode 100644 new mode 100755 index 5991a9ec4..fc8c92af6 --- a/fonts/selection.json +++ b/fonts/selection.json @@ -1,6 +1,116 @@ { "IcoMoonType": "selection", "icons": [ + { + "icon": { + "paths": [ + "M512 682c46 0 86 40 86 86s-40 86-86 86-86-40-86-86 40-86 86-86zM512 426c46 0 86 40 86 86s-40 86-86 86-86-40-86-86 40-86 86-86zM512 342c-46 0-86-40-86-86s40-86 86-86 86 40 86 86-40 86-86 86z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "more_vert" + ], + "defaultCode": 58836, + "grid": 24 + }, + "attrs": [], + "properties": { + "ligatures": "more_vert", + "id": 502, + "order": 897, + "prevSize": 24, + "code": 58836, + "name": "thumb-menu" + }, + "setIdx": 0, + "setId": 2, + "iconIdx": 502 + }, + { + "icon": { + "paths": [ + "M330.667 554.667c-0.427-14.933 6.4-29.44 17.92-39.253 32 6.827 61.867 20.053 88.747 39.253 0 29.013-23.893 52.907-53.333 52.907s-52.907-23.467-53.333-52.907zM586.667 554.667c26.88-18.773 56.747-32 88.747-38.827 11.52 9.813 18.347 24.32 17.92 38.827 0 29.867-23.893 53.76-53.333 53.76s-53.333-23.893-53.333-53.76v0zM512 384c-118.187-1.707-234.667 27.733-338.347 85.333l-2.987 42.667c0 52.48 12.373 104.107 35.84 151.040 101.12-15.36 203.093-23.040 305.493-23.040s204.373 7.68 305.493 23.040c23.467-46.933 35.84-98.56 35.84-151.040l-2.987-42.667c-103.68-57.6-220.16-87.040-338.347-85.333zM512 85.333c235.641 0 426.667 191.025 426.667 426.667s-191.025 426.667-426.667 426.667c-235.641 0-426.667-191.025-426.667-426.667s191.025-426.667 426.667-426.667z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "ninja" + ], + "grid": 24 + }, + "attrs": [ + {} + ], + "properties": { + "order": 850, + "id": 0, + "name": "ninja", + "prevSize": 24, + "code": 59657 + }, + "setIdx": 1, + "setId": 1, + "iconIdx": 40 + }, + { + "icon": { + "paths": [ + "M282 460c62 120 162 220 282 282l94-94c12-12 30-16 44-10 48 16 100 24 152 24 24 0 42 18 42 42v150c0 24-18 42-42 42-400 0-726-326-726-726 0-24 18-42 42-42h150c24 0 42 18 42 42 0 54 8 104 24 152 4 14 2 32-10 44z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "phone" + ], + "defaultCode": 57549, + "grid": 24 + }, + "attrs": [], + "properties": { + "ligatures": "call, local_phone, phone", + "id": 1, + "order": 851, + "prevSize": 24, + "code": 57549, + "name": "phone" + }, + "setIdx": 1, + "setId": 1, + "iconIdx": 41 + }, + { + "icon": { + "paths": [ + "M810 554h-256v256h-84v-256h-256v-84h256v-256h84v256h256v84z" + ], + "attrs": [], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "add" + ], + "defaultCode": 57669, + "grid": 24 + }, + "attrs": [], + "properties": { + "ligatures": "add", + "id": 12, + "order": 896, + "prevSize": 24, + "code": 57669, + "name": "add" + }, + "setIdx": 1, + "setId": 1, + "iconIdx": 42 + }, { "icon": { "paths": [ @@ -26,8 +136,8 @@ "prevSize": 32, "code": 59651 }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 0 }, { @@ -55,8 +165,8 @@ "prevSize": 32, "code": 59677 }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 1 }, { @@ -84,8 +194,8 @@ "prevSize": 32, "code": 59676 }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 2 }, { @@ -110,8 +220,8 @@ "code": 59649, "name": "avatar" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 3 }, { @@ -136,8 +246,8 @@ "code": 59653, "name": "hangup" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 4 }, { @@ -162,8 +272,8 @@ "code": 59654, "name": "chat" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 5 }, { @@ -188,8 +298,8 @@ "code": 59650, "name": "download" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 6 }, { @@ -214,8 +324,8 @@ "code": 59655, "name": "edit" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 7 }, { @@ -240,8 +350,8 @@ "code": 59656, "name": "share-doc" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 8 }, { @@ -266,8 +376,8 @@ "code": 59652, "name": "kick" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 9 }, { @@ -292,8 +402,8 @@ "code": 59679, "name": "menu-up" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 10 }, { @@ -318,8 +428,8 @@ "code": 59680, "name": "menu-down" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 11 }, { @@ -344,8 +454,8 @@ "code": 59659, "name": "full-screen" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 12 }, { @@ -370,8 +480,8 @@ "code": 59660, "name": "exit-full-screen" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 13 }, { @@ -396,8 +506,8 @@ "code": 59658, "name": "star-full" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 14 }, { @@ -422,8 +532,8 @@ "code": 59661, "name": "security" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 15 }, { @@ -448,8 +558,8 @@ "code": 59662, "name": "security-locked" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 16 }, { @@ -474,8 +584,8 @@ "code": 59663, "name": "reload" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 17 }, { @@ -500,8 +610,8 @@ "code": 59664, "name": "microphone" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 18 }, { @@ -526,8 +636,8 @@ "code": 59665, "name": "mic-empty" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 19 }, { @@ -552,8 +662,8 @@ "code": 59666, "name": "mic-disabled" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 20 }, { @@ -578,8 +688,8 @@ "code": 59678, "name": "raised-hand" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 21 }, { @@ -604,8 +714,8 @@ "code": 59675, "name": "contactList" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 22 }, { @@ -630,8 +740,8 @@ "code": 59667, "name": "link" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 23 }, { @@ -656,8 +766,8 @@ "code": 59668, "name": "shared-video" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 24 }, { @@ -682,8 +792,8 @@ "code": 59669, "name": "settings" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 25 }, { @@ -708,8 +818,8 @@ "code": 59670, "name": "star" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 26 }, { @@ -734,8 +844,8 @@ "code": 59681, "name": "switch-camera" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 27 }, { @@ -760,8 +870,8 @@ "code": 59671, "name": "share-desktop" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 28 }, { @@ -786,8 +896,8 @@ "code": 59672, "name": "camera" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 29 }, { @@ -812,8 +922,8 @@ "code": 59673, "name": "camera-disabled" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 30 }, { @@ -838,8 +948,8 @@ "code": 59674, "name": "volume" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 31 }, { @@ -886,8 +996,8 @@ "prevSize": 32, "code": 59648 }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 32 }, { @@ -959,8 +1069,8 @@ "name": "connection", "ligatures": "" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 33 }, { @@ -988,8 +1098,8 @@ "name": "recDisable", "ligatures": "" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 34 }, { @@ -1018,8 +1128,8 @@ "name": "recEnable", "ligatures": "" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 35 }, { @@ -1048,8 +1158,8 @@ "name": "presentation", "ligatures": "" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 36 }, { @@ -1074,8 +1184,8 @@ "code": 59685, "name": "dialpad" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 37 }, { @@ -1100,8 +1210,8 @@ "code": 59683, "name": "visibility" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 38 }, { @@ -1126,92 +1236,9 @@ "code": 59684, "name": "visibility-off" }, - "setIdx": 0, - "setId": 5, + "setIdx": 1, + "setId": 1, "iconIdx": 39 - }, - { - "icon": { - "paths": [ - "M330.667 554.667c-0.427-14.933 6.4-29.44 17.92-39.253 32 6.827 61.867 20.053 88.747 39.253 0 29.013-23.893 52.907-53.333 52.907s-52.907-23.467-53.333-52.907zM586.667 554.667c26.88-18.773 56.747-32 88.747-38.827 11.52 9.813 18.347 24.32 17.92 38.827 0 29.867-23.893 53.76-53.333 53.76s-53.333-23.893-53.333-53.76v0zM512 384c-118.187-1.707-234.667 27.733-338.347 85.333l-2.987 42.667c0 52.48 12.373 104.107 35.84 151.040 101.12-15.36 203.093-23.040 305.493-23.040s204.373 7.68 305.493 23.040c23.467-46.933 35.84-98.56 35.84-151.040l-2.987-42.667c-103.68-57.6-220.16-87.040-338.347-85.333zM512 85.333c235.641 0 426.667 191.025 426.667 426.667s-191.025 426.667-426.667 426.667c-235.641 0-426.667-191.025-426.667-426.667s191.025-426.667 426.667-426.667z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "ninja" - ], - "grid": 24 - }, - "attrs": [ - {} - ], - "properties": { - "order": 850, - "id": 0, - "name": "ninja", - "prevSize": 32, - "code": 59657 - }, - "setIdx": 1, - "setId": 4, - "iconIdx": 0 - }, - { - "icon": { - "paths": [ - "M282 460c62 120 162 220 282 282l94-94c12-12 30-16 44-10 48 16 100 24 152 24 24 0 42 18 42 42v150c0 24-18 42-42 42-400 0-726-326-726-726 0-24 18-42 42-42h150c24 0 42 18 42 42 0 54 8 104 24 152 4 14 2 32-10 44z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "phone" - ], - "defaultCode": 57549, - "grid": 24 - }, - "attrs": [], - "properties": { - "ligatures": "call, local_phone, phone", - "id": 1, - "order": 851, - "prevSize": 32, - "code": 57549, - "name": "phone" - }, - "setIdx": 1, - "setId": 4, - "iconIdx": 1 - }, - { - "icon": { - "paths": [ - "M810 554h-256v256h-84v-256h-256v-84h256v-256h84v256h256v84z" - ], - "attrs": [], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "add" - ], - "defaultCode": 57669, - "grid": 24 - }, - "attrs": [], - "properties": { - "ligatures": "add", - "id": 12, - "order": 896, - "prevSize": 32, - "code": 57669, - "name": "add" - }, - "setIdx": 3, - "setId": 0, - "iconIdx": 12 } ], "height": 1024, diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js index 371195d84..b5cf47def 100644 --- a/modules/UI/videolayout/RemoteVideo.js +++ b/modules/UI/videolayout/RemoteVideo.js @@ -397,7 +397,7 @@ RemoteVideo.prototype.addRemoteVideoMenu = function () { this.container.appendChild(spanElement); var menuElement = document.createElement('i'); - menuElement.className = 'icon-menu-up'; + menuElement.className = 'icon-thumb-menu'; menuElement.title = 'Remote user controls'; spanElement.appendChild(menuElement);