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

Conflicts: src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
parent 2b99afc741 91df392a2a
commit 539465ecb4
47 changed files with 819 additions and 549 deletions
@@ -50,7 +50,8 @@ limitations under the License.
    margin-left: 20px;
    display: inherit;
 }
-.mx_ShareDialog_matrixto_copy > div {
+.mx_ShareDialog_matrixto_copy::after {
+    content: "";
    mask-image: url($copy-button-url);
    background-color: $message-action-bar-fg-color;
    margin-left: 5px;