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

Conflicts: src/components/views/spaces/SpaceTreeLevel.tsx src/dispatcher/actions.ts src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
parent 9fb1c8e4cd 94af6db201
commit 02dbdc5c0a
41 changed files with 1672 additions and 709 deletions
@@ -99,6 +99,10 @@ limitations under the License.
            .mx_IconizedContextMenu_icon + .mx_IconizedContextMenu_label {
                padding-left: 14px;
            }
+
+            .mx_BetaCard_betaPill {
+                margin-left: 16px;
+            }
        }
    }