Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
parent 6ef7ecbe08 b55f69a74c
commit d512a83a6c
203 changed files with 4536 additions and 1612 deletions
@@ -39,7 +39,6 @@ limitations under the License.
 .mx_CallView_pip {
    width: 320px;
    padding-bottom: 8px;
-    margin-top: 10px;
    background-color: $voipcall-plinth-color;
    box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.20);
    border-radius: 8px;