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

Conflicts: src/components/structures/LoggedInView.tsx src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
parent 8e7ef39db7 e7cfa4816e
commit a688e5b8b3
318 changed files with 7386 additions and 4032 deletions
@@ -41,7 +41,7 @@ limitations under the License.
            font-weight: $font-semi-bold;
            font-size: $font-15px;
            line-height: $font-18px;
-            color: $primary-fg-color;
+            color: $primary-content;
            margin: 16px 0;

            .mx_BaseAvatar {