Merge branch 'develop' into charlynguyen/use-knock-rooms-sync-to-refl…

…ect-the-knock-state
matrix-org · Sep 11, 2023 · ead30a4 · ead30a4
2 parents 1c4dc41 + 3c6d8a2
commit ead30a4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/cypress/e2e/read-receipts/high-level.spec.ts b/cypress/e2e/read-receipts/high-level.spec.ts
@@ -713,9 +713,18 @@ describe("Read receipts", () => {
                 assertUnread(room2, 30);
             });
             it("Creating a new thread based on a reply makes the room unread", () => {
+                // Given a message and reply exist and are read
                 goTo(room1);
-                receiveMessages(room2, ["Msg1", replyTo("Msg1", "Reply1"), threadedOff("Reply1", "Resp1")]);
-                assertUnread(room2, 3);
+                receiveMessages(room2, ["Msg1", replyTo("Msg1", "Reply1")]);
+                goTo(room2);
+                goTo(room1);
+                assertRead(room2);
+
+                // When I receive a thread message created on the reply
+                receiveMessages(room2, [threadedOff("Reply1", "Resp1")]);
+
+                // Then the room is unread
+                assertUnread(room2, 1);
             });
             it("Reading a thread whose root is a reply makes the room read", () => {
                 goTo(room1);

diff --git a/package.json b/package.json
@@ -181,7 +181,7 @@
         "@typescript-eslint/eslint-plugin": "^5.35.1",
         "@typescript-eslint/parser": "^5.6.0",
         "allchange": "^1.1.0",
-        "axe-core": "4.7.2",
+        "axe-core": "4.8.0",
         "babel-jest": "^29.0.0",
         "blob-polyfill": "^7.0.0",
         "chokidar": "^3.5.1",

diff --git a/res/css/views/avatars/_BaseAvatar.pcss b/res/css/views/avatars/_BaseAvatar.pcss
@@ -24,9 +24,9 @@ limitations under the License.
 }
 
 button.mx_BaseAvatar {
-    /* The user agent stylesheet overrides the font-size & line-height in this scenario
-       And that breaks the alignment, emojis, and all sorts of things
+    /* <button> is a form element and by default it uses the user agent (browser) styling.
+       We want it to inherit the font-family and line-height from its parent.
      */
-    font-size: inherit;
+    font-family: inherit;
     line-height: inherit;
 }
diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss
@@ -99,11 +99,6 @@ limitations under the License.
             margin: 0 auto;
             transition: 0.5s;
 
-            .mx_BaseAvatar {
-                /* Override the calculated font-size so that the letter isn't tiny */
-                font-size: 4rem;
-            }
-
             .mx_BaseAvatar,
             .mx_BaseAvatar img {
                 width: 100%;
@@ -255,11 +250,6 @@ limitations under the License.
                 max-width: 72px;
                 margin: 0 auto;
             }
-
-            .mx_BaseAvatar {
-                /* Override the calculated font-size so that the letter isn't tiny */
-                font-size: 2rem;
-            }
         }
     }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -3464,10 +3464,10 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3"
   integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
-axe-core@4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0"
-  integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==
+axe-core@4.8.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.8.0.tgz#038c9e586732c791c0d9cecf7ed6434c4e8d497b"
+  integrity sha512-ZtlVZobOeDQhb/y2lMK6mznDw7TJHDNcKx5/bbBkFvArIQ5CVFhSI6hWWQnMx9I8cNmNmZ30wpDyOC2E2nvgbQ==
 
 axe-core@^4.6.2:
   version "4.6.3"