Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

Conflicts: src/components/views/dialogs/CreateRoomDialog.tsx src/components/views/dialogs/RoomUpgradeDialog.tsx src/components/views/dialogs/RoomUpgradeWarningDialog.tsx src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
parent a58edcb241 dfa85b00d0
commit 390b05617c
324 changed files with 4440 additions and 3040 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');
+}