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

2021-07-20 15:48:25 +02:00
parent 6491a00645 4a877300da
commit c25feb9b9f
27 changed files with 871 additions and 215 deletions
@@ -30,5 +30,12 @@ limitations under the License.
    mask-position: center;
    content: '';
    vertical-align: middle;
+}
+
+.mx_InfoTooltip_icon_info::before {
    mask-image: url('$(res)/img/element-icons/info.svg');
 }
+
+.mx_InfoTooltip_icon_warning::before {
+    mask-image: url('$(res)/img/element-icons/warning.svg');
+}