Merge branch 'develop' into germain-gg/facepile-offset

2023-09-22 08:46:37 +01:00
parent bf1db5c9e5 c297222d04
commit 224f34c211
163 changed files with 15302 additions and 13240 deletions
--- a/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss
+++ b/res/css/views/dialogs/_AddExistingToSpaceDialog.pcss
@@ -158,9 +158,7 @@ limitations under the License.
    display: flex;

    .mx_BaseAvatar {
-        display: inline-flex;
        margin: auto 16px auto 5px;
-        vertical-align: middle;
    }

    > div {
--- a/res/css/views/elements/_Pill.pcss
+++ b/res/css/views/elements/_Pill.pcss
@@ -89,4 +89,10 @@ limitations under the License.
        height: 16px;
        width: 16px;
    }
+
+    &.mx_SpacePill {
+        border-top-left-radius: 8px;
+        border-bottom-left-radius: 8px;
+        padding-left: 4px;
+    }
 }