Merge branch 'develop' into kerry/24922/semantic-headings-space-pref

matrix-org · May 31, 2023 · 660271c · 660271c
2 parents 5c70bc3 + 176daad
commit 660271c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cypress/e2e/invite/invite-dialog.spec.ts b/cypress/e2e/invite/invite-dialog.spec.ts
@@ -169,7 +169,6 @@ describe("Invite dialog", function () {
         cy.get(".mx_RoomHeader").within(() => {
             cy.get(".mx_RoomHeader_name--textonly")
                 .realHover()
-                .get(".mx_RoomHeader_name--textonly:hover")
                 .should("have.css", "background-color", "rgba(0, 0, 0, 0)");
         });
 

diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss
@@ -1453,12 +1453,14 @@ $left-gutter: 64px;
                 margin-bottom: $spacing-4; /* 1/4 of the non-compact margin-bottom */
             }
         }
-    }
 
-    &[data-shape="ThreadsList"][data-notification]::before,
-    .mx_NotificationBadge {
-        /* stylelint-disable-next-line declaration-colon-space-after */
-        inset-block-start: calc($notification-inset-block-start - var(--MatrixChat_useCompactLayout_group-padding-top));
+        &[data-shape="ThreadsList"][data-notification]::before,
+        .mx_NotificationBadge {
+            /* stylelint-disable-next-line declaration-colon-space-after */
+            inset-block-start: calc(
+                $notification-inset-block-start - var(--MatrixChat_useCompactLayout_group-padding-top)
+            );
+        }
     }
 }
 

diff --git a/src/utils/permalinks/Permalinks.ts b/src/utils/permalinks/Permalinks.ts
@@ -216,8 +216,7 @@ export class RoomPermalinkCreator {
         if (this.room?.currentState) {
             const aclEvent = this.room?.currentState.getStateEvents(EventType.RoomServerAcl, "");
             if (aclEvent && aclEvent.getContent()) {
-                const getRegex = (hostname: string): RegExp =>
-                    new RegExp("^" + utils.globToRegexp(hostname, false) + "$");
+                const getRegex = (hostname: string): RegExp => new RegExp("^" + utils.globToRegexp(hostname) + "$");
 
                 const denied = aclEvent.getContent<{ deny: string[] }>().deny;
                 if (Array.isArray(denied)) {