Merge remote-tracking branch 'upstream/develop' into task/colors-2

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-24 08:57:12 +02:00
parent c34dedb57b 52e1884bbd
commit b6ea75b681
96 changed files with 2815 additions and 1833 deletions
@@ -26,19 +26,6 @@ limitations under the License.
    // different level.
    pointer-events: none;

-    .mx_CallPreview {
-        pointer-events: initial; // restore pointer events so the user can leave/interact
-
-        .mx_VideoFeed_remote.mx_VideoFeed_voice {
-            min-height: 150px;
-        }
-
-        .mx_VideoFeed_local {
-            border-radius: 8px;
-            overflow: hidden;
-        }
-    }
-
    .mx_AppTile_persistedWrapper div {
        min-width: 350px;
    }
@@ -18,4 +18,15 @@ limitations under the License.
    position: fixed;
    left: 0;
    top: 0;
+
+    pointer-events: initial; // restore pointer events so the user can leave/interact
+
+    .mx_VideoFeed_remote.mx_VideoFeed_voice {
+        min-height: 150px;
+    }
+
+    .mx_VideoFeed_local {
+        border-radius: 8px;
+        overflow: hidden;
+    }
 }
@@ -43,6 +43,7 @@ limitations under the License.
    box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.20);
    border-radius: 8px;

+    .mx_CallView_video_hold,
    .mx_CallView_voice {
        height: 180px;
    }