Update api.md

When a conference is started, the currently used
camera device id is saved. I believe this is happening
because lib-jitsi-meet does not use exact device id
mathcing when calling getUserMedia, so it's possibl
to request camera A but get camera B back because
camera A is not available. When config.startScreenSharing
is true, the syncing occurs and saves the desktop
source id. So when screensharing is stopped, jitsi-meet
requests that desktop source id instead of the preferred
camera.

conference.js

@@ -2315,7 +2315,8 @@ export default {
                         }));
                     }
 
-                    if (this.localVideo) {
+                    if (this.localVideo
+                        && this.localVideo.videoType === 'camera') {
                         dispatch(updateSettings({
                             cameraDeviceId: this.localVideo.getDeviceId()
                         }));

css/_font.scss

@@ -1,10 +1,10 @@
 @font-face {
     font-family: 'jitsi';
-    src:  url('../fonts/jitsi.eot?zd9m7b');
-    src:  url('../fonts/jitsi.eot?zd9m7b#iefix') format('embedded-opentype'),
-        url('../fonts/jitsi.ttf?zd9m7b') format('truetype'),
-        url('../fonts/jitsi.woff?zd9m7b') format('woff'),
-        url('../fonts/jitsi.svg?zd9m7b#jitsi') format('svg');
+    src:  url('../fonts/jitsi.eot?3vw865');
+    src:  url('../fonts/jitsi.eot?3vw865#iefix') format('embedded-opentype'),
+        url('../fonts/jitsi.ttf?3vw865') format('truetype'),
+        url('../fonts/jitsi.woff?3vw865') format('woff'),
+        url('../fonts/jitsi.svg?3vw865#jitsi') format('svg');
     font-weight: normal;
     font-style: normal;
 }
@@ -109,7 +109,7 @@
 .icon-SD:before {
   content: "\e929";
 }
-.icon-gsm-bars-black:before {
+.icon-gsm-bars:before {
   content: "\e926";
 }
 .icon-info:before {

css/_toolbars.scss

@@ -73,7 +73,7 @@
         .button-group-center {
             justify-content: center;
             .toolbox-icon {
-                margin: 0px 12px;
+                margin: 0px 4px;
             }
         }
 
@@ -153,15 +153,16 @@
         .overflow-menu {
             font-size: 1.2em;
             list-style-type: none;
+            background-color: $overflowMenuBG;
             /**
              * Undo atlaskit padding by reducing margins.
              */
-            margin: -15px -24px;
+            margin: -16px -24px;
             padding: 4px 0;
 
             .overflow-menu-item {
                 align-items: center;
-                color: #B8C7E0;
+                color: $overflowMenuItemColor;
                 cursor: pointer;
                 display: flex;
                 font-size: 14px;
@@ -175,7 +176,8 @@
                 }
 
                 &:hover {
-                    background: #313D52;
+                    background-color: $overflowMenuItemHoverBG;
+                    color: $overflowMenuItemHoverColor;
                 }
 
                 &.unclickable {
@@ -191,9 +193,9 @@
             }
 
             .beta-tag {
-                background: #B8C7E0;
+                background: $overflowMenuItemColor;
                 border-radius: 2px;
-                color: $newToolbarBackgroundColor;
+                color: $overflowMenuBG;
                 font-size: 11px;
                 font-weight: bold;
                 margin-left: 8px;

css/_variables.scss

@@ -34,8 +34,8 @@ $defaultDarkColor: #2b3d5c;
  */
 $defaultToolbarSize: 50px;
 $newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
-$newToolbarButtonHoverColor: rgba(42, 58, 75, 0.15);
-$newToolbarButtonToggleColor: rgba(42, 58, 75, 0.2);
+$newToolbarButtonHoverColor: rgba(255, 255, 255, 0.15);
+$newToolbarButtonToggleColor: rgba(255, 255, 255, 0.2);
 $AOTToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
 $AOTToolbarButtonToggleColor: rgba(14, 20, 35, 1);
 $newToolbarFontSize: 24px;
@@ -43,6 +43,10 @@ $newToolbarHangupFontSize: 32px;
 $newToolbarSize: 40px;
 $newToolbarSizeWithPadding: calc(#{$newToolbarSize} + 24px);
 $toolbarTitleFontSize: 19px;
+$overflowMenuBG: initial;
+$overflowMenuItemHoverBG: #313D52;
+$overflowMenuItemHoverColor: #B8C7E0;
+$overflowMenuItemColor: #B8C7E0;
 
 /**
  * Video layout
@@ -59,6 +63,7 @@ $audioLevelShadow: rgba(9, 36, 77, 0.9);
 $videoStateIndicatorColor: $defaultColor;
 $videoStateIndicatorBackground: $toolbarBackground;
 $videoStateIndicatorSize: 40px;
+$remoteVideoMenuIconLeft: initial;
 
 /**
  * Feedback Modal

css/_videolayout_default.scss

@@ -412,6 +412,7 @@
 
     >i{
         cursor: hand;
+        margin-left: $remoteVideoMenuIconLeft;
     }
 }
 .remote-video-menu-trigger {

doc/api.md

@@ -1,6 +1,6 @@
 # Jitsi Meet API
 
-You can use the Jitsi Meet API to embed Jitsi Meet in to your application.
+You can use the Jitsi Meet API to embed Jitsi Meet in to your application. You are also welcome to use it for embedding the globally distributed and highly available deployment on meet.jit.si itself. The only thing we ask for in that case is that you please DO NOT remove the jitsi.org logo from the top left corner.
 
 ## Installation
 

fonts/jitsi.svg

@@ -52,7 +52,7 @@
 <glyph unicode="&#xe922;" glyph-name="info" d="M512 938.667c-235.52 0-426.667-191.147-426.667-426.667s191.147-426.667 426.667-426.667 426.667 191.147 426.667 426.667-191.147 426.667-426.667 426.667zM554.667 298.667h-85.333v256h85.333v-256zM554.667 640h-85.333v85.333h85.333v-85.333z" />
 <glyph unicode="&#xe923;" glyph-name="visibility" d="M512 640c70 0 128-58 128-128s-58-128-128-128-128 58-128 128 58 128 128 128zM512 298c118 0 214 96 214 214s-96 214-214 214-214-96-214-214 96-214 214-214zM512 832c214 0 396-132 470-320-74-188-256-320-470-320s-396 132-470 320c74 188 256 320 470 320z" />
 <glyph unicode="&#xe924;" glyph-name="visibility-off" d="M506 640h6c70 0 128-58 128-128v-8zM322 606c-14-28-24-60-24-94 0-118 96-214 214-214 34 0 66 10 94 24l-66 66c-8-2-18-4-28-4-70 0-128 58-128 128 0 10 2 20 4 28zM86 842l54 54 756-756-54-54c-47.968 47.365-96.266 94.401-144 142-58-24-120-36-186-36-214 0-396 132-470 320 34 84 90 156 160 212-39.017 38.983-77.307 78.693-116 118zM512 726c-28 0-54-6-78-16l-92 92c52 20 110 30 170 30 214 0 394-132 468-320-32-80-82-148-146-202l-124 124c10 24 16 50 16 78 0 118-96 214-214 214z" />
-<glyph unicode="&#xe926;" glyph-name="gsm-bars-black" d="M896 1024c70.692 0 128-57.308 128-128v-768c0-70.692-57.308-128-128-128s-128 57.308-128 128v768c0 70.692 57.308 128 128 128zM512 768c70.692 0 128-57.308 128-128v-512c0-70.692-57.308-128-128-128s-128 57.308-128 128v512c0 70.692 57.308 128 128 128zM128 384v0c70.692 0 128-57.308 128-128v-128c0-70.692-57.308-128-128-128s-128 57.308-128 128v128c0 70.692 57.308 128 128 128v0z" />
+<glyph unicode="&#xe926;" glyph-name="gsm-bars" d="M896 1024c70.692 0 128-57.308 128-128v-768c0-70.692-57.308-128-128-128s-128 57.308-128 128v768c0 70.692 57.308 128 128 128zM512 768c70.692 0 128-57.308 128-128v-512c0-70.692-57.308-128-128-128s-128 57.308-128 128v512c0 70.692 57.308 128 128 128zM128 384v0c70.692 0 128-57.308 128-128v-128c0-70.692-57.308-128-128-128s-128 57.308-128 128v128c0 70.692 57.308 128 128 128v0z" />
 <glyph unicode="&#xe927;" glyph-name="HD" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM481.359 384v255.823h-54.273v-103.18h-116.813v103.18h-54.273v-255.823h54.273v106.903h116.813v-106.903h54.273zM544.258 640v-256h102.077c77.636 0 121.665 46.626 121.665 129.773 0 80.133-44.569 126.227-121.665 126.227h-102.077zM598.531 594.26v-164.521h39.177c47.983 0 74.94 29.075 74.94 83.147 0 51.767-27.855 81.374-74.94 81.374h-39.177z" />
 <glyph unicode="&#xe928;" glyph-name="LD" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM472.4 433.325h-112.35v206.5h-52.85v-252.525h165.2v46.025zM520.35 640v-252.7h99.4c75.6 0 118.475 46.025 118.475 128.1 0 79.1-43.4 124.6-118.475 124.6h-99.4zM573.2 594.85v-162.4h38.15c46.725 0 72.975 28.7 72.975 82.075 0 51.1-27.125 80.325-72.975 80.325h-38.15z" />
 <glyph unicode="&#xe929;" glyph-name="SD" d="M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512c282.77 0 512-229.23 512-512s-229.23-512-512-512zM281.6 451.175c1.925-47.075 40.95-76.65 101.15-76.65 63.35 0 102.375 31.15 102.375 82.075 0 39.2-21.875 61.075-72.625 71.75l-30.45 6.475c-29.575 6.3-41.65 15.225-41.65 30.8 0 19.25 17.5 31.5 43.925 31.5 25.55 0 44.1-13.3 46.55-33.25h49.7c-1.575 44.975-40.95 76.125-96.6 76.125-58.275 0-96.6-31.325-96.6-78.925 0-38.5 22.575-62.475 68.6-72.1l32.9-7c30.975-6.65 43.575-15.925 43.575-32.025 0-19.075-19.425-32.375-46.9-32.375-29.75 0-50.4 13.125-52.85 33.6h-51.1zM535 633.7v-252.7h99.4c75.6 0 118.475 46.025 118.475 128.1 0 79.1-43.4 124.6-118.475 124.6h-99.4zM587.85 588.55v-162.4h38.15c46.725 0 72.975 28.7 72.975 82.075 0 51.1-27.125 80.325-72.975 80.325h-38.15z" />

modules/UI/util/UIUtil.js

@@ -18,16 +18,6 @@ const ThumbnailSizes = {
     MEDIUM: 80
 };
 
-/**
- * Contains font sizes for thumbnail indicators
- * @type {{SMALL: number, MEDIUM: number}}
- */
-const IndicatorFontSizes = {
-    SMALL: 5,
-    MEDIUM: 6,
-    NORMAL: 8
-};
-
 /**
  * Created by hristo on 12/22/14.
  */
@@ -310,6 +300,11 @@ const UIUtil = {
             ? $('#localVideoContainer').height() : thumbnailHeight;
 
         const { SMALL, MEDIUM } = ThumbnailSizes;
+        const IndicatorFontSizes = interfaceConfig.INDICATOR_FONT_SIZES || {
+            SMALL: 5,
+            MEDIUM: 6,
+            NORMAL: 8
+        };
         let fontSize = IndicatorFontSizes.NORMAL;
 
         if (height <= SMALL) {

react/features/base/config/parseURLParams.js

@@ -19,9 +19,18 @@ export default function parseURLParams(
         source: string = 'hash'): Object {
     const paramStr = source === 'search' ? url.search : url.hash;
     const params = {};
+    const paramParts = (paramStr && paramStr.substr(1).split('&')) || [];
 
-    // eslint-disable-next-line newline-per-chained-call
-    paramStr && paramStr.substr(1).split('&').forEach(part => {
+    // Detect and ignore hash params for hash routers.
+    if (source === 'hash' && paramParts.length === 1) {
+        const firstParam = paramParts[0];
+
+        if (firstParam.startsWith('/') && firstParam.split('&').length === 1) {
+            return params;
+        }
+    }
+
+    paramParts.forEach(part => {
         const param = part.split('=');
         const key = param[0];